X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-overshoot-indicator-impl.h;h=1dadcfc244390eba282fab36bbcb6d32c04cf350;hb=ed6731da113ef109a6cb6a68db97fafb5ecf1278;hp=8591f444f0441d190227172357cf78f27a7a9545;hpb=8a935c6ef74474f62d6ba3446656fa5ced2f300d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h index 8591f44..1dadcfc 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h @@ -76,11 +76,6 @@ public: void Reset(); /** - * Clears the overshoot - */ - void ClearOvershoot(); - - /** * Create an initialized ScrollOvershootIndicator * * @return A pointer to the created ScrollOvershootIndicator. @@ -249,14 +244,16 @@ public: static ScrollOvershootEffectRipplePtr New( bool vertical, Scrollable& scrollable ); private: + Actor mOvershootOverlay; ///< the actor which displays the overshoot effect Scrollable& mAttachedScrollView; ///< the actor that this indicator has been attached to Animation mScrollOvershootAnimation; ///< overshoot animation PropertyNotification mOvershootIncreaseNotification;///< notification used to inform as overshoot increases PropertyNotification mOvershootDecreaseNotification;///< notification used to inform as overshoot decreases Property::Index mOvershootProperty; ///< index of the overshoot property in the scrollable actor Property::Index mEffectOvershootProperty; ///< index of the effect's overshoot property - float mOvershoot; ///< last overshoot value as detected by notifications - unsigned short mAnimationStateFlags; ///< contains flags indicating the current state of the overshoot animation + float mOvershoot; ///< last overshoot value as detected by notifications + Vector2 mOvershootSize; ///< The size of the overshoot effect + unsigned short mAnimationStateFlags; ///< contains flags indicating the current state of the overshoot animation }; } // namespace Internal