Merge "TextField is re-laied out after its properties are changed." into devel/master

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

diff --git a/dali-toolkit/devel-api/layouting/layout-group-impl.h b/dali-toolkit/devel-api/layouting/layout-group-impl.h
index ee73c88..5a2796b 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-group-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-group-impl.h
@@ -111,19 +111,6 @@ public:
   Toolkit::LayoutGroup::LayoutId Insert( LayoutItem& target, LayoutItem& child ) override;
 
   /**
-   * @brief Move a child to another position
-   * @param[in] target The target item
-   * @param[in] child The item to move
-   */
-  Toolkit::LayoutGroup::LayoutId Move( LayoutItem& target, LayoutItem& child ) override;
-
-  /**
-   * @brief Move a child to back
-   * @param[in] child The item to move
-   */
-  Toolkit::LayoutGroup::LayoutId MoveBack( LayoutItem& child ) override;
-
-  /**
    * @brief Remove all layout children.
    *
    * @note This will not unparent owner's children
@@ -294,14 +281,14 @@ private:
   void ChildAddedToOwner( Actor child );
 
   /**
-   * Callback when child is removed from owner
+   * Implementation of ChildAddedToOwner
    */
-  void ChildRemovedFromOwner( Actor child );
+  void ChildAddedToOwnerImpl( Actor child );
 
   /**
-   * Callback when child order is changed
+   * Callback when child is removed from owner
    */
-  void ChildOrderChanged( Actor child );
+  void ChildRemovedFromOwner( Actor child );
 
   /**
    * Callback when an owner property is set. Triggers a relayout if it's a child property