From: Jinho, Lee <jeano.lee@samsung.com>
Date: Thu, 13 Jul 2017 03:03:21 +0000 (+0900)
Subject: Calculate a new height when full relayout needed
X-Git-Tag: dali_1.2.49~3^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F14%2F138614%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Calculate a new height when full relayout needed

Change-Id: Ifc7fc385e224abb5b85cc79e22b29b50ebb965f4
---

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<OperationsMask>( CONVERT_TO_UTF32  |