diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-01-14 18:27:14 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-01-15 09:46:09 +0000 |
| commit | 0c3866a5ba406fe7d04ec19cbf8378e9b0150fb0 (patch) | |
| tree | 0fbc020e7f77a5f776e8430d44b3a3e8d69d66b3 /src/quick | |
| parent | 367a781854ff4d4bcc0fb84c2d45278e92a7369e (diff) | |
Flickable: ignore trackpad events with px deltas in disallowed direction
If Flickable.flickDirection == HorizontalFlick, then if the accumulated
QWheelEvent::pixelDelta()'s abs(dx) > 2 * abs(dy), clearly the user is
trying to scroll horizontally; otherwise, don't accept the event.
That way the event is allowed to propagate to a parent Flickable that
does allow flicking vertically. Likewise if the nesting is the other
way around, only allow the inner vertical Flickable to accept if the
flicking is actually vertical.
Fixes: QTBUG-57245
Fixes: QTBUG-80236
Change-Id: Ieb0bf9310a67210ce7e9fe7a80c88baef2cc7ede
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit dccd8f0b5ca8f6faefb49718e33f9090243f3202)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 7690389936..62bc078f4d 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -1565,7 +1565,7 @@ void QQuickFlickable::wheelEvent(QWheelEvent *event) QQuickItem::wheelEvent(event); return; } - qCDebug(lcWheel) << event->device() << event; + qCDebug(lcWheel) << event->device() << event << event->source(); event->setAccepted(false); qint64 currentTimestamp = d->computeCurrentTime(event); switch (event->phase()) { @@ -1586,7 +1586,8 @@ void QQuickFlickable::wheelEvent(QWheelEvent *event) d->pressed = false; d->scrollingPhase = false; d->draggingEnding(); - event->accept(); + if (isMoving()) + event->accept(); d->lastPosTime = -1; break; case Qt::ScrollEnd: @@ -1713,9 +1714,21 @@ void QQuickFlickable::wheelEvent(QWheelEvent *event) QVector2D velocity(xDelta / elapsed, yDelta / elapsed); d->lastPosTime = currentTimestamp; d->accumulatedWheelPixelDelta += QVector2D(event->pixelDelta()); - d->drag(currentTimestamp, event->type(), event->position(), d->accumulatedWheelPixelDelta, - true, !d->scrollingPhase, true, velocity); - event->accept(); + // Try to drag if 1) we already are dragging or flicking, or + // 2) the flickable is free to flick both directions, or + // 3) the movement so far has been mostly horizontal AND it's free to flick horizontally, or + // 4) the movement so far has been mostly vertical AND it's free to flick vertically. + // Otherwise, wait until the next event. Wheel events with pixel deltas tend to come frequently. + if (isMoving() || isFlicking() || (yflick() && xflick()) + || (xflick() && qAbs(d->accumulatedWheelPixelDelta.x()) > qAbs(d->accumulatedWheelPixelDelta.y() * 2)) + || (yflick() && qAbs(d->accumulatedWheelPixelDelta.y()) > qAbs(d->accumulatedWheelPixelDelta.x() * 2))) { + d->drag(currentTimestamp, event->type(), event->position(), d->accumulatedWheelPixelDelta, + true, !d->scrollingPhase, true, velocity); + event->accept(); + } else { + qCDebug(lcWheel) << "not dragging: accumulated deltas" << d->accumulatedWheelPixelDelta << + "moving?" << isMoving() << "can flick horizontally?" << xflick() << "vertically?" << yflick(); + } } if (!event->isAccepted()) |