Consider all popups in the stack to test whether an event should be blocked

Since modal and modeless popups can be arbitrarily nested, it's not
enough to just let the first popup in the stack handle an input event to
see if it should be blocked. The first popup might be modeless and have
a modal parent that then should block events to items further down.

So, return true for the first popup that handled the event, otherwise
continue down the stack.

Fixes: QTBUG-86854
Change-Id: I04fe7833b86353f40cb047cd1330751233dc98c3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 85be957e9f936ea2d0fd9d7ceaf5da8eb1bcac49)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

2 files changed, 139 insertions, 0 deletions

diff --git a/tests/auto/qquickpopup/data/modelessOnModalOnModeless.qml b/tests/auto/qquickpopup/data/modelessOnModalOnModeless.qml
new file mode 100644
index 00000000..7f05cb67
--- /dev/null
+++ b/tests/auto/qquickpopup/data/modelessOnModalOnModeless.qml
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.13
+import QtQuick.Controls 2.13
+
+ApplicationWindow {
+    width: 400
+    height: 400
+
+    property alias modelessPopup: modelessPopup
+    property alias button: button
+    property alias modalPopup: modalPopup
+    property alias tooltip: tooltip
+
+    Popup {
+        id: modelessPopup
+        modal: false
+        closePolicy: Popup.NoAutoClose
+        width: 200
+        height: 200
+        anchors.centerIn: parent
+
+        Button {
+            id: button
+            checkable: true
+            x: 0
+            y: 0
+            text: "Click me"
+        }
+
+        Popup {
+            id: modalPopup
+            modal: true
+            closePolicy: Popup.NoAutoClose
+            width: 100
+            height: 100
+            anchors.centerIn: parent
+
+            Popup {
+                id: tooltip
+                modal: false
+                closePolicy: Popup.NoAutoClose
+                width: 50
+                height: 50
+                anchors.centerIn: parent
+            }
+        }
+    }
+
+}
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
index 3242e361..54952d12 100644
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
@@ -81,6 +81,7 @@ private slots:
     void wheel();
     void parentDestroyed();
     void nested();
+    void modelessOnModalOnModeless();
     void grabber();
     void cursorShape();
     void componentComplete();
@@ -990,6 +991,46 @@ void tst_QQuickPopup::nested()
     QCOMPARE(modalPopup->isVisible(), true);
 }
 
+void tst_QQuickPopup::modelessOnModalOnModeless()
+{
+    QQuickApplicationHelper helper(this, QStringLiteral("modelessOnModalOnModeless.qml"));
+    QVERIFY2(helper.ready, helper.failureMessage());
+    QQuickWindow *window = helper.window;
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+
+    QQuickPopup *modelessPopup = window->property("modelessPopup").value<QQuickPopup *>();
+    QVERIFY(modelessPopup);
+
+    QQuickButton *button = window->property("button").value<QQuickButton *>();
+    QVERIFY(button);
+    QQuickPopup *modalPopup = window->property("modalPopup").value<QQuickPopup *>();
+    QVERIFY(modalPopup);
+    QQuickPopup *tooltip = window->property("tooltip").value<QQuickPopup *>();
+    QVERIFY(modalPopup);
+
+    modelessPopup->open();
+    QCOMPARE(modelessPopup->isVisible(), true);
+    QTRY_COMPARE(modelessPopup->isOpened(), true);
+    const auto buttonPoint = button->mapToScene(button->boundingRect().center()).toPoint();
+    // click into the button, should not be blocked
+    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, buttonPoint);
+    QVERIFY(button->isChecked());
+    modalPopup->open();
+    QCOMPARE(modalPopup->isVisible(), true);
+    QTRY_COMPARE(modalPopup->isOpened(), true);
+    // click into the button, should be blocked
+    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, buttonPoint);
+    QVERIFY(button->isChecked());
+
+    tooltip->setVisible(true);
+    QCOMPARE(tooltip->isVisible(), true);
+    QTRY_COMPARE(tooltip->isOpened(), true);
+    // click into the button, should be blocked
+    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, buttonPoint);
+    QVERIFY(button->isChecked());
+}
+
 // QTBUG-56697
 void tst_QQuickPopup::grabber()
 {