Merge "Fix nested layout issue" into devel/master

[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 e91e7f9..5f4c4a5 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-item-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-item-impl.h
@@ -44,8 +44,8 @@ using LayoutItemPtr = IntrusivePtr<LayoutItem>;
 /**
  * Base class for layouts.
  */
-class DALI_IMPORT_API LayoutItem : public BaseObject,
-                                   public LayoutParent
+class DALI_TOOLKIT_API LayoutItem : public BaseObject,
+                                    public LayoutParent
 {
 public:
   /**
@@ -168,6 +168,11 @@ public:
   static LayoutLength GetDefaultSize( LayoutLength size, MeasureSpec measureSpec );
 
   /**
+   * @copydoc LayoutParent::SetParent
+   */
+  virtual void SetParent( LayoutParent* parent ) override;
+
+  /**
    * @copydoc LayoutParent::GetParent
    */
   virtual LayoutParent* GetParent() override;
@@ -187,6 +192,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.