Exporting one constructor used by csharpbinder and making an API private.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / layouting / layout-item-impl.h

diff --git a/dali-toolkit/devel-api/layouting/layout-item-impl.h b/dali-toolkit/devel-api/layouting/layout-item-impl.h
index fb12913..c44d251 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-item-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-item-impl.h
@@ -113,16 +113,6 @@ public:
   bool IsLayoutAnimated() const;
 
   /**
-   * @brief Register child properties of layout with owner type.
-   *
-   * The Actor hierarchy uses these registered properties in the type
-   * system to ensure child custom properties are properly initialized.
-   *
-   * @param[in] containerType The type of the containing view (owner)
-   */
-  void RegisterChildProperties( const std::string& containerType );
-
-  /**
    * @brief  This is called to find out how big a layout should be.
    *
    * The parent supplies constraint information in the width and height parameters.
@@ -187,6 +177,11 @@ public:
   bool IsLayoutRequested() const;
 
   /**
+   * @brief Set layout requested flag (mark the layout dirty).
+   */
+  void SetLayoutRequested();
+
+  /**
    * @brief Get the measured width (without any measurement flags).
    *
    * This method should be used only during measurement and layout calculations.
@@ -289,11 +284,17 @@ public:
   LayoutLength GetMinimumHeight() const;
 
   /**
-   * Get the padding information
+   * Get the padding information.
    * @return The padding information
    */
   Extents GetPadding() const;
 
+  /**
+   * Get the margin information.
+   * @return The margin information
+   */
+  Extents GetMargin() const;
+
 protected:
   /**
    * @brief Allow directly deriving classes to remove layout children when unparented
@@ -307,7 +308,6 @@ protected:
    */
   virtual void OnRegisterChildProperties( const std::string& containerType );
 
-
   /**
    * @brief Measure the layout and its content to determine the measured width and the
    * measured height.
@@ -430,6 +430,16 @@ private:
    */
   void OnLayoutAnimationFinished( Animation& animation );
 
+  /**
+   * @brief Register child properties of layout with owner type.
+   *
+   * The Actor hierarchy uses these registered properties in the type
+   * system to ensure child custom properties are properly initialized.
+   *
+   * @param[in] containerType The type of the containing view (owner)
+   */
+  void RegisterChildProperties( const std::string& containerType );
+
 public:
   class Impl; // Class declaration is public so we can add devel API's in the future