Merge "Stop setting crazy Z value with controls (at the moment depth is ignored by...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-view.h

diff --git a/dali-toolkit/internal/text/text-view.h b/dali-toolkit/internal/text/text-view.h
index b9bd7fc..2ab19b1 100644 (file)
--- 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