From 0794e3c728f62a3604b387f631a9ca22892cf31d Mon Sep 17 00:00:00 2001 From: "Jinho, Lee" Date: Thu, 13 Jul 2017 12:03:21 +0900 Subject: [PATCH] Calculate a new height when full relayout needed Change-Id: Ifc7fc385e224abb5b85cc79e22b29b50ebb965f4 --- dali-toolkit/internal/text/text-controller.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index f9445b5..53cd489 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -1566,7 +1566,8 @@ float Controller::GetHeightForWidth( float width ) ProcessModifyEvents(); Size layoutSize; - if( fabsf( width - mImpl->mModel->mVisualModel->mControlSize.width ) > Math::MACHINE_EPSILON_1000 ) + if( fabsf( width - mImpl->mModel->mVisualModel->mControlSize.width ) > Math::MACHINE_EPSILON_1000 || + mImpl->mTextUpdateInfo.mFullRelayoutNeeded ) { // Operations that can be done only once until the text changes. const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | -- 2.7.4