diff options
-rw-r--r-- | src/quick/items/qquickwindowmodule.cpp | 16 | ||||
-rw-r--r-- | src/quick/items/qquickwindowmodule_p.h | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp index ee90af4341..ad0aa53f72 100644 --- a/src/quick/items/qquickwindowmodule.cpp +++ b/src/quick/items/qquickwindowmodule.cpp @@ -39,6 +39,7 @@ #include "qquickwindowmodule_p.h" #include "qquickwindowattached_p.h" +#include "qquickrendercontrol.h" #include "qquickscreen_p.h" #include "qquickview_p.h" #include <QtQuick/QQuickWindow> @@ -83,7 +84,7 @@ void QQuickWindowQmlImpl::setVisible(bool visible) { Q_D(QQuickWindowQmlImpl); d->visible = visible; - if (d->complete && (!transientParent() || transientParent()->isVisible())) + if (d->complete && (!transientParent() || transientParentVisible())) QQuickWindow::setVisible(visible); } @@ -142,7 +143,7 @@ void QQuickWindowQmlImpl::componentComplete() void QQuickWindowQmlImpl::setWindowVisibility() { Q_D(QQuickWindowQmlImpl); - if (transientParent() && !transientParent()->isVisible()) + if (transientParent() && !transientParentVisible()) return; if (QQuickItem *senderItem = qmlobject_cast<QQuickItem *>(sender())) { @@ -196,6 +197,17 @@ void QQuickWindowQmlImpl::setScreen(QObject *screen) QWindow::setScreen(screenWrapper ? screenWrapper->wrappedScreen() : nullptr); } +bool QQuickWindowQmlImpl::transientParentVisible() +{ + Q_ASSERT(transientParent()); + if (!transientParent()->isVisible()) { + // handle case where transient parent is offscreen window + QWindow *rw = QQuickRenderControl::renderWindowFor(qobject_cast<QQuickWindow*>(transientParent())); + return rw && rw->isVisible(); + } + return true; +} + QT_END_NAMESPACE #include "moc_qquickwindowmodule_p.cpp" diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h index d0bf5c29b3..d4925cb1d5 100644 --- a/src/quick/items/qquickwindowmodule_p.h +++ b/src/quick/items/qquickwindowmodule_p.h @@ -94,6 +94,9 @@ private Q_SLOTS: void setWindowVisibility(); private: + bool transientParentVisible(); + +private: Q_DISABLE_COPY(QQuickWindowQmlImpl) Q_DECLARE_PRIVATE(QQuickWindowQmlImpl) }; |