X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Ftext%2Flayouts%2Flayout-engine.h;h=121b2400b4ba08a756866afbca66b17696621094;hb=5b3cf0e6742934674bdf62bbe15af00e39eae566;hp=febf48549f9c97f060e7d856d4e2aba30bf5e54e;hpb=451d7a012c895c2578a29ba929dc61a6d959209a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/layouts/layout-engine.h b/dali-toolkit/internal/text/layouts/layout-engine.h
index febf485..121b240 100644
--- a/dali-toolkit/internal/text/layouts/layout-engine.h
+++ b/dali-toolkit/internal/text/layouts/layout-engine.h
@@ -18,18 +18,16 @@
  *
  */
 
-// INTERNAL INCLUDE
-#include <dali-toolkit/internal/text/text-definitions.h>
-
 // EXTERNAL INCLUDE
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/math/vector2.h>
 
+// INTERNAL INCLUDE
+#include <dali-toolkit/internal/text/line-run.h>
+
 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,18 +88,80 @@ 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.
    * @param[out] glyphPositions The positions of all the glyphs.
+   * @param[out] lines The laid-out lines.
    * @param[out] actualSize The size of the text after it has been laid-out.
    *
    * @return \e true if the text has been re-laid-out. \e false means the given width is too small to layout even a single character.
    */
   bool LayoutText( const LayoutParameters& layoutParameters,
                    Vector<Vector2>& glyphPositions,
+                   Vector<LineRun>& lines,
                    Size& actualSize );
 
+  /**
+   * @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.
+   *
+   * @param[in] layoutParameters The parameters needed to layout the text.
+   * @param[in,out] glyphPositions The positions of all the glyphs.
+   */
+  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