Revert "License conversion from Flora to Apache 2.0"

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / scrollable / item-view / item-view-impl.h

diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
index d7e1340..5bdc060 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
@@ -27,7 +27,7 @@
 #include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
 #include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
-#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h>
+#include <dali-toolkit/public-api/shader-effects/bouncing-effect.h>
 
 namespace Dali
 {
@@ -262,6 +262,27 @@ public:
    */
   void DoRefresh(float currentLayoutPosition, bool cacheExtra);
 
+
+  /**
+   * @copydoc Toolkit::ItemView::SetItemsParentOrigin
+   */
+  void SetItemsParentOrigin( const Vector3& parentOrigin );
+
+  /**
+   * @copydoc Toolkit::ItemView::GetItemsParentOrigin
+   */
+  Vector3 GetItemsParentOrigin() const;
+
+  /**
+   * @copydoc Toolkit::ItemView::SetItemsAnchorPoint
+   */
+  void SetItemsAnchorPoint( const Vector3& anchorPoint );
+
+  /**
+   * @copydoc Toolkit::ItemView::GetItemsAnchorPoint
+   */
+  Vector3 GetItemsAnchorPoint() const;
+
 private:
 
   /**
@@ -552,7 +573,7 @@ private:
   Dali::Gesture::State mGestureState;
 
   ImageActor mOvershootOverlay;           ///< The overlay actor for overshoot effect
-  OvershootRippleEffect mOvershootEffect; ///< The vertex/fragment shader used to display the overshoot ripple effect
+  BouncingEffect mOvershootEffect; ///< The vertex/fragment shader used to display the overshoot ripple effect
 
   Dali::Toolkit::ScrollConnector mScrollConnector; ///< Connects ItemView with scrollable components e.g. scroll bars
   Constrainable   mScrollPositionObject;     ///< From mScrollConnector
@@ -564,6 +585,9 @@ private:
   Property::Index mPropertyScrollSpeed; ///< The current scroll speed of item view
 
   bool mRefreshEnabled; ///< Whether to refresh the cache automatically
+
+  Vector3 mItemsParentOrigin;
+  Vector3 mItemsAnchorPoint;
 };
 
 } // namespace Internal