Merge "Stop setting crazy Z value with controls (at the moment depth is ignored by...

[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 92dbaa4..031956a 100644 (file)
--- a/dali-toolkit/internal/text/clipping/text-clipper.cpp
+++ b/dali-toolkit/internal/text/clipping/text-clipper.cpp
@@ -19,10 +19,8 @@
 #include <dali-toolkit/internal/text/clipping/text-clipper.h>
 
 // EXTERNAL INCLUDES
-#include <algorithm>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/integration-api/debug.h>
 
 namespace
 {
@@ -78,8 +76,10 @@ void Clipper::Refresh( const Vector2& size )
     FrameBufferImage frameBufferImage = FrameBufferImage::New( offscreenSize.width,
                                                                offscreenSize.height,
                                                                Pixel::RGBA8888 );
-    mImageActor.SetPreferredSize( offscreenSize );
-    mImageActor.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+
+    mOffscreenRootActor.SetSize( size );
+
+    mImageActor.SetSize( offscreenSize );
     mImageActor.SetImage( frameBufferImage );
     mRenderTask.SetTargetFrameBuffer( frameBufferImage );
 
@@ -101,16 +101,14 @@ void Clipper::Initialize( const Vector2& size )
   mOffscreenRootActor.SetPositionInheritanceMode( DONT_INHERIT_POSITION );
   mOffscreenRootActor.SetInheritScale( false );
   mOffscreenRootActor.SetDepthTestDisabled( true );
-  mOffscreenRootActor.SetResizePolicy( FIXED, ALL_DIMENSIONS );
-  mOffscreenRootActor.SetPreferredSize( offscreenSize );
+  mOffscreenRootActor.SetSize( offscreenSize );
 
   mImageActor = ImageActor::New();
   mImageActor.SetParentOrigin( ParentOrigin::CENTER );
   mImageActor.SetBlendFunc( BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA,
                             BlendingFactor::ONE, BlendingFactor::ONE );
   mImageActor.SetScale( Vector3( 1.0f, -1.0f, 1.0f ) );
-  mImageActor.SetPreferredSize( offscreenSize );
-  mImageActor.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+  mImageActor.SetSize( offscreenSize );
 
   // Creates a new camera actor.
   mOffscreenCameraActor = CameraActor::New();