Merge "Relayout again for LTR / RTL order when layout direction is changed." into...

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

diff --git a/dali-toolkit/internal/layouting/layout-group-data-impl.h b/dali-toolkit/internal/layouting/layout-group-data-impl.h
index f7e05e9..02a4716 100644 (file)
--- a/dali-toolkit/internal/layouting/layout-group-data-impl.h
+++ b/dali-toolkit/internal/layouting/layout-group-data-impl.h
@@ -19,8 +19,8 @@
 
 #include <vector>
 
-#include <dali-toolkit/devel-api/layouting/layout-base-impl.h>
-#include <dali-toolkit/internal/layouting/layout-base-data-impl.h>
+#include <dali-toolkit/devel-api/layouting/layout-item-impl.h>
+#include <dali-toolkit/internal/layouting/layout-item-data-impl.h>
 #include <dali-toolkit/devel-api/layouting/layout-group-impl.h>
 
 namespace Dali
@@ -38,12 +38,13 @@ public:
 public:
   struct ChildLayout
   {
-    LayoutBasePtr child;
+    LayoutItemPtr child;
     Toolkit::LayoutGroup::LayoutId layoutId;
   };
 
   std::vector<ChildLayout> mChildren;
   Toolkit::LayoutGroup::LayoutId mNextLayoutId;
+  bool mResizePolicyMapped;
 };