X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Flayouting%2Flayout-controller.h;h=951a4fc967d9deab27500e81f56f3c612571c0f8;hb=34bb584d815970cb12b0678cf68915338800ebb4;hp=db5cc5bd630621572a676f5d89f0865328764576;hpb=20b42a9bcaba6b874f2271f03a56da6f884c4053;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/layouting/layout-controller.h b/dali-toolkit/devel-api/layouting/layout-controller.h
old mode 100644
new mode 100755
index db5cc5b..951a4fc
--- a/dali-toolkit/devel-api/layouting/layout-controller.h
+++ b/dali-toolkit/devel-api/layouting/layout-controller.h
@@ -17,7 +17,7 @@
  */
 
 #include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/devel-api/layouting/layout-item.h>
 #include <dali-toolkit/devel-api/layouting/layout-group.h>
@@ -36,7 +36,7 @@ class LayoutController;
  * @brief Controls the process of layouting the control tree. It provides methods to enable
  * controls to re-layout and internal systems to separately measure and layout controls.
  */
-class DALI_IMPORT_API LayoutController : public BaseHandle
+class DALI_TOOLKIT_API LayoutController : public BaseHandle
 {
 public:
   /**
@@ -62,10 +62,29 @@ public:
   static LayoutController Get();
 
   /**
-   * @brief Request for a particular layout (wrapping a control or a visual) to be measured and laid out.
+    * @brief Request for a particular layout (wrapping a control or a visual) to be measured and laid out. A specified layout transition
+    * will be triggered during the layout.
+    * @param[in] layout The layout to measure & relayout.
+    */
+  void RequestLayout( LayoutItem layout );
+
+  /**
+   * @brief Request for a particular layout (wrapping a control or a visual) to be measured and laid out. A specified layout transition
+   * will be triggered during the layout.
    * @param[in] layout The layout to measure & relayout.
+   * @param[in] layoutTransitionType The layout transition type.
    */
-  void RequestLayout( LayoutItem layout );
+  void RequestLayout( LayoutItem layout, Dali::Toolkit::LayoutTransitionData::Type layoutTransitionType );
+
+  /**
+   * @brief Request for a particular layout (wrapping a control or a visual) to be measured and laid out. A specified layout transition
+   * will be triggered during the layout.
+   * @param[in] layout The layout to measure & relayout.
+   * @param[in] layoutTransitionType The layout transition type.
+   * @param[in] gainedChild The gained layout owner's child.
+   * @param[in] lostChild The lost layout owner's child.
+   */
+  void RequestLayout( LayoutItem layout, Dali::Toolkit::LayoutTransitionData::Type layoutTransitionType, Actor gainedChild, Actor lostChild );
 
 public:
   /// @cond internal