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 "Fix for font validation." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-view.cpp
diff --git
a/dali-toolkit/internal/text/text-view.cpp
b/dali-toolkit/internal/text/text-view.cpp
index
caee1f8
..
d57b2ec
100644
(file)
--- a/
dali-toolkit/internal/text/text-view.cpp
+++ b/
dali-toolkit/internal/text/text-view.cpp
@@
-65,11
+65,11
@@
const Vector2& View::GetControlSize() const
return Vector2::ZERO;
}
return Vector2::ZERO;
}
-const Vector2& View::Get
Actual
Size() const
+const Vector2& View::Get
Layout
Size() const
{
if ( mImpl->mVisualModel )
{
{
if ( mImpl->mVisualModel )
{
- return mImpl->mVisualModel->Get
Actual
Size();
+ return mImpl->mVisualModel->Get
Layout
Size();
}
return Vector2::ZERO;
}
return Vector2::ZERO;