From: jonghyun.ho <jonghyun.ho@samsung.com>
Date: Mon, 23 Jun 2014 09:30:19 +0000 (+0900)
Subject: Reset mGestureStackDepth when panning is interrupted by ScrollTo
X-Git-Tag: dali_1.0.0~28
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=3ebb0fd9b1a3af010ea79ad0afb5c9f0cf5a1943;ds=sidebyside

Reset mGestureStackDepth when panning is interrupted by ScrollTo

[problem]     ScrollView is stopped and not snapped
[cause]       mGestureStackDepth is not zero so FinishTransform is not called
[solution]    Reset mGestureStackDepth when panning is interrupted by ScrollTo

Change-Id: I694cc769279c1e25039dbe0660eda542dfdd9a8e
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
---

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 0c761fb..0d37399 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
@@ -1296,6 +1296,7 @@ void ScrollView::TransformTo(const Vector3& position, const Vector3& scale, floa
   {
     DALI_LOG_SCROLL_STATE("[0x%X] Interrupting Pan, set to false", this );
     mPanning = false;
+    mGestureStackDepth = 0;
     self.SetProperty( mPropertyPanning, false );
 
     if( mScrollMainInternalPrePositionConstraint )
@@ -2646,6 +2647,10 @@ void ScrollView::OnGestureEx(Gesture::State state)
     {
       FinishTransform();
     }
+    else
+    {
+      DALI_LOG_SCROLL_STATE("[0x%X] mGestureStackDepth[%d]", this, mGestureStackDepth);
+    }
   }
 }