X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fflex-container%2Fflex-container-impl.h;h=9b8b9e97d9099cd35d91c2ed21f374a72f668cfb;hb=9eecb41468197eb2fc03e55c151011ea387e1bed;hp=58c25b645f8e319820e6b52924e1d8fdac2d3839;hpb=c4a92ccf72121cbe2a015711e4253e8d16f28fef;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h
old mode 100644
new mode 100755
index 58c25b6..9b8b9e9
--- a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h
+++ b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H__
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,12 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/object/weak-handle.h>
+#include <dali/public-api/object/weak-handle.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/devel-api/controls/flex-container/flex-container.h>
-extern "C"
-{
-#include "layout.h"
-}
+#include <dali-toolkit/public-api/controls/flex-container/flex-container.h>
+#include <dali-toolkit/third-party/yoga/Yoga.h>
 
 namespace Dali
 {
@@ -52,7 +49,7 @@ public:
   struct FlexItemNode
   {
     WeakHandle< Dali::Actor > actor;      ///< Actor handle of the flex item
-    css_node_t* node;                     ///< The style properties and layout information
+    YGNodeRef node;                     ///< The style properties and layout information
   };
 
   typedef std::vector< FlexItemNode > FlexItemNodeContainer;
@@ -206,9 +203,11 @@ private: // From Control
   virtual void OnSizeSet( const Vector3& size );
 
   /**
-   * @copydoc CustomActorImpl::OnSizeAnimation(Animation&, const Vector3&)
-   */
-  virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize);
+  * @copydoc OnLayoutDirectionChanged( Dali::Actor actor, Dali::LayoutDirection::Type type )
+  * @param[in] actor The actor whose layoutDirection is changed.
+  * @param[in] type  The layoutDirection.
+  */
+  void OnLayoutDirectionChanged( Dali::Actor actor, Dali::LayoutDirection::Type type );
 
 private: // Implementation
 
@@ -250,20 +249,20 @@ private: // Data
 
 // Helpers for public-api forwarding methods
 
-inline Toolkit::Internal::FlexContainer& GetImpl( Toolkit::FlexContainer& tableView )
+inline Toolkit::Internal::FlexContainer& GetImpl( Toolkit::FlexContainer& flexContainer )
 {
-  DALI_ASSERT_ALWAYS(tableView);
+  DALI_ASSERT_ALWAYS(flexContainer);
 
-  Dali::RefObject& handle = tableView.GetImplementation();
+  Dali::RefObject& handle = flexContainer.GetImplementation();
 
   return static_cast<Toolkit::Internal::FlexContainer&>(handle);
 }
 
-inline const Toolkit::Internal::FlexContainer& GetImpl( const Toolkit::FlexContainer& tableView )
+inline const Toolkit::Internal::FlexContainer& GetImpl( const Toolkit::FlexContainer& flexContainer )
 {
-  DALI_ASSERT_ALWAYS(tableView);
+  DALI_ASSERT_ALWAYS(flexContainer);
 
-  const Dali::RefObject& handle = tableView.GetImplementation();
+  const Dali::RefObject& handle = flexContainer.GetImplementation();
 
   return static_cast<const Toolkit::Internal::FlexContainer&>(handle);
 }