diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-21 13:13:08 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-21 19:55:17 +0200 |
| commit | 9de578e989b79a01d0450f7fec72e37937679910 (patch) | |
| tree | 0342333ceabf706a93cb03dad4366efa4fb6189a /src | |
| parent | d16e62d81587e98b054af4f66c02959c5bb89ff6 (diff) | |
QQuickFlickable::filterPointerEvent(): remove handling of receiver==this
Since the Q_ASSERT_X(receiver != this, ...) has been there for a long
time, clearly it never happens in real life. It doesn't happen in any
of our autotests either. So having dead code to handle it is just confusing.
Amends d9d2277fb8e823af8977d6f3aa5cc7ee8213c26a
Change-Id: I69714804e4967cc1a373af67bf4c9a4c169f5738
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index f8bedfa4a4..44b91e5316 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -2382,15 +2382,9 @@ void QQuickFlickablePrivate::addPointerHandler(QQuickPointerHandler *h) */ bool QQuickFlickable::filterMouseEvent(QQuickItem *receiver, QMouseEvent *event) { + Q_ASSERT_X(receiver != this, "", "Flickable received a filter event for itself"); Q_D(QQuickFlickable); QPointF localPos = mapFromScene(event->scenePosition()); - - Q_ASSERT_X(receiver != this, "", "Flickable received a filter event for itself"); - if (receiver == this && d->stealMouse) { - // we are already the grabber and we do want the mouse event to ourselves. - return true; - } - bool receiverDisabled = receiver && !receiver->isEnabled(); bool stealThisEvent = d->stealMouse; bool receiverKeepsGrab = receiver && (receiver->keepMouseGrab() || receiver->keepTouchGrab()); |