Merge "TextView - Uses new TextActor's constructor." into tizen

diff --git a/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp b/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
index 87f0984..6c7dd1c 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
@@ -1982,7 +1982,8 @@ RenderableActor CreateGlyphActor( const Text& text, const TextStyle& style, Text
   else
   {
     // The text-actor cache is empty. Create a new one.
-    textActor = TextActor::New( text, style, false, true );
+    TextActorParameters parameters( style, TextActorParameters::FONT_DETECTION_OFF );
+    textActor = TextActor::New( text, parameters );
   }
 
   return textActor;

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
index 28ebb83..8d33877 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
@@ -1176,7 +1176,8 @@ void InitializeTextActorInfo( TextView::RelayoutData& relayoutData )
                     // If still there is no text-actor, create one.
                     if( !textActor )
                     {
-                      textActor = TextActor::New( Text(), characterLayout.mStyledText.mStyle, false, true );
+                      TextActorParameters parameters( characterLayout.mStyledText.mStyle, TextActorParameters::FONT_DETECTION_OFF );
+                      textActor = TextActor::New( NULL, parameters );
                     }
                     else
                     {