1 files changed, 58 insertions, 51 deletions

diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 414ba782..4143ee3f 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -37,7 +37,7 @@
 #include "qquickpopup_p.h"
 #include "qquickpopup_p_p.h"
 #include "qquickapplicationwindow_p.h"
-#include "qquickoverlay_p.h"
+#include "qquickoverlay_p_p.h"
 #include "qquickcontrol_p_p.h"
 
 #include <QtQml/qqmlinfo.h>
@@ -143,6 +143,7 @@ QQuickPopupPrivate::QQuickPopupPrivate()
     , bottomMargin(0)
     , contentWidth(0)
     , contentHeight(0)
+    , transitionState(QQuickPopupPrivate::NoTransition)
     , closePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside)
     , parentItem(nullptr)
     , dimmer(nullptr)
@@ -180,43 +181,46 @@ bool QQuickPopupPrivate::tryClose(QQuickItem *item, QMouseEvent *event)
     return false;
 }
 
-void QQuickPopupPrivate::prepareEnterTransition(bool notify)
+bool QQuickPopupPrivate::prepareEnterTransition()
 {
     Q_Q(QQuickPopup);
     if (!window) {
         qmlInfo(q) << "cannot find any window to open popup in.";
-        return;
+        return false;
     }
 
-    QQuickApplicationWindow *applicationWindow = qobject_cast<QQuickApplicationWindow*>(window);
-    if (!applicationWindow) {
-        window->installEventFilter(q);
-        popupItem->setZ(1000001); // DefaultWindowDecoration+1
-        popupItem->setParentItem(window->contentItem());
-    } else {
-        popupItem->setParentItem(applicationWindow->overlay());
-    }
+    if (transitionState == EnterTransition && transitionManager.isRunning())
+        return false;
 
-    if (notify)
+    if (transitionState != EnterTransition) {
+        popupItem->setParentItem(QQuickOverlay::overlay(window));
         emit q->aboutToShow();
-    visible = notify;
-    popupItem->setVisible(true);
-    positioner.setParentItem(parentItem);
-    emit q->visibleChanged();
+        visible = true;
+        transitionState = EnterTransition;
+        popupItem->setVisible(true);
+        positioner.setParentItem(parentItem);
+        emit q->visibleChanged();
+    }
+    return true;
 }
 
-void QQuickPopupPrivate::prepareExitTransition()
+bool QQuickPopupPrivate::prepareExitTransition()
 {
     Q_Q(QQuickPopup);
-    if (window && !qobject_cast<QQuickApplicationWindow *>(window))
-        window->removeEventFilter(q);
-    if (focus) {
-        // The setFocus(false) call below removes any active focus before we're
-        // able to check it in finalizeExitTransition.
-        hadActiveFocusBeforeExitTransition = popupItem->hasActiveFocus();
-        popupItem->setFocus(false);
+    if (transitionState == ExitTransition && transitionManager.isRunning())
+        return false;
+
+    if (transitionState != ExitTransition) {
+        if (focus) {
+            // The setFocus(false) call below removes any active focus before we're
+            // able to check it in finalizeExitTransition.
+            hadActiveFocusBeforeExitTransition = popupItem->hasActiveFocus();
+            popupItem->setFocus(false);
+        }
+        transitionState = ExitTransition;
+        emit q->aboutToHide();
     }
-    emit q->aboutToHide();
+    return true;
 }
 
 void QQuickPopupPrivate::finalizeEnterTransition()
@@ -224,17 +228,16 @@ void QQuickPopupPrivate::finalizeEnterTransition()
     Q_Q(QQuickPopup);
     if (focus)
         popupItem->setFocus(true);
+    transitionState = NoTransition;
     emit q->opened();
 }
 
-void QQuickPopupPrivate::finalizeExitTransition(bool hide)
+void QQuickPopupPrivate::finalizeExitTransition()
 {
     Q_Q(QQuickPopup);
-    if (hide) {
-        positioner.setParentItem(nullptr);
-        popupItem->setParentItem(nullptr);
-        popupItem->setVisible(false);
-    }
+    positioner.setParentItem(nullptr);
+    popupItem->setParentItem(nullptr);
+    popupItem->setVisible(false);
 
     if (hadActiveFocusBeforeExitTransition) {
         QQuickApplicationWindow *applicationWindow = qobject_cast<QQuickApplicationWindow*>(window);
@@ -245,6 +248,7 @@ void QQuickPopupPrivate::finalizeExitTransition(bool hide)
     }
 
     visible = false;
+    transitionState = NoTransition;
     hadActiveFocusBeforeExitTransition = false;
     emit q->visibleChanged();
     emit q->closed();
@@ -314,6 +318,18 @@ void QQuickPopupPrivate::setWindow(QQuickWindow *newWindow)
     if (window == newWindow)
         return;
 
+    if (window) {
+        QQuickOverlay *overlay = QQuickOverlay::overlay(window);
+        if (overlay)
+            QQuickOverlayPrivate::get(overlay)->removePopup(q);
+    }
+
+    if (newWindow) {
+        QQuickOverlay *overlay = QQuickOverlay::overlay(newWindow);
+        if (overlay)
+            QQuickOverlayPrivate::get(overlay)->addPopup(q);
+    }
+
     window = newWindow;
     emit q->windowChanged(newWindow);
 }
@@ -711,19 +727,15 @@ bool QQuickPopupPositioner::isAncestor(QQuickItem *item) const
 }
 
 QQuickPopupTransitionManager::QQuickPopupTransitionManager(QQuickPopupPrivate *popup)
-    : QQuickTransitionManager()
-    , state(Off)
-    , popup(popup)
+    : QQuickTransitionManager(), popup(popup)
 {
 }
 
 void QQuickPopupTransitionManager::transitionEnter()
 {
-    if (state == Enter && isRunning())
+    if (!popup->prepareEnterTransition())
         return;
 
-    state = Enter;
-    popup->prepareEnterTransition();
     if (popup->window)
         transition(popup->enterActions, popup->enter, popup->q_func());
     else
@@ -732,11 +744,9 @@ void QQuickPopupTransitionManager::transitionEnter()
 
 void QQuickPopupTransitionManager::transitionExit()
 {
-    if (state == Exit && isRunning())
+    if (!popup->prepareExitTransition())
         return;
 
-    state = Exit;
-    popup->prepareExitTransition();
     if (popup->window)
         transition(popup->exitActions, popup->exit, popup->q_func());
     else
@@ -745,12 +755,10 @@ void QQuickPopupTransitionManager::transitionExit()
 
 void QQuickPopupTransitionManager::finished()
 {
-    if (state == Enter)
+    if (popup->transitionState == QQuickPopupPrivate::EnterTransition)
         popup->finalizeEnterTransition();
-    else if (state == Exit)
+    else if (popup->transitionState == QQuickPopupPrivate::ExitTransition)
         popup->finalizeExitTransition();
-
-    state = Off;
 }
 
 QQuickPopup::QQuickPopup(QObject *parent)
@@ -1895,13 +1903,6 @@ bool QQuickPopup::isComponentComplete() const
     return d->complete;
 }
 
-bool QQuickPopup::eventFilter(QObject *object, QEvent *event)
-{
-    if (QQuickWindow *window = qobject_cast<QQuickWindow *>(object))
-        return overlayEvent(window->contentItem(), event);
-    return false;
-}
-
 bool QQuickPopup::childMouseEventFilter(QQuickItem *child, QEvent *event)
 {
     Q_UNUSED(child);
@@ -1961,6 +1962,12 @@ void QQuickPopup::mouseDoubleClickEvent(QMouseEvent *event)
 
 void QQuickPopup::mouseUngrabEvent()
 {
+    QQuickOverlay *overlay = QQuickOverlay::overlay(window());
+    if (overlay) {
+        QQuickOverlayPrivate *p = QQuickOverlayPrivate::get(overlay);
+        if (p->mouseGrabberPopup == this)
+            p->mouseGrabberPopup = nullptr;
+    }
 }
 
 bool QQuickPopup::overlayEvent(QQuickItem *item, QEvent *event)