diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-07-24 15:42:14 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-07-24 20:24:55 +0000 |
commit | 15d439d96c504964d70cbb09b1820a93ea86dd17 (patch) | |
tree | b1b1c3d5561862d885328ed38a32e11f3a569689 | |
parent | 235b0e1411373d6985ccddcf4276ccc4ab6d9dc8 (diff) |
QQMultiPointHandler: don't respond to a QWheelEvent
The most noticeable consequence was having DragHandler activate when
attempting to scroll a parent Flickable.
Task-number: QTBUG-69607
Change-Id: I5a01695de00db179ddf0b3a39bdcd5e67ba345ef
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
-rw-r--r-- | src/quick/handlers/qquickmultipointhandler.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/handlers/qquickmultipointhandler.cpp b/src/quick/handlers/qquickmultipointhandler.cpp index 9eddd90a50..4e633276ab 100644 --- a/src/quick/handlers/qquickmultipointhandler.cpp +++ b/src/quick/handlers/qquickmultipointhandler.cpp @@ -80,6 +80,9 @@ bool QQuickMultiPointHandler::wantsPointerEvent(QQuickPointerEvent *event) return true; #endif + if (event->asPointerScrollEvent()) + return false; + if (hasCurrentPoints(event)) return true; |