From 97883e9fed0eb60d89bc63810d36ddeee1e16314 Mon Sep 17 00:00:00 2001 From: Julien Heanley Date: Fri, 9 May 2014 09:39:25 +0100 Subject: [PATCH] (ScrollView)Found issue with change made in previous patch for overshoot enabling [Problem] Will crash if overshoot enable is called twice without a disable in between [Solution] Make sure application can call to enable as many times as it wants Change-Id: Ie7bbfe8eea8475dee9294f8949a09a40fa8df483 Signed-off-by: Julien Heanley --- .../internal/controls/scrollable/scrollable-impl.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp index 021b908..90fb50e 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp @@ -99,10 +99,13 @@ bool Scrollable::IsScrollComponentEnabled(Toolkit::Scrollable::ScrollComponentTy void Scrollable::EnableScrollComponent(Toolkit::Scrollable::ScrollComponentType type) { - if(type == Toolkit::Scrollable::OvershootIndicator && !mOvershootEnabled) + if(type == Toolkit::Scrollable::OvershootIndicator) { - SetOvershootEnabled(true); - mOvershootEnabled = true; + if( !mOvershootEnabled ) + { + SetOvershootEnabled(true); + mOvershootEnabled = true; + } return; } if( mComponents.find(type) == mComponents.end() ) @@ -119,10 +122,13 @@ void Scrollable::EnableScrollComponent(Toolkit::Scrollable::ScrollComponentType void Scrollable::DisableScrollComponent(Toolkit::Scrollable::ScrollComponentType type) { - if(type == Toolkit::Scrollable::OvershootIndicator && mOvershootEnabled) + if(type == Toolkit::Scrollable::OvershootIndicator) { - SetOvershootEnabled(false); - mOvershootEnabled = false; + if( mOvershootEnabled ) + { + SetOvershootEnabled(false); + mOvershootEnabled = false; + } return; } ComponentIter pair = mComponents.find( type ); -- 2.7.4