From db42ec925f04fe21139a50a5eadb7ad21cca6b01 Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Thu, 24 Jul 2014 13:47:14 +0100 Subject: [PATCH] TextView - Uses new TextActor's constructor. Change-Id: I6845cfd194df9214e016d99dedc8ff097ee1d3d8 Signed-off-by: Victor Cebollada --- base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp | 3 ++- base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 --- 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 --- 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 { -- 2.7.4