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
Convert more shaders in dali-toolkit and dali-scene-loader to use shader compilation...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-effects-style.cpp
diff --git
a/dali-toolkit/internal/text/text-effects-style.cpp
b/dali-toolkit/internal/text/text-effects-style.cpp
index
10d9da4
..
d5f8ff1
100755
(executable)
--- a/
dali-toolkit/internal/text/text-effects-style.cpp
+++ b/
dali-toolkit/internal/text/text-effects-style.cpp
@@
-175,7
+175,7
@@
bool ParseOutlineProperties( const Property::Map& underlinePropertiesMap,
bool& colorDefined,
Vector4& color,
bool& widthDefined,
bool& colorDefined,
Vector4& color,
bool& widthDefined,
- u
nsigned in
t& width )
+ u
int16_
t& width )
{
const unsigned int numberOfItems = underlinePropertiesMap.Count();
{
const unsigned int numberOfItems = underlinePropertiesMap.Count();
@@
-194,7
+194,7
@@
bool ParseOutlineProperties( const Property::Map& underlinePropertiesMap,
{
/// Width key.
widthDefined = true;
{
/// Width key.
widthDefined = true;
- width = static_cast<u
nsigned in
t>( valueGet.second.Get<float>() );
+ width = static_cast<u
int16_
t>( valueGet.second.Get<float>() );
}
}
}
}
@@
-587,7
+587,7
@@
bool SetOutlineProperties( ControllerPtr controller, const Property::Value& valu
bool colorDefined = false;
Vector4 color;
bool widthDefined = false;
bool colorDefined = false;
Vector4 color;
bool widthDefined = false;
- u
nsigned in
t width = 0u;
+ u
int16_
t width = 0u;
bool empty = true;
bool empty = true;
@@
-668,7
+668,7
@@
void GetOutlineProperties( ControllerPtr controller, Property::Value& value, Eff
else
{
const Vector4& color = controller->GetOutlineColor();
else
{
const Vector4& color = controller->GetOutlineColor();
- const u
nsigned in
t width = controller->GetOutlineWidth();
+ const u
int16_
t width = controller->GetOutlineWidth();
Property::Map map;
map.Insert( COLOR_KEY, color );
Property::Map map;
map.Insert( COLOR_KEY, color );