DALi signals refactor to remove V2 naming

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

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
index 6fc10c9..0ffd7d4 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
@@ -19,7 +19,9 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/object/property-notification.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -27,9 +29,6 @@
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
-// predefined effect includes
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h>
-
 namespace Dali
 {
 
@@ -147,12 +146,6 @@ public:
   void ApplyEffect(Toolkit::ScrollViewEffect effect);
 
   /**
-   * @brief ApplyEffect Applies a predefined effect
-   * @param effect
-   */
-  Toolkit::ScrollViewEffect ApplyEffect(Toolkit::ScrollView::PageEffect effect);
-
-  /**
    * @copydoc Toolkit::ScrollView::RemoveEffect
    */
   void RemoveEffect(Toolkit::ScrollViewEffect effect);
@@ -250,18 +243,6 @@ public:
   void SetWrapMode(bool enable);
 
   /**
-   * @deprecated
-   * @copydoc Toolkit::ScrollView::GetRefreshInterval
-   */
-  int GetRefreshInterval() const;
-
-  /**
-   * @deprecated
-   * @copydoc Toolkit::ScrollView::SetRefreshInterval
-   */
-  void SetRefreshInterval(int milliseconds);
-
-  /**
    * @copydoc Toolkit::ScrollView::GetScrollupdateDistance
    */
   int GetScrollUpdateDistance() const;
@@ -378,9 +359,9 @@ public:
                    DirectionBias horizontalBias = DirectionBiasNone, DirectionBias verticalBias = DirectionBiasNone);
 
   /**
-   * @copydoc ScrollTo(const Vector3&, float, DirectionBias, DirectionBias)
+   * @copydoc ScrollTo(const Vector3&, float, AlhpaFunction, DirectionBias, DirectionBias)
    */
-  void TransformTo(const Vector3& position, float duration,
+  void TransformTo(const Vector3& position, float duration, AlphaFunction alpha,
                    DirectionBias horizontalBias = DirectionBiasNone, DirectionBias verticalBias = DirectionBiasNone);
 
   /**
@@ -394,12 +375,23 @@ public:
   void ScrollTo(const Vector3& position, float duration);
 
   /**
+   * @copydoc Toolkit::Scrollable::ScrollTo(const Vector3& position, float duration, AlphaFunction alpha)
+   */
+  void ScrollTo(const Vector3& position, float duration, AlphaFunction alpha);
+
+  /**
    * @copydoc Toolkit::ScrollView::ScrollTo(const Vector3 &position, float duration, DirectionBias horizontalBias, DirectionBias verticalBias)
    */
   void ScrollTo(const Vector3& position, float duration,
                 DirectionBias horizontalBias, DirectionBias verticalBias);
 
   /**
+   * @copydoc Toolkit::ScrollView::ScrollTo(const Vector3 &position, float duration, AlphaFunction alpha, DirectionBias horizontalBias, DirectionBias verticalBias)
+   */
+  void ScrollTo(const Vector3& position, float duration, AlphaFunction alpha,
+                DirectionBias horizontalBias, DirectionBias verticalBias);
+
+  /**
    * @copydoc Toolkit::ScrollView::ScrollTo(unsigned int page)
    */
   void ScrollTo(unsigned int page);
@@ -500,7 +492,7 @@ public: //Signals
   /**
    * @copydoc Dali::Toolkit::ScrollView::SnapStartedSignal()
    */
-  Toolkit::ScrollView::SnapStartedSignalV2& SnapStartedSignal();
+  Toolkit::ScrollView::SnapStartedSignalType& SnapStartedSignal();
 
   /**
    * Connects a callback function with the object's signals.
@@ -695,7 +687,7 @@ private:
    *
    * @param[in] gesture The gesture event.
    */
-  void OnPan(PanGesture pan);
+  void OnPan( const PanGesture& pan);
 
   /**
    * Extension of the above gestures.
@@ -850,7 +842,7 @@ private:
   unsigned long mTouchDownTime;         ///< The touch down time
 
   int mGestureStackDepth;               ///< How many gestures are currently occuring.
-
+  Vector2 mPanStartPosition;            ///< Where the pan gesture's touch down occured
   Vector3 mPanDelta;                    ///< Amount currently panned.
 
   unsigned int mScrollStateFlags;       ///< flags indicating current state of scrolling
@@ -912,8 +904,6 @@ private:
   //ScrollInternalConstraintsPtr mScrollInternalConstraints;
   ActiveConstraint mScrollMainInternalPrePositionConstraint;
   ActiveConstraint mScrollMainInternalPositionConstraint;
-  ActiveConstraint mScrollMainInternalXConstraint;
-  ActiveConstraint mScrollMainInternalYConstraint;
   ActiveConstraint mScrollMainInternalOvershootXConstraint;
   ActiveConstraint mScrollMainInternalOvershootYConstraint;
   ActiveConstraint mScrollMainInternalDeltaConstraint;
@@ -922,7 +912,7 @@ private:
 
   ScrollOvershootIndicatorPtr mOvershootIndicator;
 
-  Toolkit::ScrollView::SnapStartedSignalV2 mSnapStartedSignalV2;
+  Toolkit::ScrollView::SnapStartedSignalType mSnapStartedSignal;
 
   bool mInAccessibilityPan : 1;           ///< With AccessibilityPan its easier to move between snap positions
   bool mInitialized:1;