From a7c0fb8e478b1efb8ae0e078e9f1af217ad887a1 Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Tue, 25 Aug 2015 15:51:24 +0100 Subject: [PATCH] (ScrollView)Fix the double bouncing of the overshoot actor Remove ClearOvershoot, as the overshoot actor is updated with the change of OVERSHOOT_X / OVERSHOOT_Y through property noticification, the clear animation is redundant which causes the double bouncing Change-Id: I3a377928f1e18ded3a87882dd57b7e9e9ffeea51 --- .../scroll-view/scroll-overshoot-indicator-impl.cpp | 12 ------------ .../scrollable/scroll-view/scroll-overshoot-indicator-impl.h | 5 ----- .../controls/scrollable/scroll-view/scroll-view-impl.cpp | 5 ----- 3 files changed, 22 deletions(-) diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp index 592fefc..0420830 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp @@ -112,18 +112,6 @@ void ScrollOvershootIndicator::SetOvershootEffectColor( const Vector4& color ) } } -void ScrollOvershootIndicator::ClearOvershoot() -{ - if(mEffectX) - { - mEffectX->SetOvershoot(0.0f); - } - if(mEffectY) - { - mEffectY->SetOvershoot(0.0f); - } -} - ScrollOvershootEffect::ScrollOvershootEffect( bool vertical ) : mVertical(vertical) { 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 f19e39c..7eebe4b 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. 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 86e9173..a8bd61e 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 @@ -2439,11 +2439,6 @@ void ScrollView::OnPan( const PanGesture& gesture ) { mScrollMainInternalPrePositionConstraint.Remove(); } - - if( mOvershootIndicator ) - { - mOvershootIndicator->ClearOvershoot(); - } } else { -- 2.7.4