From 5c6e53d0a0f3d2a4216bf3c37b18c9e5889e8078 Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Mon, 18 Feb 2019 14:41:44 +0900 Subject: [PATCH] Revert "[Tizen] Fix Underline property issue" This reverts commit f3de60f88f1630cfb631c2f9e1b0e83fd8e8dab8. --- dali-toolkit/internal/text/text-effects-style.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dali-toolkit/internal/text/text-effects-style.cpp b/dali-toolkit/internal/text/text-effects-style.cpp index 10d9da4..f65655b 100755 --- a/dali-toolkit/internal/text/text-effects-style.cpp +++ b/dali-toolkit/internal/text/text-effects-style.cpp @@ -358,9 +358,16 @@ void GetUnderlineProperties( ControllerPtr controller, Property::Value& value, E { Property::Map map; - map.Insert( ENABLE_KEY, enabled ); - map.Insert( COLOR_KEY, color ); - map.Insert( HEIGHT_KEY, height ); + 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 ); value = map; } -- 2.7.4