X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Flayouting%2Flinear-layout.h;h=b70303a33467c1eadfa08c300c09b36dc056bac8;hb=7742c07e1fdc5d78bab7c2c9cc5d7803f04fb012;hp=8c6e51bb898eac368ca14062ac5635dd884113a5;hpb=3638fc255ad784cecea605d0e942391b9051ccd4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/layouting/linear-layout.h b/dali-toolkit/devel-api/layouting/linear-layout.h
index 8c6e51b..b70303a 100644
--- a/dali-toolkit/devel-api/layouting/linear-layout.h
+++ b/dali-toolkit/devel-api/layouting/linear-layout.h
@@ -37,7 +37,7 @@ class LinearLayout;
  * This class implements a linear box layout, automatically handling
  * right to left or left to right direction change.
  */
-class DALI_IMPORT_API LinearLayout : public LayoutGroup
+class DALI_TOOLKIT_API LinearLayout : public LayoutGroup
 {
 public:
 
@@ -57,6 +57,30 @@ public:
   };
 
   /**
+   * @brief Enumeration for the alignment of the linear layout items.
+   */
+  struct Alignment
+  {
+    enum Type
+    {
+      BEGIN                     = 0x1,  ///< At the left/right edge of the container (maps to LTR/RTL direction for horizontal orientation)
+      END                       = 0x2,  ///< At the right/left edge of the container (maps to LTR/RTL direction for horizontal orientation)
+      CENTER_HORIZONTAL         = 0x4,  ///< At the horizontal center of the container
+      TOP                       = 0x8,  ///< At the top edge of the container
+      BOTTOM                    = 0x10, ///< At the bottom edge of the container
+      CENTER_VERTICAL           = 0x20  ///< At the vertical center of the container
+    };
+  };
+
+  struct ChildProperty
+  {
+    enum
+    {
+      WEIGHT = CHILD_PROPERTY_START_INDEX, ///< name "weight", The proportion of the free space in the container the linear item will receive after all other non weighted items measured and all items specification width & height added. Type FLOAT
+    };
+  };
+
+  /**
    * @brief Creates an uninitialized LinearLayout handle.
    *
    * Initialize it using LinearLayout::New().
@@ -109,7 +133,7 @@ public:
    *
    * @return The padding between cells.
    */
-  LayoutSize GetCellPadding();
+  LayoutSize GetCellPadding() const;
 
   /**
    * @brief Set the orientation in the layout
@@ -123,7 +147,21 @@ public:
    *
    * @return The orientation.
    */
-  Orientation GetOrientation();
+  Orientation GetOrientation() const;
+
+  /**
+   * @brief Set the alignment in the layout
+   *
+   * @param[in] alignment The alignment.
+   */
+  void SetAlignment( unsigned int alignment );
+
+  /**
+   * @brief Get the alignment in the layout
+   *
+   * @return The alignment.
+   */
+  unsigned int GetAlignment() const;
 
 public: // Not intended for application developers