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 / layouts / layout-engine.h

diff --git a/dali-toolkit/internal/text/layouts/layout-engine.h b/dali-toolkit/internal/text/layouts/layout-engine.h
index cdcd156..121b240 100644 (file)
--- a/dali-toolkit/internal/text/layouts/layout-engine.h
+++ b/dali-toolkit/internal/text/layouts/layout-engine.h
@@ -28,8 +28,6 @@
 namespace Dali
 {
 
-struct Vector2;
-
 namespace Toolkit
 {
 
@@ -51,6 +49,20 @@ public:
     MULTI_LINE_BOX
   };
 
+  enum HorizontalAlignment
+  {
+    HORIZONTAL_ALIGN_BEGIN,
+    HORIZONTAL_ALIGN_CENTER,
+    HORIZONTAL_ALIGN_END
+  };
+
+  enum VerticalAlignment
+  {
+    VERTICAL_ALIGN_TOP,
+    VERTICAL_ALIGN_CENTER,
+    VERTICAL_ALIGN_BOTTOM
+  };
+
   /**
    * @brief Create a new instance of a LayoutEngine.
    */
@@ -76,6 +88,46 @@ public:
   unsigned int GetLayout() const;
 
   /**
+   * @brief Enable or disable the text ellipsis.
+   *
+   * @param[in] enabled Whether to enable the text ellipsis.
+   */
+  void SetTextEllipsisEnabled( bool enabled );
+
+  /**
+   * @return Whether the text ellipsis is enabled.
+   */
+  bool GetTextEllipsisEnabled() const;
+
+  /**
+   * @brief Choose the required text horizontal alignment.
+   *
+   * @param[in] alignment The required alignment.
+   */
+  void SetHorizontalAlignment( HorizontalAlignment alignment );
+
+  /**
+   * @brief Query the required text horizontal alignment.
+   *
+   * @return The required alignment.
+   */
+  HorizontalAlignment GetHorizontalAlignment() const;
+
+  /**
+   * @brief Choose the required text vertical alignment.
+   *
+   * @param[in] alignment The required alignment.
+   */
+  void SetVerticalAlignment( VerticalAlignment alignment );
+
+  /**
+   * @brief Query the required text vertical alignment.
+   *
+   * @return The required alignment.
+   */
+  VerticalAlignment GetVerticalAlignment() const;
+
+  /**
    * @brief Store the visual position of glyphs in the VisualModel.
    *
    * @param[in] layoutParameters The parameters needed to layout the text.
@@ -91,7 +143,7 @@ public:
                    Size& actualSize );
 
   /**
-   * Re-lays out those lines with right to left characters.
+   * @brief Re-lays out those lines with right to left characters.
    *
    * It doesn't change the phisical position of the glyphs in the model but sets their new position.
    *
@@ -101,6 +153,15 @@ public:
   void ReLayoutRightToLeftLines( const LayoutParameters& layoutParameters,
                                  Vector<Vector2>& glyphPositions );
 
+  /**
+   * @brief Aligns the laid out lines.
+   *
+   * @param[in] layoutSize The size of the laid out the text.
+   * @param[in,out] lines The laid-out lines.
+   */
+  void Align( const Size& layoutSize,
+              Vector<LineRun>& lines );
+
 private:
 
   // Undefined