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
Merged with Tizen Branch ( builds )
[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
c070179
..
5f36226
100644
(file)
--- a/
dali-toolkit/internal/text/visual-model-impl.cpp
+++ b/
dali-toolkit/internal/text/visual-model-impl.cpp
@@
-441,6
+441,11
@@
void VisualModel::SetUnderlineEnabled( bool enabled )
mUnderlineEnabled = enabled;
}
mUnderlineEnabled = enabled;
}
+void VisualModel::SetUnderlineHeight( float height )
+{
+ mUnderlineHeight = height;
+}
+
const Vector4& VisualModel::GetTextColor() const
{
return mTextColor;
const Vector4& VisualModel::GetTextColor() const
{
return mTextColor;
@@
-466,6
+471,11
@@
bool VisualModel::IsUnderlineEnabled() const
return mUnderlineEnabled;
}
return mUnderlineEnabled;
}
+float VisualModel::GetUnderlineHeight() const
+{
+ return mUnderlineHeight;
+}
+
void VisualModel::ClearCaches()
{
mCachedLineIndex = 0u;
void VisualModel::ClearCaches()
{
mCachedLineIndex = 0u;
@@
-483,10
+493,11
@@
VisualModel::VisualModel()
mGlyphsPerCharacter(),
mGlyphPositions(),
mLines(),
mGlyphsPerCharacter(),
mGlyphPositions(),
mLines(),
- mTextColor(),
- mShadowColor(),
- mUnderlineColor(),
- mShadowOffset(),
+ mTextColor( Color::BLACK ),
+ mShadowColor( Color::BLACK ),
+ mUnderlineColor( Color::BLACK ),
+ mShadowOffset( Vector2::ZERO ),
+ mUnderlineHeight( 0.0f ),
mNaturalSize(),
mActualSize(),
mCachedLineIndex( 0u ),
mNaturalSize(),
mActualSize(),
mCachedLineIndex( 0u ),