Controls are LayoutGroups instead of LayoutItems

[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 90c40fa..ee73c88 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-group-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-group-impl.h
@@ -23,6 +23,7 @@
 #include <dali/public-api/signals/connection-tracker.h>
 #include <dali-toolkit/devel-api/layouting/child-layout-data.h>
 #include <dali-toolkit/devel-api/layouting/layout-group.h>
+#include <dali-toolkit/devel-api/layouting/layout-parent-impl.h>
 #include <dali-toolkit/devel-api/layouting/layout-item-impl.h>
 
 namespace Dali
@@ -55,6 +56,7 @@ using LayoutGroupPtr = IntrusivePtr<LayoutGroup>;
  * position and size; it should then call Layout() on the child layout to layout the child and it's hierarchy.
  */
 class DALI_TOOLKIT_API LayoutGroup : public LayoutItem,
+                                     public LayoutParent,
                                      public ConnectionTracker
 {
 public:
@@ -63,6 +65,14 @@ public:
    */
   LayoutGroup();
 
+  /**
+   * @brief Construct
+   *
+   * @param[in] owner The owner (container view / child view / visual ) of this layout
+   * @return a new LayoutGroup object
+   */
+  static LayoutGroupPtr New( Handle& owner );
+
 protected:
   /**
    * Virtual destructor may only be called by Unreference()
@@ -79,19 +89,39 @@ public:
    * @param[in] layoutChild The child to add
    * @return The layout id of this child.
    */
-  Toolkit::LayoutGroup::LayoutId Add( LayoutItem& layoutChild );
+  Toolkit::LayoutGroup::LayoutId Add( LayoutItem& layoutChild ) override;
 
   /**
    * @brief Remove a layout child from this group.
    * @param[in] childId The layout child id
    */
-  void Remove( Toolkit::LayoutGroup::LayoutId childId );
+  void Remove( Toolkit::LayoutGroup::LayoutId childId ) override;
 
   /**
    * @brief Remove a layout child from this group
    * @param[in] child The layout child
    */
-  void Remove( LayoutItem& child );
+  void Remove( LayoutItem& child ) override;
+
+  /**
+   * @brief Insert a child to the parent
+   * @param[in] target The target item
+   * @param[in] child The item to insert to this layout parent
+   */
+  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.
@@ -226,6 +256,15 @@ protected:
                                         LayoutLength widthUsed,
                                         MeasureSpec parentHeightMeasureSpec,
                                         LayoutLength heightUsed );
+  /**
+   * @copydoc LayoutItem::OnMeasure
+   */
+  virtual void OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpec ) override;
+
+  /**
+   * @copydoc LayoutItem::OnLayout
+   */
+  virtual void OnLayout( bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom ) override;
 
 private:
   /**
@@ -245,6 +284,11 @@ private:
   void OnUnparent() override final;
 
   /**
+   * Method to remove a child from this group
+   */
+  void RemoveChild( LayoutItem& item );
+
+  /**
    * Callback when child is added to owner
    */
   void ChildAddedToOwner( Actor child );
@@ -257,7 +301,7 @@ private:
   /**
    * Callback when child order is changed
    */
-  void ChildOrderChanged();
+  void ChildOrderChanged( Actor child );
 
   /**
    * Callback when an owner property is set. Triggers a relayout if it's a child property