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 "SVACE Error fix TextureManager Thread bounds" 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
3e3f2d6
..
5373a6a
100755
(executable)
--- a/
dali-toolkit/internal/text/visual-model-impl.cpp
+++ b/
dali-toolkit/internal/text/visual-model-impl.cpp
@@
-344,6
+344,11
@@
void VisualModel::SetShadowColor( const Vector4& shadowColor )
mShadowColor = shadowColor;
}
mShadowColor = shadowColor;
}
+void VisualModel::SetShadowBlurRadius( const float& shadowBlurRadius )
+{
+ mShadowBlurRadius = shadowBlurRadius;
+}
+
void VisualModel::SetUnderlineColor( const Vector4& color )
{
mUnderlineColor = color;
void VisualModel::SetUnderlineColor( const Vector4& color )
{
mUnderlineColor = color;
@@
-365,7
+370,7
@@
void VisualModel::SetUnderlineHeight( float height )
mUnderlineHeight = height;
}
mUnderlineHeight = height;
}
-void VisualModel::SetOutlineWidth(
floa
t width )
+void VisualModel::SetOutlineWidth(
unsigned in
t width )
{
mOutlineWidth = width;
}
{
mOutlineWidth = width;
}
@@
-385,6
+390,11
@@
const Vector4& VisualModel::GetShadowColor() const
return mShadowColor;
}
return mShadowColor;
}
+const float& VisualModel::GetShadowBlurRadius() const
+{
+ return mShadowBlurRadius;
+}
+
const Vector4& VisualModel::GetUnderlineColor() const
{
return mUnderlineColor;
const Vector4& VisualModel::GetUnderlineColor() const
{
return mUnderlineColor;
@@
-405,7
+415,7
@@
float VisualModel::GetUnderlineHeight() const
return mUnderlineHeight;
}
return mUnderlineHeight;
}
-
floa
t VisualModel::GetOutlineWidth() const
+
unsigned in
t VisualModel::GetOutlineWidth() const
{
return mOutlineWidth;
}
{
return mOutlineWidth;
}
@@
-439,7
+449,8
@@
VisualModel::VisualModel()
mControlSize(),
mShadowOffset(),
mUnderlineHeight( 0.0f ),
mControlSize(),
mShadowOffset(),
mUnderlineHeight( 0.0f ),
- mOutlineWidth( 0.0f ),
+ mOutlineWidth( 0u ),
+ mShadowBlurRadius( 0.0f ),
mNaturalSize(),
mLayoutSize(),
mCachedLineIndex( 0u ),
mNaturalSize(),
mLayoutSize(),
mCachedLineIndex( 0u ),