X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-overshoot-indicator-impl.h;h=7263f0c85b7a52de183ea0a037b14e99f3cbba8d;hp=ce0b8d563f044e2ea56e0e66a69a2e13de3dd516;hb=a1a30b337ce9bf681f3738e43d1b6846732d5e1b;hpb=b422e5389b5b78d6037865c77453ab2fb5e47a0d

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
--- 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-toolkit/public-api/shader-effects/bouncing-effect.h>
 
 namespace Dali
 {
@@ -71,12 +70,23 @@ public:
   void Reset();
 
   /**
+   * Clears the overshoot
+   */
+  void ClearOvershoot();
+
+  /**
    * 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
@@ -132,6 +142,19 @@ public:
    */
   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
 };
@@ -179,6 +202,11 @@ public:
   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
    *
@@ -195,10 +223,7 @@ public:
   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);
 
@@ -218,9 +243,8 @@ public:
   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
-  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