From: David Steele <david.steele@samsung.com>
Date: Fri, 14 Jul 2017 13:01:35 +0000 (+0000)
Subject: Merge "DALi Version 1.2.48" into devel/master
X-Git-Tag: dali_1.2.49~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=8b9e1eb2a98b0cbfb30286e097fc03e9c5e6410d;hp=362f07d9dd85cac9a32b7029c109d5a6d3fb8e5e

Merge "DALi Version 1.2.48" into devel/master
---

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index b2fec63..a0daf14 100644
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -1792,7 +1792,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  |