From 4b8c91aa04dd14bfd098d6184ac39c054b4cd9ae Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Fri, 5 Jan 2018 18:47:17 +0900 Subject: [PATCH] [4.0] Make sure mClearAll is true when calling GetNaturalSize() Currently, GetNaturalSize() sets mClearAll to false. It can make bug when calling GetHeightForWidth right after GetNaturalSize(). Change-Id: Ic290bcdbb649402a1c06f32b63eadb434d7bf867 Signed-off-by: minho.sun --- dali-toolkit/internal/text/text-controller.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 88940b5..d7a9e88 100755 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -1878,6 +1878,7 @@ Vector3 Controller::GetNaturalSize() // 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 size. mImpl->mModel->mVisualModel->mControlSize = actualControlSize; -- 2.7.4