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>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index e4e9cc11..e0a1f359 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -248,12 +248,14 @@ void QQuickPopupPrivate::finalizeExitTransition()
     popupItem->setParentItem(nullptr);
     popupItem->setVisible(false);
 
-    if (hadActiveFocusBeforeExitTransition) {
-        QQuickApplicationWindow *applicationWindow = qobject_cast<QQuickApplicationWindow*>(window);
-        if (applicationWindow)
-            applicationWindow->contentItem()->setFocus(true);
-        else if (window)
-            window->contentItem()->setFocus(true);
+    if (hadActiveFocusBeforeExitTransition && window) {
+        if (!qobject_cast<QQuickPopupItem *>(window->activeFocusItem())) {
+            QQuickApplicationWindow *applicationWindow = qobject_cast<QQuickApplicationWindow*>(window);
+            if (applicationWindow)
+                applicationWindow->contentItem()->setFocus(true);
+            else
+                window->contentItem()->setFocus(true);
+        }
     }
 
     visible = false;