Merge branch 'tizen' into devel/new_mesh

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-view / relayout-utilities.cpp

diff --git a/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp b/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
index f8ca367..54761fb 100644 (file)
--- a/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
+++ b/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
@@ -1995,6 +1995,7 @@ void CreateTextActor( const TextView::VisualParameters& visualParameters,
       {
         TextActorParameters parameters( style, TextActorParameters::FONT_DETECTION_OFF );
         textActor = TextActor::New( Text(), parameters );
+        textActor.SetRelayoutEnabled( false );
       }
       else
       {
@@ -2549,6 +2550,9 @@ RenderableActor CreateGlyphActor( const Text& text, const TextStyle& style, Text
     textActor = TextActor::New( text, parameters );
   }
 
+  // Exclude from size negotiation
+  textActor.SetRelayoutEnabled( false );
+
   return textActor;
 }