Line spacing for TextLabel and vertical line alignment feature

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

diff --git a/dali-toolkit/internal/text/text-model.h b/dali-toolkit/internal/text/text-model.h
index d4da2bc..9422996 100755 (executable)
--- a/dali-toolkit/internal/text/text-model.h
+++ b/dali-toolkit/internal/text/text-model.h
@@ -23,7 +23,6 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/text/text-enumerations.h>
-#include <dali-toolkit/internal/text/layouts/layout-wrap-mode.h>
 #include <dali-toolkit/internal/text/logical-model-impl.h>
 #include <dali-toolkit/internal/text/text-model-interface.h>
 #include <dali-toolkit/internal/text/visual-model-impl.h>
@@ -85,6 +84,11 @@ public:
   virtual VerticalAlignment::Type GetVerticalAlignment() const;
 
   /**
+   * @copydoc ModelInterface::GetVerticalLineAlignment()
+   */
+  virtual DevelText::VerticalLineAlignment::Type GetVerticalLineAlignment() const override;
+
+  /**
    * @copydoc ModelInterface::IsTextElideEnabled()
    */
   virtual bool IsTextElideEnabled() const;
@@ -150,6 +154,11 @@ public:
   virtual const Vector4& GetShadowColor() const;
 
   /**
+   * @copydoc ModelInterface::GetShadowBlurRadius()
+   */
+  virtual const float& GetShadowBlurRadius() const;
+
+  /**
    * @copydoc ModelInterface::GetUnderlineColor()
    */
   virtual const Vector4& GetUnderlineColor() const;
@@ -211,13 +220,14 @@ public:
    * 0,0 means that the top-left corner of the layout matches the top-left corner of the UI control.
    * Typically this will have a negative value with scrolling occurs.
    */
-  Vector2                            mScrollPosition;      ///< The text is offset by this position when scrolling.
-  Vector2                            mScrollPositionLast;  ///< The last offset value of mScrollPosition
-  HorizontalAlignment::Type          mHorizontalAlignment; ///< The layout's horizontal alignment.
-  VerticalAlignment::Type            mVerticalAlignment;   ///< The layout's vertical alignment.
-  Layout::LineWrap::Mode             mLineWrapMode;        ///< The text wrap mode
-  float                              mAlignmentOffset;     ///< The alignment offset.
-  bool                               mElideEnabled:1;      ///< Whether the text's elide is enabled.
+  Vector2                                   mScrollPosition;        ///< The text is offset by this position when scrolling.
+  Vector2                                   mScrollPositionLast;    ///< The last offset value of mScrollPosition
+  HorizontalAlignment::Type                 mHorizontalAlignment;   ///< The layout's horizontal alignment.
+  VerticalAlignment::Type                   mVerticalAlignment;     ///< The layout's vertical alignment.
+  DevelText::VerticalLineAlignment::Type    mVerticalLineAlignment; ///< The layout's vertical line alignment.
+  Text::LineWrap::Mode                      mLineWrapMode;          ///< The text wrap mode
+  float                                     mAlignmentOffset;       ///< The alignment offset.
+  bool                                      mElideEnabled:1;        ///< Whether the text's elide is enabled.
 };
 
 } // namespace Text