X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscroll-bar%2Fscroll-bar-impl.h;h=8a8177dbceaaa0ad266f536ce72fdd6a5dd19afc;hb=e48daf4e855cbe98647a6c1d5ca54e1d706cf3da;hp=f5321a46f4406a1decc3b4212fb0c23e3cca6165;hpb=70fc28a8c9ad04e29cb4a69c856bac3e96e2301d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h index f5321a4..8a8177d 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h @@ -201,6 +201,11 @@ private: // from Control virtual void OnInitialize(); /** + * @copydoc Toolkit::Control::OnPan + */ + virtual void OnPan( const PanGesture& gesture ); + + /** * @copydoc CustomActorImpl::OnSizeSet( const Vector3& size ) */ virtual void OnSizeSet( const Vector3& size ); @@ -243,14 +248,6 @@ private: */ void OnIndicatorHeightPolicyPropertySet(Property::Value propertyValue); - /** - * Pan gesture callback - * - * @param[in] actor The actor the event is raised for - * @param[in] gesture The pan event info - */ - void OnPan(Actor source, const PanGesture& gesture); - private: /** @@ -290,8 +287,6 @@ private: Toolkit::ScrollBar::IndicatorHeightPolicy mIndicatorHeightPolicy; ///< The height policy of scroll indicator (variable or fixed) float mIndicatorFixedHeight; ///< The fixed height of scroll indicator - PanGestureDetector mPanGestureDetector; ///< The pan gesture detector for scroll indicator - Timer mContractDelayTimer; ///< Timer guarantee contract delay time. Timer mPanProcessTimer; ///< The timer to process the pan gesture after the gesture is started.