X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-impl.cpp;h=1273cd13a696c7af7e2b6a1b7e76f8f1c31809b6;hp=c0fb772190a74a34d75bcc40bad355c5ffae5df6;hb=ca99959003c0445d5afb437e2be26361dff51623;hpb=81b6946e6eae9989ba04ba164adf9347e85efdfe diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp index c0fb772..1273cd1 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp @@ -629,7 +629,7 @@ Dali::Toolkit::ScrollView ScrollView::New() } ScrollView::ScrollView() -: ScrollBase( ControlBehaviour( REQUIRES_WHEEL_EVENTS | DISABLE_STYLE_CHANGE_SIGNALS ) ), // Enable size negotiation +: ScrollBase( ControlBehaviour( DISABLE_STYLE_CHANGE_SIGNALS ) ), // Enable size negotiation mTouchDownTime(0u), mGestureStackDepth(0), mScrollStateFlags(0), @@ -703,6 +703,9 @@ void ScrollView::OnInitialize() UpdatePropertyDomain(); SetInternalConstraints(); + + // Connect wheel event + self.WheelEventSignal().Connect( this, &ScrollView::OnWheelEvent ); } void ScrollView::OnSceneConnection( int depth ) @@ -2129,7 +2132,7 @@ bool ScrollView::OnTouch( Actor actor, const TouchEvent& touch ) return false; } -bool ScrollView::OnWheelEvent(const WheelEvent& event) +bool ScrollView::OnWheelEvent( Actor actor, const WheelEvent& event) { if(!mSensitive) {