X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Ftext%2Ftext-visual.h;h=f1d7e12ca328f96d406fba75d898bc8addf83999;hp=e859cbf854d0268cbf7e7e338c3c888ac36d77e9;hb=8641983679bb074a9951c2df9fff7ac6cbf5f5f2;hpb=ea959dca7c4e132a51bac0381df1d7b006646099 diff --git a/dali-toolkit/internal/visuals/text/text-visual.h b/dali-toolkit/internal/visuals/text/text-visual.h index e859cbf..f1d7e12 100644 --- a/dali-toolkit/internal/visuals/text/text-visual.h +++ b/dali-toolkit/internal/visuals/text/text-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_VISUAL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -20,6 +20,7 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include @@ -113,6 +114,15 @@ public: GetVisualObject( visual ).mRendererUpdateNeeded = true; }; + /** + * @brief Instantly updates the renderer + * @param[in] visual The text visual. + */ + static void UpdateRenderer( Toolkit::Visual::Base visual ) + { + GetVisualObject( visual ).UpdateRenderer(); + }; + public: // from Visual::Base /** @@ -195,28 +205,28 @@ private: * Get the texture of the text for rendering. * @param[in] size The texture size. * @param[in] hasMultipleTextColors Whether the text contains multiple colors. - * @param[in] containsEmoji Whether the text contains emoji. + * @param[in] containsColorGlyph Whether the text contains color glyph. * @param[in] styleEnabled Whether the text contains any styles (e.g. shadow, underline, etc.). */ - TextureSet GetTextTexture( const Vector2& size, bool hasMultipleTextColors, bool containsEmoji, bool styleEnabled ); + TextureSet GetTextTexture( const Vector2& size, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled ); /** * Get the text rendering shader. * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object * @param[in] hasMultipleTextColors Whether the text contains multiple colors. - * @param[in] containsEmoji Whether the text contains emoji. + * @param[in] containsColorGlyph Whether the text contains color glyph. * @param[in] styleEnabled Whether the text contains any styles (e.g. shadow, underline, etc.). */ - Shader GetTextShader( VisualFactoryCache& factoryCache, bool hasMultipleTextColors, bool containsEmoji, bool styleEnabled ); + Shader GetTextShader( VisualFactoryCache& factoryCache, bool hasMultipleTextColors, bool containsColorGlyph, bool styleEnabled ); /** - * @brief Retrieve the text's controller. - * @param[in] visual The text visual. - * @return The text controller + * @brief Retrieve the TextVisual object. + * @param[in] visual A handle to the TextVisual + * @return The TextVisual object */ static TextVisual& GetVisualObject( Toolkit::Visual::Base visual ) { - return static_cast( visual.GetBaseObject() ); + return static_cast< TextVisual& >( Toolkit::GetImplementation( visual ).GetVisualObject() ); }; private: