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-view-impl.cpp;h=0c761fba27ffdeab32dc2276d28995e0252e070c;hp=790c7f8a843a67e431cdccf8ca1b8e530961c440;hb=a1a30b337ce9bf681f3738e43d1b6846732d5e1b;hpb=b422e5389b5b78d6037865c77453ab2fb5e47a0d diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp index 790c7f8..0c761fb 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp @@ -1905,6 +1905,15 @@ void ScrollView::RemoveOverlay(Actor actor) mInternalActor.Remove( actor ); } +void ScrollView::SetOvershootEffectColor( const Vector4& color ) +{ + mOvershootEffectColor = color; + if( mOvershootIndicator ) + { + mOvershootIndicator->SetOvershootEffectColor( color ); + } +} + void ScrollView::SetScrollingDirection( Radian direction, Radian threshold ) { PanGestureDetector panGesture( GetPanGestureDetector() ); @@ -2587,6 +2596,11 @@ void ScrollView::OnPan(PanGesture gesture) { self.RemoveConstraint(mScrollMainInternalPrePositionConstraint); } + + if( mOvershootIndicator ) + { + mOvershootIndicator->ClearOvershoot(); + } } else {