DALi signals refactor to remove V2 naming

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

diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
index 43959fd..e100e75 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
@@ -19,7 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/dali.h>
 #include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES
@@ -120,6 +119,16 @@ public:
    */
   Vector4 GetOvershootEffectColor() const;
 
+  /**
+   * @copydoc Dali::Toolkit::Scrollable::SetOvershootAnimationSpeed(float pixelsPerSecond)
+   */
+  void SetOvershootAnimationSpeed( float pixelsPerSecond );
+
+  /**
+   * @copydoc Dali::Toolkit::Scrollable::GetOvershootAnimationSpeed()
+   */
+  float GetOvershootAnimationSpeed() const;
+
 private:
 
   /**
@@ -134,22 +143,22 @@ public: //Signals
   /**
    * @copydoc Dali::Toolkit::Scrollable::ScrollStartedSignal()
    */
-  Toolkit::Scrollable::ScrollStartedSignalV2& ScrollStartedSignal();
+  Toolkit::Scrollable::ScrollStartedSignalType& ScrollStartedSignal();
 
   /**
    * @copydoc Dali::Toolkit::Scrollable::ScrollUpdatedSignal()
    */
-  Toolkit::Scrollable::ScrollUpdatedSignalV2& ScrollUpdatedSignal();
+  Toolkit::Scrollable::ScrollUpdatedSignalType& ScrollUpdatedSignal();
 
   /**
    * @copydoc Dali::Toolkit::Scrollable::ScrollCompletedSignal()
    */
-  Toolkit::Scrollable::ScrollCompletedSignalV2& ScrollCompletedSignal();
+  Toolkit::Scrollable::ScrollCompletedSignalType& ScrollCompletedSignal();
 
   /**
    * @copydoc Dali::Toolkit::Scrollable::ScrollClampedSignal()
    */
-  Toolkit::Scrollable::ScrollClampedSignalV2& ScrollClampedSignal();
+  Toolkit::Scrollable::ScrollClampedSignalType& ScrollClampedSignal();
 
   /**
    * Connects a callback function with the object's signals.
@@ -225,6 +234,7 @@ private:
 protected:
 
   Vector4         mOvershootEffectColor;    ///<The color of the overshoot bouncing effect
+  float           mOvershootAnimationSpeed; ///<The speed of the overshoot animation (pixels per second)
 
   Property::Index mPropertyRelativePosition;///< Scroll Relative Position ("scroll-relative-position") [range from 0.0f - 1.0f in each axes]
   Property::Index mPropertyPositionMin;     ///< Scroll Domain Minimum ("position-min")
@@ -235,10 +245,10 @@ protected:
 
   std::map<Toolkit::Scrollable::ScrollComponentType, ScrollComponentPtr> mComponent;  ///< ScrollComponent (such as a scrollbar/page indicator/status)
 
-  Toolkit::Scrollable::ScrollStartedSignalV2 mScrollStartedSignalV2;
-  Toolkit::Scrollable::ScrollUpdatedSignalV2 mScrollUpdatedSignalV2;
-  Toolkit::Scrollable::ScrollCompletedSignalV2 mScrollCompletedSignalV2;
-  Toolkit::Scrollable::ScrollClampedSignalV2 mScrollClampedSignalV2;
+  Toolkit::Scrollable::ScrollStartedSignalType mScrollStartedSignal;
+  Toolkit::Scrollable::ScrollUpdatedSignalType mScrollUpdatedSignal;
+  Toolkit::Scrollable::ScrollCompletedSignalType mScrollCompletedSignal;
+  Toolkit::Scrollable::ScrollClampedSignalType mScrollClampedSignal;
 
 private: