Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / clipping / text-clipper.cpp

diff --git a/dali-toolkit/internal/text/clipping/text-clipper.cpp b/dali-toolkit/internal/text/clipping/text-clipper.cpp
index 1b3a38c..b2478e4 100644 (file)
--- a/dali-toolkit/internal/text/clipping/text-clipper.cpp
+++ b/dali-toolkit/internal/text/clipping/text-clipper.cpp
@@ -78,6 +78,7 @@ void Clipper::Refresh( const Vector2& size )
     FrameBufferImage frameBufferImage = FrameBufferImage::New( offscreenSize.width,
                                                                offscreenSize.height,
                                                                Pixel::RGBA8888 );
+    mImageActor.SetSize( offscreenSize );
     mImageActor.SetImage( frameBufferImage );
     mRenderTask.SetTargetFrameBuffer( frameBufferImage );
 
@@ -97,14 +98,11 @@ void Clipper::Initialize( const Vector2& size )
   mOffscreenRootActor = Layer::New();
   mOffscreenRootActor.SetColorMode( USE_OWN_COLOR );
   mOffscreenRootActor.SetPositionInheritanceMode( DONT_INHERIT_POSITION );
-  mOffscreenRootActor.SetInheritRotation( false );
   mOffscreenRootActor.SetInheritScale( false );
   mOffscreenRootActor.SetDepthTestDisabled( true );
   mOffscreenRootActor.SetSize( offscreenSize );
-  mOffscreenRootActor.SetPosition( 0.0f, 0.0f, 0.0f );
 
   mImageActor = ImageActor::New();
-  mImageActor.SetAnchorPoint( ParentOrigin::CENTER );
   mImageActor.SetParentOrigin( ParentOrigin::CENTER );
   mImageActor.SetBlendFunc( BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA,
                             BlendingFactor::ONE, BlendingFactor::ONE );
@@ -114,16 +112,12 @@ void Clipper::Initialize( const Vector2& size )
   // Creates a new camera actor.
   mOffscreenCameraActor = CameraActor::New();
   mOffscreenCameraActor.SetParentOrigin( ParentOrigin::CENTER );
-  mOffscreenCameraActor.SetAnchorPoint( AnchorPoint::CENTER );
-  mOffscreenCameraActor.SetRotation(Degree(180.f), Vector3::YAXIS);
-  mOffscreenCameraActor.SetType( Dali::Camera::FREE_LOOK ); // Inherits position from the offscreen root actor.
   mOffscreenCameraActor.SetOrthographicProjection( offscreenSize );
   mOffscreenRootActor.Add( mOffscreenCameraActor ); // camera to shoot the offscreen text
 
   // Creates a new render task.
   mRenderTask = Stage::GetCurrent().GetRenderTaskList().CreateTask();
   mRenderTask.SetSourceActor( mOffscreenRootActor );
-  mRenderTask.SetInputEnabled( false );
   mRenderTask.SetClearColor( Color::TRANSPARENT );
   mRenderTask.SetClearEnabled( true );
   mRenderTask.SetExclusive( true );