Popup: don't steal focus on close from another opening popup

In the Gallery example, the settings dialog does not get focus (or to
be exact, loses it immediately), because the closing menu incorrectly
transfers focus back to the tool button that opened the menu.

Change-Id: I5328d8e825de9a977619688dc4478e6592db654f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

2 files changed, 101 insertions, 0 deletions

diff --git a/tests/auto/popup/data/activeFocusOnClose3.qml b/tests/auto/popup/data/activeFocusOnClose3.qml
new file mode 100644
index 00000000..5a1c8231
--- /dev/null
+++ b/tests/auto/popup/data/activeFocusOnClose3.qml
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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.6
+import QtQuick.Controls 2.0
+
+ApplicationWindow {
+    width: 400
+    height: 400
+
+    property alias popup1: popup1
+    property alias popup2: popup2
+
+    Button {
+        focus: true
+    }
+
+    Popup {
+        id: popup1
+        focus: true
+        enter: Transition { PauseAnimation { duration: 200 } }
+        exit: Transition { PauseAnimation { duration: 200 } }
+    }
+
+    Popup {
+        id: popup2
+        focus: true
+        enter: Transition { PauseAnimation { duration: 100 } }
+        exit: Transition { PauseAnimation { duration: 100 } }
+    }
+}
diff --git a/tests/auto/popup/tst_popup.cpp b/tests/auto/popup/tst_popup.cpp
index 6d1e1e3c..af6ccf34 100644
--- a/tests/auto/popup/tst_popup.cpp
+++ b/tests/auto/popup/tst_popup.cpp
@@ -64,6 +64,7 @@ private slots:
     void closePolicy();
     void activeFocusOnClose1();
     void activeFocusOnClose2();
+    void activeFocusOnClose3();
     void hover_data();
     void hover();
     void wheel_data();
@@ -454,6 +455,38 @@ void tst_popup::activeFocusOnClose2()
     QVERIFY(popup1->hasActiveFocus());
 }
 
+void tst_popup::activeFocusOnClose3()
+{
+    // Test that a closing popup that had focus doesn't steal focus from
+    // another popup that the focus was transferred to.
+    QQuickApplicationHelper helper(this, QStringLiteral("activeFocusOnClose3.qml"));
+    QQuickApplicationWindow *window = helper.appWindow;
+    window->show();
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QQuickPopup *popup1 = helper.appWindow->property("popup1").value<QQuickPopup*>();
+    QVERIFY(popup1);
+
+    QQuickPopup *popup2 = helper.appWindow->property("popup2").value<QQuickPopup*>();
+    QVERIFY(popup2);
+
+    popup1->open();
+    QVERIFY(popup1->isVisible());
+    QTRY_VERIFY(popup1->hasActiveFocus());
+
+    popup2->open();
+    popup1->close();
+
+    QSignalSpy closedSpy(popup1, SIGNAL(closed()));
+    QVERIFY(closedSpy.isValid());
+    QVERIFY(closedSpy.wait());
+
+    QVERIFY(!popup1->isVisible());
+    QVERIFY(popup2->isVisible());
+    QTRY_VERIFY(popup2->hasActiveFocus());
+}
+
 void tst_popup::hover_data()
 {
     QTest::addColumn<QString>("source");