From: Adeel Kazmi Date: Fri, 27 Apr 2018 07:53:39 +0000 (+0000) Subject: Merge "Previous model height return problem fixed" into devel/master X-Git-Tag: dali_1.3.23~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e37f48bb34e81585a6ed436bd7a2f9dce02c19f5;hp=e1be89633c53936401f4f1daa789c5be266ea71c Merge "Previous model height return problem fixed" into devel/master --- diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index d878025..7192281 100755 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -1983,6 +1983,7 @@ float Controller::GetHeightForWidth( float width ) // Clear the update info. This info will be set the next time the text is updated. mImpl->mTextUpdateInfo.Clear(); + mImpl->mTextUpdateInfo.mClearAll = true; // Restore the actual control's width. mImpl->mModel->mVisualModel->mControlSize.width = actualControlWidth;