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
[dali_1.9.31] Merge branch 'devel/master'
[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
e133e81
..
c1767d8
100755
(executable)
--- a/
dali-toolkit/internal/text/text-model.cpp
+++ b/
dali-toolkit/internal/text/text-model.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-57,6
+57,11
@@
VerticalAlignment::Type Model::GetVerticalAlignment() const
return mVerticalAlignment;
}
return mVerticalAlignment;
}
+DevelText::VerticalLineAlignment::Type Model::GetVerticalLineAlignment() const
+{
+ return mVerticalLineAlignment;
+}
+
bool Model::IsTextElideEnabled() const
{
return mElideEnabled;
bool Model::IsTextElideEnabled() const
{
return mElideEnabled;
@@
-107,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;
@@
-122,6
+137,11
@@
const Vector4& Model::GetShadowColor() const
return mVisualModel->mShadowColor;
}
return mVisualModel->mShadowColor;
}
+const float& Model::GetShadowBlurRadius() const
+{
+ return mVisualModel->mShadowBlurRadius;
+}
+
const Vector4& Model::GetUnderlineColor() const
{
return mVisualModel->GetUnderlineColor();
const Vector4& Model::GetUnderlineColor() const
{
return mVisualModel->GetUnderlineColor();
@@
-152,11
+172,21
@@
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();
}
+const Vector4& Model::GetBackgroundColor() const
+{
+ return mVisualModel->GetBackgroundColor();
+}
+
+bool Model::IsBackgroundEnabled() const
+{
+ return mVisualModel->IsBackgroundEnabled();
+}
+
Model::Model()
: mLogicalModel(),
mVisualModel(),
Model::Model()
: mLogicalModel(),
mVisualModel(),
@@
-164,9
+194,12
@@
Model::Model()
mScrollPositionLast(),
mHorizontalAlignment( Text::HorizontalAlignment::BEGIN ),
mVerticalAlignment( Text::VerticalAlignment::TOP ),
mScrollPositionLast(),
mHorizontalAlignment( Text::HorizontalAlignment::BEGIN ),
mVerticalAlignment( Text::VerticalAlignment::TOP ),
+ mVerticalLineAlignment( DevelText::VerticalLineAlignment::TOP ),
mLineWrapMode( Text::LineWrap::WORD ),
mAlignmentOffset( 0.0f ),
mLineWrapMode( Text::LineWrap::WORD ),
mAlignmentOffset( 0.0f ),
- mElideEnabled( false )
+ mElideEnabled( false ),
+ mIgnoreSpacesAfterText( true ),
+ mMatchSystemLanguageDirection( false )
{
mLogicalModel = LogicalModel::New();
mVisualModel = VisualModel::New();
{
mLogicalModel = LogicalModel::New();
mVisualModel = VisualModel::New();