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=2ab19b1b8549aa52d58efb0cb83269a8ca029736;hp=b9bd7fc2cea1f3c1d38d9a2d1b08ceeab545ed1b;hb=5b3cf0e6742934674bdf62bbe15af00e39eae566;hpb=9aa36e970b71cdfa780945e484e216aac1443493 diff --git a/dali-toolkit/internal/text/text-view.h b/dali-toolkit/internal/text/text-view.h index b9bd7fc..2ab19b1 100644 --- a/dali-toolkit/internal/text/text-view.h +++ b/dali-toolkit/internal/text/text-view.h @@ -25,8 +25,6 @@ namespace Dali { -struct Vector2; - namespace Toolkit { @@ -58,23 +56,22 @@ public: void SetVisualModel( VisualModelPtr visualModel ); /** - * @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfGlyphs() + * @copydoc Dali::Toolkit::Text::ViewInterface::GetControlSize() */ - virtual Length GetNumberOfGlyphs() const; + virtual const Vector2& GetControlSize() const; /** - * @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphs() + * @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfGlyphs() */ - virtual void GetGlyphs( GlyphInfo* glyphs, - GlyphIndex glyphIndex, - Length numberOfGlyphs ) const; + virtual Length GetNumberOfGlyphs() const; /** - * @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphPositions() + * @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphs() */ - virtual void GetGlyphPositions( Vector2* glyphPositions, - GlyphIndex glyphIndex, - Length numberOfGlyphs ) const; + virtual Length GetGlyphs( GlyphInfo* glyphs, + Vector2* glyphPositions, + GlyphIndex glyphIndex, + Length numberOfGlyphs ) const; /** * @copydoc Dali::Toolkit::Text::ViewInterface::GetTextColor() @@ -101,6 +98,11 @@ public: */ virtual bool IsUnderlineEnabled() const; + /** + * @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineHeight() + */ + virtual float GetUnderlineHeight() const; + private: // Undefined