projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
43626f9
)
[4.0] Make sure mClearAll is true when calling GetNaturalSize()
54/166054/1
author
minho.sun
<minho.sun@samsung.com>
Fri, 5 Jan 2018 09:47:17 +0000
(18:47 +0900)
committer
minho.sun
<minho.sun@samsung.com>
Fri, 5 Jan 2018 09:47:17 +0000
(18:47 +0900)
Currently, GetNaturalSize() sets mClearAll to false.
It can make bug when calling GetHeightForWidth right after
GetNaturalSize().
Change-Id: Ic290bcdbb649402a1c06f32b63eadb434d7bf867
Signed-off-by: minho.sun <minho.sun@samsung.com>
dali-toolkit/internal/text/text-controller.cpp
patch
|
blob
|
history
diff --git
a/dali-toolkit/internal/text/text-controller.cpp
b/dali-toolkit/internal/text/text-controller.cpp
index 88940b5487ed6e9e4a99b259bade6cea995f40f6..d7a9e8851dc5b76b5cf2e6c7626b81237149776a 100755
(executable)
--- 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;