X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fitem-view%2Fitem-layout.h;h=169ad2b069c0ceb62ee578b128aa077bbab315fc;hp=030ddb964d97bc043d62a2ac4a5b5223dc4edf55;hb=df92f45e89c92ca9b2286d51116ff7b69e75c569;hpb=79182b18eabe71f0ffa2779f0ad17a859f855b9a

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
index 030ddb9..169ad2b 100644
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_ITEM_LAYOUT_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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,6 +19,8 @@
  */
 
 // EXTERNAL INCLUDES
+#include <boost/function.hpp>
+#include <dali/public-api/animation/alpha-function.h>
 #include <dali/public-api/common/vector-wrapper.h>
 
 // INTERNAL INCLUDES
@@ -127,7 +129,7 @@ struct ItemRange
  * An ItemLayout also describes the direction of input gestures, used to scroll through the layout.
  * Whilst scrolling, the layout provides a range of items that are within a layout-area (3D bounding volume).
  */
-class ItemLayout : public RefObject
+class DALI_IMPORT_API ItemLayout : public RefObject
 {
 public:
 
@@ -375,7 +377,7 @@ public:
    * @param[in] scrollPositionObject The object which provides the layout position property.
    * @param[in] itemViewActor The item view instance which requests the application of constraints.
    */
-  DALI_IMPORT_API virtual void ApplyConstraints( Actor& actor, const int itemId, const float durationSeconds, Constrainable scrollPositionObject, const Actor& itemViewActor );
+  DALI_IMPORT_API virtual void ApplyConstraints( Actor& actor, const int itemId, const float durationSeconds, Handle scrollPositionObject, const Actor& itemViewActor );
 
   /**
    * @brief Gets the position of a given item
@@ -411,7 +413,8 @@ protected:
 protected:
 
   ControlOrientation::Type mOrientation;   ///< the orientation of the layout.
-  AlphaFunction            mAlphaFunction; ///<Alpha function to be applied when removing/adding constraints
+  AlphaFunction            mAlphaFunction; ///< Alpha function to be applied when removing/adding constraints
+  Handle                   mWeightObject;  ///< Weight object gets created to apply the constraints over a certain time
 };
 
 } // namespace Toolkit