diff options
| author | Robin Burchell <robin.burchell@viroteck.net> | 2015-06-22 21:42:26 +0200 |
|---|---|---|
| committer | Robin Burchell <robin.burchell@viroteck.net> | 2015-06-29 21:07:19 +0000 |
| commit | 89d66647e0b3387b7ef8fbeb1f46b2d4385c3bea (patch) | |
| tree | c8a36c4cff1f4c5d3b6a6b949017b3fb4b5fe7a9 /src/quick | |
| parent | a1e4c5c3d71b3a98987e33e11f343b51848ea4bb (diff) | |
QQuickFlickable: Accept pixel wheel events as well as angle wheel events.
This fixes the case with two overlapping Flickables both handling
wheel events (i.e. not preventing propagation).
Change-Id: Ie59ffb02c5e9a52055678d662606543a80414c21
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 1b06525c2b..bfb732554b 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -1434,6 +1434,7 @@ void QQuickFlickable::wheelEvent(QWheelEvent *event) d->lastPosTime = currentTimestamp; d->accumulatedWheelPixelDelta += QVector2D(event->pixelDelta()); d->drag(currentTimestamp, event->type(), event->posF(), d->accumulatedWheelPixelDelta, true, !d->scrollingPhase, velocity); + event->accept(); } if (!event->isAccepted()) |