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
(from parent 1:
98c2c30
)
Make sure mClearAll is true after calling GetNaturalSize()
08/166108/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>
Mon, 8 Jan 2018 02:38:42 +0000
(11:38 +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
c618006
..
6580790
100755
(executable)
--- a/
dali-toolkit/internal/text/text-controller.cpp
+++ b/
dali-toolkit/internal/text/text-controller.cpp
@@
-1877,6
+1877,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;