diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-03 15:39:04 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-05 15:59:10 +0000 |
| commit | 14dd934c3203b614e43be9fa5b17761d43092351 (patch) | |
| tree | f9027f1b1961842bb5ea2e2aa5fdc2302f3c4ad4 /src/quicktemplates2/qquickpopup.cpp | |
| parent | 6f3f262574d2bb0cf7ccd5148f29e078aef8d16a (diff) | |
Use QQuickOverlay with plain QQuickWindow
Get rid of the ugly and broken event filter approach that was used
with QQuickWindow. Create an instance of QQuickOverlay so that the
same overlay code path is used for both QQuickApplicationWindow and
plain QQuickWindow.
Task-number: QTBUG-55729
Change-Id: I6e26b19cd94a9580418912803f50c30b9dcaeedb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index b4022247..fa5864df 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -188,15 +188,7 @@ void QQuickPopupPrivate::prepareEnterTransition(bool notify) return; } - 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()); - } - + popupItem->setParentItem(QQuickOverlay::overlay(window)); if (notify) emit q->aboutToShow(); visible = notify; @@ -208,8 +200,6 @@ void QQuickPopupPrivate::prepareEnterTransition(bool notify) void 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. @@ -1837,13 +1827,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); |