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=b8485f76d39d5186a8268359392d9c7533957fa8;hp=fdea8ec07f0f864dfc780292e4a44eeb46351523;hb=68106e2cbb8541c18a77f39770ea7759f44e02a0;hpb=57869973578f6a0b0f836d396c7232ddb8302c6b

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 fdea8ec..b8485f7 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-functions.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:
 
@@ -310,38 +312,6 @@ public:
   virtual Degree GetScrollDirection() const = 0;
 
   /**
-   * @brief Tells scroll components how to interpolate our logical scroll position as a screen x/y direction.
-   *
-   * Application developer wants to use -ve y, +ve x as up direction and +ve y, -ve x as down direction scroll values in a
-   * vertical scroll type effect (SpiralLayout). This means that scroll bar/overshoot indicator should be affected by y-axis.
-   * Returning (0.0f, 0.0f) for x and (0.0f, -1.0f) for y tells us that we need to use the y scroll value to move the scroll bar
-   * along y axis with y scroll of 0 starting at bottom (due to -1.0f on y), a value of (0.0f, 1.0f) on x axis mask would mean using y scroll value to move scroll bar along x axis
-   *
-   * This function is used by numerous objects such as scroll indicators and scroll overshoot indicators and all
-   * layout implementations should provide their own version of this function to ensure proper functionality of
-   * internal toolkit systems.
-   *
-   * @param[out] scrollHint Vector2 describing how x and y scroll values should be used for x-axis scrolling
-   */
-  DALI_IMPORT_API virtual void GetXAxisScrollHint(Vector2& scrollHint) const;
-
-  /**
-   * @brief Tells scroll components how to interpolate our logical scroll position as a screen x/y direction.
-   *
-   * Application developer wants to use -ve y, +ve x as up direction and +ve y, -ve x as down direction scroll values in a
-   * vertical scroll type effect (SpiralLayout). This means that scroll bar/overshoot indicator should be affected by y-axis.
-   * Returning (0.0f, 0.0f) for x and (0.0f, -1.0f) for y tells us that we need to use the y scroll value to move the scroll bar
-   * along y axis with y scroll of 0 starting at bottom (due to -1.0f on y), a value of (0.0f, 1.0f) on x axis mask would mean using y scroll value to move scroll bar along x axis
-   *
-   * This function is used by numerous objects such as scroll indicators and scroll overshoot indicators and all
-   * layout implementations should provide their own version of this function to ensure proper functionality of
-   * internal toolkit systems.
-   *
-   * @param[out] scrollHint Vector2 describing how x and y scroll values should be used for y-axis scrolling
-   */
-  DALI_IMPORT_API virtual void GetYAxisScrollHint(Vector2& scrollHint) const;
-
-  /**
    * @brief Query the scroll speed factor of the layout while dragging.
    *
    * This factor is used by the layout to customise its scroll speed while dragging.
@@ -407,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
@@ -443,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