New Bouncing Effect

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

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h
index ce0b8d5..7263f0c 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h
@@ -19,7 +19,6 @@
  */
 
 #include <dali/dali.h>
  */
 
 #include <dali/dali.h>

-#include <dali-toolkit/public-api/shader-effects/bouncing-effect.h>

 
 namespace Dali
 {
 
 namespace Dali
 {


@@ -71,12 +70,23 @@ public:
   void Reset();
 
   /**
   void Reset();
 
   /**

+   * Clears the overshoot
+   */
+  void ClearOvershoot();
+
+  /**

    * Create an initialized ScrollOvershootIndicator
    *
    * @return A pointer to the created ScrollOvershootIndicator.
    */
   static ScrollOvershootIndicator* New();
 
    * Create an initialized ScrollOvershootIndicator
    *
    * @return A pointer to the created ScrollOvershootIndicator.
    */
   static ScrollOvershootIndicator* New();
 

+  /**
+   * Set the color of the overshoot effect.
+   * @parm[in] color The color of the overshoot effect
+   */
+  void SetOvershootEffectColor( const Vector4& color );
+

 private:
   ScrollOvershootEffectPtr mEffectX;                      ///< effect used for x-axis/horizontal display
   ScrollOvershootEffectPtr mEffectY;                      ///< effect used for y-axis/vertical display
 private:
   ScrollOvershootEffectPtr mEffectX;                      ///< effect used for x-axis/horizontal display
   ScrollOvershootEffectPtr mEffectY;                      ///< effect used for y-axis/vertical display


@@ -132,6 +142,19 @@ public:
    */
   virtual void UpdatePropertyNotifications() {}
 
    */
   virtual void UpdatePropertyNotifications() {}
 

+  /**
+   * @copydoc ScrollOvershootIndicator::SetOvershootEffectColor()
+   */
+  virtual void SetOvershootEffectColor( const Vector4& color ) = 0;
+
+  /**
+   * Sets shader overshoot value, either immediately of by animating over time
+   *
+   * @param[in] amount The amount to set overshoot to [-1.0f,1.0f]
+   * @param[in] animate Whether to animate or set immediately
+   */
+  virtual void SetOvershoot(float amount, bool animate = true) = 0;
+

 private:
   bool mVertical;                      ///< whether this is a vertical/horizontal effect
 };
 private:
   bool mVertical;                      ///< whether this is a vertical/horizontal effect
 };


@@ -179,6 +202,11 @@ public:
   void UpdatePropertyNotifications();
 
   /**
   void UpdatePropertyNotifications();
 
   /**

+   * @copydoc ScrollOvershootEffect::SetOvershootEffectColor()
+   */
+  void SetOvershootEffectColor( const Vector4& color );
+
+  /**

    * Updates the vibility of the overshoot image as well as updating its size, position and rotation
    * This function is called when animation starts and finishes
    *
    * Updates the vibility of the overshoot image as well as updating its size, position and rotation
    * This function is called when animation starts and finishes
    *


@@ -195,10 +223,7 @@ public:
   void OnOvershootNotification(PropertyNotification& source);
 
   /**
   void OnOvershootNotification(PropertyNotification& source);
 
   /**

-   * Sets shader overshoot value, either immediately of by animating over time
-   *
-   * @param[in] amount The amount to set overshoot to [-1.0f,1.0f]
-   * @param[in] animate Whether to animate or set immediately
+   * @copydoc ScrollOvershootEffect::SetOvershoot()

    */
   void SetOvershoot(float amount, bool animate = true);
 
    */
   void SetOvershoot(float amount, bool animate = true);
 


@@ -218,9 +243,8 @@ public:
   static ScrollOvershootEffectRipplePtr New( bool vertical, Scrollable& scrollable );
 
 private:
   static ScrollOvershootEffectRipplePtr New( bool vertical, Scrollable& scrollable );
 
 private:

-  ImageActor            mOvershootImage;               ///< the overshoot image...
+  Actor                 mOvershootOverlay;             ///< the actor which displays the overshoot effect

   Scrollable&           mAttachedScrollView;           ///< the actor that this indicator has been attached to
   Scrollable&           mAttachedScrollView;           ///< the actor that this indicator has been attached to

-  BouncingEffect        mRippleEffect;                 ///< the ripple vertex/fragment shader effect

   Animation             mScrollOvershootAnimation;     ///< overshoot animation
   PropertyNotification  mOvershootIncreaseNotification;///< notification used to inform as overshoot increases
   PropertyNotification  mOvershootDecreaseNotification;///< notification used to inform as overshoot decreases
   Animation             mScrollOvershootAnimation;     ///< overshoot animation
   PropertyNotification  mOvershootIncreaseNotification;///< notification used to inform as overshoot increases
   PropertyNotification  mOvershootDecreaseNotification;///< notification used to inform as overshoot decreases