aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@jollamobile.com>2013-11-20 22:29:54 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-21 00:58:04 +0100
commit8121ae60decde8e5c9de02500de1469b053f78e2 (patch)
tree3ecf4fa9dfb39a56dc782a435aa3da69efcee645 /src/quick
parent8171e3f8c89410231d6f2c7377178f3e0cb36f5c (diff)
Always check for dragging changed, not just when movement starts
Otherwise, if you flick and then start a new drag before the flick completes, dragging remains false. Change-Id: I9bbe20107317a6edf765c87d2e0afe3e9e2618e9 Done-with: Aaron Kennedy <aaron.kennedy@jollamobile.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickflickable.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index f0a68b184a..ae174d86e0 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -1116,10 +1116,10 @@ void QQuickFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event)
hData.velocity = 0;
}
- if ((hMoved && !prevHMoved) || (vMoved && !prevVMoved)) {
- draggingStarting();
+ draggingStarting();
+
+ if ((hMoved && !prevHMoved) || (vMoved && !prevVMoved))
q->movementStarting();
- }
qint64 currentTimestamp = computeCurrentTime(event);
qreal elapsed = qreal(currentTimestamp - (lastPos.isNull() ? lastPressTime : lastPosTime)) / 1000.;