diff options
| author | Michael Brasser <michael.brasser@live.com> | 2013-10-03 21:14:08 -0500 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-04 15:40:52 +0200 |
| commit | 717c65e199ed456e5d637d9802422fdefdedeb28 (patch) | |
| tree | 1842ec33ee6f935ee9000a6ffa70180e59a73c10 /src/quick | |
| parent | 9b82136534bfb6877dae6318ab9c7f4259131b0f (diff) | |
Fix regression in pressDelay behavior.
Don't deliver a press event when a Flickable is moved before
the pressDelay expires. This prevents delegates flickering
between pressed and unpressed states when beginning to
flick a Flickable.
Fixes regression introduced by
429af6244518172e19abf7fecd7112f26bac6b31/
d02131e743597b9bd3070d986c61a1c91ea8317a.
Task-number: QTBUG-31168
Change-Id: Id4e853fabe99000837df3681acd8fc4e76d2e9b3
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 9b5532c27f..b94d8dd4b0 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -1246,15 +1246,6 @@ void QQuickFlickable::mouseMoveEvent(QMouseEvent *event) { Q_D(QQuickFlickable); if (d->interactive) { - if (d->delayedPressEvent) { - // A move beyond the threshold replays the press to give nested Flickables - // the opportunity to grab the gesture. - QPointF delta = event->localPos() - d->delayedPressEvent->localPos(); - if (QQuickWindowPrivate::dragOverThreshold(qAbs(delta.x()), Qt::XAxis, event) - || QQuickWindowPrivate::dragOverThreshold(qAbs(delta.y()), Qt::YAxis, event)) { - d->replayDelayedPress(); - } - } d->handleMouseMoveEvent(event); event->accept(); } else { |