X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fmarkup-processor%2Fmarkup-processor.cpp;h=83359fd7aec946907106607be759b397284203a2;hb=f8118428cb455fb2503d07568ad62c79b07dc004;hp=c99eb116152f1d90b1af5fd5b5dbcae2e509a7ba;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp b/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp index c99eb11..83359fd 100644 --- a/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp +++ b/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp @@ -18,10 +18,6 @@ // HEADER INCLUDE #include -// INTERNAL INCLUDES -#include - - // EXTERNAL INCLUDES #include #include @@ -892,9 +888,9 @@ void GetMarkupString( const StyledTextArray& styledTextArray, std::string& marku { const StyledText& styledText( *it ); - bool isItalics = styledText.mStyle.GetItalics(); + bool isItalics = styledText.mStyle.IsItalicsEnabled(); bool isBold = defaultStyle.GetWeight() != styledText.mStyle.GetWeight(); - bool isUnderline = styledText.mStyle.GetUnderline(); + bool isUnderline = styledText.mStyle.IsUnderlineEnabled(); bool hasFontFace = defaultStyle.GetFontName() != styledText.mStyle.GetFontName(); bool hasFontStyle = defaultStyle.GetFontStyle() != styledText.mStyle.GetFontStyle(); bool hasFontSize = fabsf( defaultStyle.GetFontPointSize() - styledText.mStyle.GetFontPointSize() ) > GetRangedEpsilon( defaultStyle.GetFontPointSize(), styledText.mStyle.GetFontPointSize() ); @@ -961,7 +957,7 @@ void GetMarkupString( const StyledTextArray& styledTextArray, std::string& marku } // Write shadow. - if( styledText.mStyle.GetShadow() ) + if( styledText.mStyle.IsShadowEnabled() ) { markupString += LESS_THAN + XHTML_SHADOW_TAG; @@ -980,7 +976,7 @@ void GetMarkupString( const StyledTextArray& styledTextArray, std::string& marku } // Write glow. - if( styledText.mStyle.GetGlow() ) + if( styledText.mStyle.IsGlowEnabled() ) { markupString += LESS_THAN + XHTML_GLOW_TAG; @@ -998,7 +994,7 @@ void GetMarkupString( const StyledTextArray& styledTextArray, std::string& marku } // // Write outline. - if( styledText.mStyle.GetOutline() ) + if( styledText.mStyle.IsOutlineEnabled() ) { markupString += LESS_THAN + XHTML_OUTLINE_TAG; @@ -1027,19 +1023,19 @@ void GetMarkupString( const StyledTextArray& styledTextArray, std::string& marku } // Write outline close tag. - if( styledText.mStyle.GetOutline() ) + if( styledText.mStyle.IsOutlineEnabled() ) { markupString += LESS_THAN + ( SLASH + XHTML_OUTLINE_TAG + GREATER_THAN ); // } // Write glow close tag. - if( styledText.mStyle.GetGlow() ) + if( styledText.mStyle.IsGlowEnabled() ) { markupString += LESS_THAN + ( SLASH + XHTML_GLOW_TAG + GREATER_THAN ); // } // Write shadow close tag. - if( styledText.mStyle.GetShadow() ) + if( styledText.mStyle.IsShadowEnabled() ) { markupString += LESS_THAN + ( SLASH + XHTML_SHADOW_TAG + GREATER_THAN ); // }