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 "Support align attribute for paragraph tag in markup" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
visual-model-impl.cpp
diff --git
a/dali-toolkit/internal/text/visual-model-impl.cpp
b/dali-toolkit/internal/text/visual-model-impl.cpp
index
6c4ff9b
..
ce0fb7c
100644
(file)
--- a/
dali-toolkit/internal/text/visual-model-impl.cpp
+++ b/
dali-toolkit/internal/text/visual-model-impl.cpp
@@
-305,13
+305,13
@@
LineIndex VisualModel::GetLineOfCharacter(CharacterIndex characterIndex)
return index;
}
return index;
}
-void VisualModel::GetUnderlineRuns(
GlyphRun*
underlineRuns,
- UnderlineRunIndex index,
- Length numberOfRuns) const
+void VisualModel::GetUnderlineRuns(
UnderlinedGlyphRun*
underlineRuns,
+ UnderlineRunIndex
index,
+ Length
numberOfRuns) const
{
memcpy(underlineRuns,
mUnderlineRuns.Begin() + index,
{
memcpy(underlineRuns,
mUnderlineRuns.Begin() + index,
- numberOfRuns * sizeof(GlyphRun));
+ numberOfRuns * sizeof(
Underlined
GlyphRun));
}
void VisualModel::SetNaturalSize(const Vector2& size)
}
void VisualModel::SetNaturalSize(const Vector2& size)
@@
-460,6
+460,11
@@
void VisualModel::SetStrikethroughHeight(float height)
mStrikethroughHeight = height;
}
mStrikethroughHeight = height;
}
+void VisualModel::SetCharacterSpacing(float characterSpacing)
+{
+ mCharacterSpacing = characterSpacing;
+}
+
const Vector4& VisualModel::GetTextColor() const
{
return mTextColor;
const Vector4& VisualModel::GetTextColor() const
{
return mTextColor;
@@
-525,6
+530,11
@@
const Vector4& VisualModel::GetBackgroundColor() const
return mBackgroundColor;
}
return mBackgroundColor;
}
+const float VisualModel::GetCharacterSpacing() const
+{
+ return mCharacterSpacing;
+}
+
bool VisualModel::IsBackgroundEnabled() const
{
return mBackgroundEnabled;
bool VisualModel::IsBackgroundEnabled() const
{
return mBackgroundEnabled;
@@
-604,6
+614,11
@@
void VisualModel::ClearCaches()
mCachedLineIndex = 0u;
}
mCachedLineIndex = 0u;
}
+const Vector<CharacterIndex>& VisualModel::GetGlyphsToCharacters() const
+{
+ return mGlyphsToCharacters;
+}
+
VisualModel::~VisualModel()
{
}
VisualModel::~VisualModel()
{
}
@@
-644,7
+659,8
@@
VisualModel::VisualModel()
mUnderlineColorSet(false),
mBackgroundEnabled(false),
mMarkupProcessorEnabled(false),
mUnderlineColorSet(false),
mBackgroundEnabled(false),
mMarkupProcessorEnabled(false),
- mStrikethroughEnabled(false)
+ mStrikethroughEnabled(false),
+ mCharacterSpacing(0.0f)
{
}
{
}