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
old mode 100644
(file)
new mode 100755
(executable)
index
1dcda36
..
7c2d156
--- 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();
}
@@
-188,6
+188,16
@@
void ViewModel::GetUnderlineRuns( GlyphRun* underlineRuns, UnderlineRunIndex ind
mModel->GetUnderlineRuns( underlineRuns, index, numberOfRuns );
}
mModel->GetUnderlineRuns( underlineRuns, index, numberOfRuns );
}
+const Vector4& ViewModel::GetOutlineColor() const
+{
+ return mModel->GetOutlineColor();
+}
+
+float ViewModel::GetOutlineWidth() const
+{
+ return mModel->GetOutlineWidth();
+}
+
void ViewModel::ElideGlyphs()
{
mIsTextElided = false;
void ViewModel::ElideGlyphs()
{
mIsTextElided = false;