X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fgrid-layout.h;h=915e8a6d1f286988bf395c77e5fb16366bf6e595;hp=b2b3bd91829abba30182c4c495cf8aae7924852a;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=a78bb823aebc305823855ac35b3413aaff7bc684

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
old mode 100644
new mode 100755
index b2b3bd9..915e8a6
--- a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
+++ b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_GRID_LAYOUT_H__
-#define __DALI_TOOLKIT_GRID_LAYOUT_H__
+#ifndef DALI_TOOLKIT_GRID_LAYOUT_H
+#define DALI_TOOLKIT_GRID_LAYOUT_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -22,6 +22,9 @@
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
+
 namespace Dali
 {
 
@@ -53,6 +56,12 @@ public:
   virtual ~GridLayout();
 
   /**
+   * Apply grid layout Properties.
+   * @param[in] properties The properties of the layout.
+   */
+  void SetGridLayoutProperties(const Property::Map& properties);
+
+  /**
    * @brief Set the number of columns in the layout.
    *
    * @param[in] columns The number of columns.
@@ -234,11 +243,6 @@ private:
   virtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const;
 
   /**
-   * @copydoc ItemLayout::GetResizeAnimation()
-   */
-  virtual void GetResizeAnimation(Animation& animation, Actor actor, Vector3 size, float durationSeconds) const;
-
-  /**
    * @copydoc ItemLayout::GetScrollDirection()
    */
   virtual Degree GetScrollDirection() const;
@@ -262,6 +266,14 @@ protected:
 
 private:
 
+  // Undefined
+  GridLayout( const GridLayout& itemLayout );
+
+  // Undefined
+  GridLayout& operator=( const GridLayout& rhs );
+
+private:
+
   struct Impl;
   Impl* mImpl;
 };
@@ -272,4 +284,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_GRID_LAYOUT_H__
+#endif // DALI_TOOLKIT_GRID_LAYOUT_H