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
Text Alignment Enums now public
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
view-model.cpp
diff --git
a/dali-toolkit/internal/text/rendering/view-model.cpp
b/dali-toolkit/internal/text/rendering/view-model.cpp
index
fe3c451
..
7c2d156
100755
(executable)
--- a/
dali-toolkit/internal/text/rendering/view-model.cpp
+++ b/
dali-toolkit/internal/text/rendering/view-model.cpp
@@
-61,12
+61,12
@@
const Vector2& ViewModel::GetScrollPosition() const
return mModel->GetScrollPosition();
}
return mModel->GetScrollPosition();
}
-
Layout::HorizontalAlignment
ViewModel::GetHorizontalAlignment() const
+
HorizontalAlignment::Type
ViewModel::GetHorizontalAlignment() const
{
return mModel->GetHorizontalAlignment();
}
{
return mModel->GetHorizontalAlignment();
}
-
Layout::VerticalAlignment
ViewModel::GetVerticalAlignment() const
+
VerticalAlignment::Type
ViewModel::GetVerticalAlignment() const
{
return mModel->GetVerticalAlignment();
}
{
return mModel->GetVerticalAlignment();
}