1 files changed, 116 insertions, 0 deletions

diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
index ede3640c..54952d12 100644
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
@@ -73,12 +73,15 @@ private slots:
     void activeFocusOnClose2();
     void activeFocusOnClose3();
     void activeFocusOnClosingSeveralPopups();
+    void activeFocusAfterExit();
+    void activeFocusOnDelayedEnter();
     void hover_data();
     void hover();
     void wheel_data();
     void wheel();
     void parentDestroyed();
     void nested();
+    void modelessOnModalOnModeless();
     void grabber();
     void cursorShape();
     void componentComplete();
@@ -728,6 +731,79 @@ void tst_QQuickPopup::activeFocusOnClosingSeveralPopups()
     QTRY_COMPARE(button->hasActiveFocus(), true);
 }
 
+void tst_QQuickPopup::activeFocusAfterExit()
+{
+    // Test that after closing a popup the highest one in z-order receives it instead.
+    QQuickApplicationHelper helper(this, QStringLiteral("activeFocusAfterExit.qml"));
+    QVERIFY2(helper.ready, helper.failureMessage());
+    QQuickApplicationWindow *window = helper.appWindow;
+    window->show();
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QQuickPopup *popup1 = window->property("popup1").value<QQuickPopup*>();
+    QVERIFY(popup1);
+
+    QQuickPopup *popup2 = window->property("popup2").value<QQuickPopup*>();
+    QVERIFY(popup2);
+    QSignalSpy closedSpy2(popup2, SIGNAL(closed()));
+    QVERIFY(closedSpy2.isValid());
+
+    QQuickPopup *popup3 = window->property("popup3").value<QQuickPopup*>();
+    QVERIFY(popup3);
+    QSignalSpy closedSpy3(popup3, SIGNAL(closed()));
+    QVERIFY(closedSpy3.isValid());
+
+    popup1->open();
+    QVERIFY(popup1->isVisible());
+    QTRY_VERIFY(popup1->hasActiveFocus());
+
+    popup2->open();
+    QVERIFY(popup2->isVisible());
+    QTRY_VERIFY(!popup2->hasActiveFocus());
+
+    popup3->open();
+    QVERIFY(popup3->isVisible());
+    QTRY_VERIFY(popup3->hasActiveFocus());
+
+    popup3->close();
+    closedSpy3.wait();
+    QVERIFY(!popup3->isVisible());
+    QTRY_VERIFY(!popup3->hasActiveFocus());
+    QTRY_VERIFY(!popup2->hasActiveFocus());
+    QTRY_VERIFY(popup1->hasActiveFocus());
+
+    popup2->close();
+    closedSpy2.wait();
+    QVERIFY(!popup2->isVisible());
+    QTRY_VERIFY(!popup2->hasActiveFocus());
+    QTRY_VERIFY(popup1->hasActiveFocus());
+}
+
+void tst_QQuickPopup::activeFocusOnDelayedEnter()
+{
+    // Test that after opening two popups, first of which has an animation, does not cause
+    // the first one to receive focus after the animation stops.
+    QQuickApplicationHelper helper(this, QStringLiteral("activeFocusOnDelayedEnter.qml"));
+    QVERIFY2(helper.ready, helper.failureMessage());
+    QQuickApplicationWindow *window = helper.appWindow;
+    window->show();
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QQuickPopup *popup1 = window->property("popup1").value<QQuickPopup*>();
+    QVERIFY(popup1);
+    QSignalSpy openedSpy(popup1, SIGNAL(opened()));
+
+    QQuickPopup *popup2 = window->property("popup2").value<QQuickPopup*>();
+    QVERIFY(popup2);
+
+    popup1->open();
+    popup2->open();
+    openedSpy.wait();
+    QTRY_VERIFY(popup2->hasActiveFocus());
+}
+
 void tst_QQuickPopup::hover_data()
 {
     QTest::addColumn<QString>("source");
@@ -915,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()
 {