From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Mon, 23 Feb 2015 12:02:16 +0000 (+0000)
Subject: (ScrollView) Stop the touch down timer if Transform is called (via ScrollTo) while... 
X-Git-Tag: dali_1.0.31~3^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=c1dbffef0096950e8996fb276b1f4162bfc501d3

(ScrollView) Stop the touch down timer if Transform is called (via ScrollTo) while it's active

Patch from Matthew Stephenson

[Problem]  ScrollTo while timer is active causing undesired effects.
[Solution] Cancel the timer when TransformTo is called.

Change-Id: I6dd96454c0044054d929f30759f05c70e4877cd3
---

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 4f49d70..8bc5fe2 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
@@ -1142,6 +1142,9 @@ void ScrollView::TransformTo(const Vector3& position,
 void ScrollView::TransformTo(const Vector3& position, float duration, AlphaFunction alpha,
                              DirectionBias horizontalBias, DirectionBias verticalBias)
 {
+  // If this is called while the timer is running, then cancel it
+  StopTouchDownTimer();
+
   Actor self( Self() );
 
   // Guard against destruction during signal emission