diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-17 11:00:50 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-17 14:54:45 +0000 |
commit | fec1a78618bae112ff8d1c0e6f078ea890cf283e (patch) | |
tree | 6cba021252ce91ee699f24d5a32737eaed8288cc /src/templates | |
parent | 2f476c5818878c7f2ba94522f805cd140e33989e (diff) |
QQuickOverlay: fix background visibility for multiple modal popups
The idea of the "modalPopups > 1" check was to avoid calling QQmlProperty::write(),
but it missed the fact that one modal popup might be still closing while a new modal
popup is already opened. Thus, there's temporarily 2 modal popups visible, and we
must transition the overlay background according to the state of the last shown modal
popup.
Change-Id: If25d83ccaa5adc29a9bc8d660f41fb66f90fb167
Task-number: QTBUG-51916
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/templates')
-rw-r--r-- | src/templates/qquickoverlay.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/templates/qquickoverlay.cpp b/src/templates/qquickoverlay.cpp index dd9d2c5d..cce10e46 100644 --- a/src/templates/qquickoverlay.cpp +++ b/src/templates/qquickoverlay.cpp @@ -64,7 +64,7 @@ public: void QQuickOverlayPrivate::popupAboutToShow() { Q_Q(QQuickOverlay); - if (!background || modalPopups > 1) + if (!background) return; QQuickPopup *popup = qobject_cast<QQuickPopup *>(q->sender()); |