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 7a79e4c..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
 {
@@ -79,6 +77,8 @@ void Clipper::Refresh( const Vector2& size )
                                                                offscreenSize.height,
                                                                Pixel::RGBA8888 );
 
+    mOffscreenRootActor.SetSize( size );
+
     mImageActor.SetSize( offscreenSize );
     mImageActor.SetImage( frameBufferImage );
     mRenderTask.SetTargetFrameBuffer( frameBufferImage );
@@ -97,7 +97,6 @@ void Clipper::Initialize( const Vector2& size )
 
   // Create a root actor and an image actor for offscreen rendering.
   mOffscreenRootActor = Layer::New();
-  mOffscreenRootActor.SetRelayoutEnabled( false );
   mOffscreenRootActor.SetColorMode( USE_OWN_COLOR );
   mOffscreenRootActor.SetPositionInheritanceMode( DONT_INHERIT_POSITION );
   mOffscreenRootActor.SetInheritScale( false );
@@ -105,7 +104,6 @@ void Clipper::Initialize( const Vector2& size )
   mOffscreenRootActor.SetSize( offscreenSize );
 
   mImageActor = ImageActor::New();
-  mImageActor.SetRelayoutEnabled( false );
   mImageActor.SetParentOrigin( ParentOrigin::CENTER );
   mImageActor.SetBlendFunc( BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA,
                             BlendingFactor::ONE, BlendingFactor::ONE );