X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-view.h;h=e600940041c82a3e7a40935deb10f4337ccc2f20;hp=e7d1942ac7d0f3f21ffa1e286ad75ba61421cf6f;hb=528aa3699cd51dab5115bca1aaebb65d4bc67c15;hpb=f60b3d8e308a5145efe754cbff2a47b4ae278021 diff --git a/dali-toolkit/internal/text/text-view.h b/dali-toolkit/internal/text/text-view.h index e7d1942..e600940 100755 --- a/dali-toolkit/internal/text/text-view.h +++ b/dali-toolkit/internal/text/text-view.h @@ -58,17 +58,17 @@ public: /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetControlSize() */ - virtual const Vector2& GetControlSize() const; + const Vector2& GetControlSize() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetLayoutSize() */ - virtual const Vector2& GetLayoutSize() const; + const Vector2& GetLayoutSize() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfGlyphs() */ - virtual Length GetNumberOfGlyphs() const; + Length GetNumberOfGlyphs() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphs() @@ -82,47 +82,57 @@ public: /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetColors() */ - virtual const Vector4* const GetColors() const; + const Vector4* const GetColors() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetColorIndices() */ - virtual const ColorIndex* const GetColorIndices() const; + const ColorIndex* const GetColorIndices() const override; + + /** + * @copydoc Dali::Toolkit::Text::ViewInterface::GetBackgroundColors() + */ + const Vector4* const GetBackgroundColors() const override; + + /** + * @copydoc Dali::Toolkit::Text::ViewInterface::GetBackgroundColorIndices() + */ + const ColorIndex* const GetBackgroundColorIndices() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetTextColor() */ - virtual const Vector4& GetTextColor() const; + const Vector4& GetTextColor() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetShadowOffset() */ - virtual const Vector2& GetShadowOffset() const; + const Vector2& GetShadowOffset() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetShadowColor() */ - virtual const Vector4& GetShadowColor() const; + const Vector4& GetShadowColor() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineColor() */ - virtual const Vector4& GetUnderlineColor() const; + const Vector4& GetUnderlineColor() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::IsUnderlineEnabled() */ - virtual bool IsUnderlineEnabled() const; + bool IsUnderlineEnabled() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineHeight() */ - virtual float GetUnderlineHeight() const; + float GetUnderlineHeight() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfUnderlineRuns() */ - virtual Length GetNumberOfUnderlineRuns() const; + Length GetNumberOfUnderlineRuns() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineRuns() @@ -134,12 +144,12 @@ public: /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetOutlineColor() */ - virtual const Vector4& GetOutlineColor() const; + const Vector4& GetOutlineColor() const override; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetOutlineWidth() */ - virtual uint16_t GetOutlineWidth() const; + uint16_t GetOutlineWidth() const override; private: