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
Ensuring Control behaviour flags retain their original values
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-model.cpp
diff --git
a/dali-toolkit/internal/text/text-model.cpp
b/dali-toolkit/internal/text/text-model.cpp
index
65494e5
..
c1767d8
100755
(executable)
--- a/
dali-toolkit/internal/text/text-model.cpp
+++ b/
dali-toolkit/internal/text/text-model.cpp
@@
-112,6
+112,16
@@
const ColorIndex* const Model::GetColorIndices() const
return mVisualModel->mColorIndices.Begin();
}
return mVisualModel->mColorIndices.Begin();
}
+const Vector4* const Model::GetBackgroundColors() const
+{
+ return mVisualModel->mBackgroundColors.Begin();
+}
+
+const ColorIndex* const Model::GetBackgroundColorIndices() const
+{
+ return mVisualModel->mBackgroundColorIndices.Begin();
+}
+
const Vector4& Model::GetDefaultColor() const
{
return mVisualModel->mTextColor;
const Vector4& Model::GetDefaultColor() const
{
return mVisualModel->mTextColor;
@@
-162,7
+172,7
@@
const Vector4& Model::GetOutlineColor() const
return mVisualModel->GetOutlineColor();
}
return mVisualModel->GetOutlineColor();
}
-
floa
t Model::GetOutlineWidth() const
+
uint16_
t Model::GetOutlineWidth() const
{
return mVisualModel->GetOutlineWidth();
}
{
return mVisualModel->GetOutlineWidth();
}
@@
-188,7
+198,8
@@
Model::Model()
mLineWrapMode( Text::LineWrap::WORD ),
mAlignmentOffset( 0.0f ),
mElideEnabled( false ),
mLineWrapMode( Text::LineWrap::WORD ),
mAlignmentOffset( 0.0f ),
mElideEnabled( false ),
- mIgnoreSpacesAfterText( true )
+ mIgnoreSpacesAfterText( true ),
+ mMatchSystemLanguageDirection( false )
{
mLogicalModel = LogicalModel::New();
mVisualModel = VisualModel::New();
{
mLogicalModel = LogicalModel::New();
mVisualModel = VisualModel::New();