X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-effects-style.cpp;h=f65655b22b99a7dd395719635ade539c9c82d3c1;hp=a3f07d6162f277c2eb5f9581b484782052cf5ee3;hb=aa0a27e9a51008fe8d557cd85ad31b057724aa41;hpb=efe1afb741becf694eceb698245ac76afa04b279 diff --git a/dali-toolkit/internal/text/text-effects-style.cpp b/dali-toolkit/internal/text/text-effects-style.cpp index a3f07d6..f65655b 100755 --- a/dali-toolkit/internal/text/text-effects-style.cpp +++ b/dali-toolkit/internal/text/text-effects-style.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ #include // INTERNAL INCLUDES +#include #include #include @@ -58,7 +59,7 @@ bool ParseShadowProperties( const Property::Map& shadowPropertiesMap, { const KeyValuePair& valueGet = shadowPropertiesMap.GetKeyValue( index ); - if( COLOR_KEY == valueGet.first.stringKey ) + if( ( DevelText::Shadow::Property::COLOR == valueGet.first.indexKey ) || ( COLOR_KEY == valueGet.first.stringKey ) ) { /// Color key. colorDefined = true; @@ -73,7 +74,7 @@ bool ParseShadowProperties( const Property::Map& shadowPropertiesMap, color = valueGet.second.Get(); } } - else if( OFFSET_KEY == valueGet.first.stringKey ) + else if( ( DevelText::Shadow::Property::OFFSET == valueGet.first.indexKey ) || ( OFFSET_KEY == valueGet.first.stringKey ) ) { /// Offset key. offsetDefined = true; @@ -88,7 +89,7 @@ bool ParseShadowProperties( const Property::Map& shadowPropertiesMap, offset = valueGet.second.Get(); } } - else if( BLUR_RADIUS_KEY == valueGet.first.stringKey ) + else if( ( DevelText::Shadow::Property::BLUR_RADIUS == valueGet.first.indexKey ) || ( BLUR_RADIUS_KEY == valueGet.first.stringKey ) ) { /// Blur radius key. blurRadiusDefined = true; @@ -122,7 +123,7 @@ bool ParseUnderlineProperties( const Property::Map& underlinePropertiesMap, { const KeyValuePair& valueGet = underlinePropertiesMap.GetKeyValue( index ); - if( ENABLE_KEY == valueGet.first.stringKey ) + if( ( DevelText::Underline::Property::ENABLE == valueGet.first.indexKey ) || ( ENABLE_KEY == valueGet.first.stringKey ) ) { /// Enable key. if( valueGet.second.GetType() == Dali::Property::STRING ) @@ -135,7 +136,7 @@ bool ParseUnderlineProperties( const Property::Map& underlinePropertiesMap, enabled = valueGet.second.Get(); } } - else if( COLOR_KEY == valueGet.first.stringKey ) + else if( ( DevelText::Underline::Property::COLOR == valueGet.first.indexKey ) || ( COLOR_KEY == valueGet.first.stringKey ) ) { /// Color key. colorDefined = true; @@ -150,7 +151,7 @@ bool ParseUnderlineProperties( const Property::Map& underlinePropertiesMap, color = valueGet.second.Get(); } } - else if( HEIGHT_KEY == valueGet.first.stringKey ) + else if( ( DevelText::Underline::Property::HEIGHT == valueGet.first.indexKey ) || ( HEIGHT_KEY == valueGet.first.stringKey ) ) { /// Height key. heightDefined = true; @@ -183,13 +184,13 @@ bool ParseOutlineProperties( const Property::Map& underlinePropertiesMap, { const KeyValuePair& valueGet = underlinePropertiesMap.GetKeyValue( index ); - if( COLOR_KEY == valueGet.first.stringKey ) + if( ( DevelText::Outline::Property::COLOR == valueGet.first.indexKey ) || ( COLOR_KEY == valueGet.first.stringKey ) ) { /// Color key. colorDefined = true; color = valueGet.second.Get(); } - else if( WIDTH_KEY == valueGet.first.stringKey ) + else if( ( DevelText::Outline::Property::WIDTH == valueGet.first.indexKey ) || ( WIDTH_KEY == valueGet.first.stringKey ) ) { /// Width key. widthDefined = true; @@ -212,12 +213,12 @@ bool ParseBackgroundProperties( const Property::Map& backgroundProperties, { const KeyValuePair& valueGet = backgroundProperties.GetKeyValue( index ); - if( ENABLE_KEY == valueGet.first.stringKey ) + if( ( DevelText::Background::Property::ENABLE == valueGet.first.indexKey ) || ( ENABLE_KEY == valueGet.first.stringKey ) ) { /// Enable key. enabled = valueGet.second.Get(); } - else if( COLOR_KEY == valueGet.first.stringKey ) + else if( ( DevelText::Background::Property::COLOR == valueGet.first.indexKey ) || ( COLOR_KEY == valueGet.first.stringKey ) ) { /// Color key. colorDefined = true;