X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Flayouting%2Flayout-item-impl.h;h=cfbe8ea333adfe480f8587ca7551b9992af0565c;hp=c44d25161a1781d31934de0c6d4c5c92e0cdd5e5;hb=48f47cc7a6cad034d14f571e8b5839d678cde799;hpb=653beaaac0b661428036675d3e3bb1adbb8b5b1c

diff --git a/dali-toolkit/devel-api/layouting/layout-item-impl.h b/dali-toolkit/devel-api/layouting/layout-item-impl.h
index c44d251..cfbe8ea 100644
--- a/dali-toolkit/devel-api/layouting/layout-item-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-item-impl.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/actors/actor-enumerations.h>
 #include <dali-toolkit/devel-api/layouting/child-layout-data.h>
 #include <dali-toolkit/devel-api/layouting/layout-item.h>
-#include <dali-toolkit/devel-api/layouting/layout-parent-impl.h>
+#include <dali-toolkit/devel-api/layouting/layout-child-impl.h>
 #include <dali-toolkit/devel-api/layouting/layout-controller.h>
 #include <dali-toolkit/devel-api/layouting/layout-size.h>
 #include <dali-toolkit/devel-api/layouting/measure-spec.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 LayoutChild
 {
 public:
   /**
@@ -94,7 +94,8 @@ public:
   Handle GetOwner() const;
 
   /**
-   * @brief Unparent this layout from it's owner, and remove any layout children in derived types
+   * @brief Unparent this layout from it's parent, remove it from it's owner
+   * and remove any layout children in derived types.
    */
   void Unparent();
 
@@ -158,9 +159,14 @@ public:
   static LayoutLength GetDefaultSize( LayoutLength size, MeasureSpec measureSpec );
 
   /**
-   * @copydoc LayoutParent::GetParent
+   * @copydoc LayoutChild::SetParent
    */
-  virtual LayoutParent* GetParent() override;
+  void SetParent( LayoutParent* parent ) override;
+
+  /**
+   * @copydoc LayoutChild::GetParent
+   */
+  LayoutParent* GetParent() override;
 
   /**
    * @brief Request that this layout is re-laid out.
@@ -414,6 +420,11 @@ protected:
    */
   virtual void OnInitialize();
 
+  /**
+   * @brief Called when a layer animation state is changed.
+   */
+  virtual void OnAnimationStateChanged( bool animateLayout ) {}
+
 private:
   /**
    * @brief Called to change the size of the layout.