Merge "Text improvement 1. Text - Layout text & icons. * Feature added to layout...

diff --combined dali-toolkit/internal/text/text-effects-style.cpp
index 10d9da4,015bee3..d5f8ff1
--- 1/dali-toolkit/internal/text/text-effects-style.cpp
--- 2/dali-toolkit/internal/text/text-effects-style.cpp
+++ b/dali-toolkit/internal/text/text-effects-style.cpp
@@@ -175,7 -175,7 +175,7 @@@ bool ParseOutlineProperties( const Prop
                                 bool& colorDefined,
                                 Vector4& color,
                                 bool& widthDefined,
-                                unsigned int& width )
+                                uint16_t& width )
  {
    const unsigned int numberOfItems = underlinePropertiesMap.Count();
  
@@@ -194,7 -194,7 +194,7 @@@
      {
        /// Width key.
        widthDefined = true;
-       width = static_cast<unsigned int>( valueGet.second.Get<float>() );
+       width = static_cast<uint16_t>( valueGet.second.Get<float>() );
      }
    }
  
@@@ -358,9 -358,16 +358,9 @@@ void GetUnderlineProperties( Controller
          {
            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;
          }
@@@ -587,7 -594,7 +587,7 @@@ bool SetOutlineProperties( ControllerPt
          bool colorDefined = false;
          Vector4 color;
          bool widthDefined = false;
-         unsigned int width = 0u;
+         uint16_t width = 0u;
  
          bool empty = true;
  
@@@ -668,7 -675,7 +668,7 @@@ void GetOutlineProperties( ControllerPt
          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 );