Dali-Text: Keyboard Shortcuts

[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 f65655b..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,

-                               unsigned int& width )
+                               uint16_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<unsigned int>( valueGet.second.Get<float>() );
+      width = static_cast<uint16_t>( valueGet.second.Get<float>() );

     }
   }
 
     }
   }
 


@@ -358,16 +358,9 @@ void GetUnderlineProperties( ControllerPtr controller, Property::Value& value, E
         {
           Property::Map map;
 
         {
           Property::Map map;
 

-          const std::string enabledStr = enabled ? TRUE_TOKEN : FALSE_TOKEN;
-          map.Insert( ENABLE_KEY, enabledStr );
-
-          std::string colorStr;
-          Vector4ToColorString( color, colorStr );
-          map.Insert( COLOR_KEY, colorStr );
-
-          std::string heightStr;
-          FloatToString( height, heightStr );
-          map.Insert( HEIGHT_KEY, heightStr );
+          map.Insert( ENABLE_KEY, enabled );
+          map.Insert( COLOR_KEY, color );
+          map.Insert( HEIGHT_KEY, height );

 
           value = map;
         }
 
           value = map;
         }


@@ -594,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;

-        unsigned int width = 0u;
+        uint16_t width = 0u;

 
         bool empty = true;
 
 
         bool empty = true;
 


@@ -675,7 +668,7 @@ void GetOutlineProperties( ControllerPtr controller, Property::Value& value, Eff
         else
         {
           const Vector4& color = controller->GetOutlineColor();
         else
         {
           const Vector4& color = controller->GetOutlineColor();

-          const unsigned int width = controller->GetOutlineWidth();
+          const uint16_t width = controller->GetOutlineWidth();

 
           Property::Map map;
           map.Insert( COLOR_KEY, color );
 
           Property::Map map;
           map.Insert( COLOR_KEY, color );