Drawer: fix drag to close from the outside on touch

Set mouseGrabberPopup in QQuickOverlay::childMouseEventFilter() the
same way it is set in QQuickOverlay::mousePressEvent() to ensure that
the consequent mouse move events are routed to the appropriate popup.

This worked with "genuine" mouse move events that were caught by the
same child mouse event filter and that way routed to the appropriate
popup, but not with "synthesized" mouse move events that are caught
by QQuickOverlay::mousePressEvent() instead.

Change-Id: Ic59afd85e55c13ebec482bc4dc534accd1f92b2c
Task-number: QTBUG-56010
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index c6e34ee2..a1fdffb3 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
@@ -404,7 +404,11 @@ bool QQuickOverlay::childMouseEventFilter(QQuickItem *item, QEvent *event)
             switch (event->type()) {
             case QEvent::MouseButtonPress:
                 emit pressed();
-                return popup->overlayEvent(item, event);
+                if (popup->overlayEvent(item, event)) {
+                    d->mouseGrabberPopup = popup;
+                    return true;
+                }
+                break;
             case QEvent::MouseMove:
                 return popup->overlayEvent(item, event);
             case QEvent::MouseButtonRelease: