projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes I26f3edb0,Iba714851 into new_text
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index
43d0cff
..
419d1c4
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@
-172,7
+172,7
@@
void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr
{
float pointSize = value.Get< float >();
{
float pointSize = value.Get< float >();
- if(
impl.mController->GetDefaultPointSize() != pointSize /*TODO - epsilon*/
)
+ if(
fabsf(impl.mController->GetDefaultPointSize() - pointSize) > Math::MACHINE_EPSILON_1
)
{
impl.mController->SetDefaultPointSize( pointSize );
impl.RequestTextRelayout();
{
impl.mController->SetDefaultPointSize( pointSize );
impl.RequestTextRelayout();