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 "[ATSPI][SVACE] Fixes use of v variable after it was freed by eldbus_service_in...
[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
eda5633
..
7edb428
100644
(file)
--- a/
dali-toolkit/internal/text/visual-model-impl.cpp
+++ b/
dali-toolkit/internal/text/visual-model-impl.cpp
@@
-384,6
+384,11
@@
void VisualModel::SetBackgroundEnabled(bool enabled)
mBackgroundEnabled = enabled;
}
mBackgroundEnabled = enabled;
}
+void VisualModel::SetMarkupProcessorEnabled(bool enabled)
+{
+ mMarkupProcessorEnabled = enabled;
+}
+
const Vector4& VisualModel::GetTextColor() const
{
return mTextColor;
const Vector4& VisualModel::GetTextColor() const
{
return mTextColor;
@@
-439,6
+444,11
@@
bool VisualModel::IsBackgroundEnabled() const
return mBackgroundEnabled;
}
return mBackgroundEnabled;
}
+bool VisualModel::IsMarkupProcessorEnabled() const
+{
+ return mMarkupProcessorEnabled;
+}
+
Length VisualModel::GetNumberOfUnderlineRuns() const
{
return mUnderlineRuns.Count();
Length VisualModel::GetNumberOfUnderlineRuns() const
{
return mUnderlineRuns.Count();
@@
-476,7
+486,8
@@
VisualModel::VisualModel()
mCachedLineIndex(0u),
mUnderlineEnabled(false),
mUnderlineColorSet(false),
mCachedLineIndex(0u),
mUnderlineEnabled(false),
mUnderlineColorSet(false),
- mBackgroundEnabled(false)
+ mBackgroundEnabled(false),
+ mMarkupProcessorEnabled(false)
{
}
{
}