From f0f740fadaa4c368df5743502f445f9ce0de1247 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Mon, 19 Apr 2010 15:57:39 +1000
Subject: Avoid painfully slow flicking to snap positions in GridView

Task-number: QTBUG-9994
---
 src/declarative/graphicsitems/qdeclarativegridview.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 727dba3..23140fa 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -50,6 +50,7 @@
 #include <qlistmodelinterface_p.h>
 #include <QKeyEvent>
 
+#include <qmath.h>
 #include <math.h>
 
 QT_BEGIN_NAMESPACE
@@ -834,7 +835,15 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
             if (v > 0)
                 dist = -dist;
             data.flickTarget = -snapPosAt(-(data.move.value() - highlightRangeStart) + dist) + highlightRangeStart;
-            dist = -data.flickTarget + data.move.value();
+            qreal adjDist = -data.flickTarget + data.move.value();
+            if (qAbs(adjDist) > qAbs(dist)) {
+                // Prevent painfully slow flicking - adjust velocity to suit flickDeceleration
+                v2 = accel * 2.0f * qAbs(dist);
+                v = qSqrt(v2);
+                if (dist > 0)
+                    v = -v;
+            }
+            dist = adjDist;
             accel = v2 / (2.0f * qAbs(dist));
         } else {
             data.flickTarget = velocity > 0 ? minExtent : maxExtent;
-- 
cgit v0.12