Move mouse release handling into deliverMouseEvent

Change-Id: I4071a5fa217230883b6b99b2f37cdcd459aa14c5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

1 files changed, 5 insertions, 7 deletions

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 16d99e961a..72b181fcdd 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1662,8 +1662,13 @@ void QQuickWindowPrivate::deliverMouseEvent(QMouseEvent *event)
         me->accept();
         q->sendEvent(mouseGrabberItem, me.data());
         event->setAccepted(me->isAccepted());
+
+        // release event, make sure to ungrab if there still is a grabber
+        if (event->type() == QEvent::MouseButtonRelease && !event->buttons() && q->mouseGrabberItem())
+            q->mouseGrabberItem()->ungrabMouse();
     } else {
         // send initial press
+        event->setAccepted(false);
         if ((event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonDblClick) &&
                 (event->buttons() & event->button()) == event->buttons()) {
             bool delivered = deliverInitialMousePressEvent(event);
@@ -2022,14 +2027,7 @@ void QQuickWindowPrivate::handleMouseEvent(QMouseEvent *event)
     case QEvent::MouseButtonRelease:
         Q_QUICK_INPUT_PROFILE(QQuickProfiler::Mouse, QQuickProfiler::InputMouseRelease, event->button(),
                               event->buttons());
-        if (!q->mouseGrabberItem()) {
-            event->ignore();
-            return;
-        }
-
         deliverPointerEvent(pointerEventInstance(event));
-        if (q->mouseGrabberItem() && !event->buttons())
-            q->mouseGrabberItem()->ungrabMouse();
         break;
     case QEvent::MouseButtonDblClick:
         Q_QUICK_INPUT_PROFILE(QQuickProfiler::Mouse, QQuickProfiler::InputMouseDoubleClick,