aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/controls/data/tst_popup.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-05-11 23:23:55 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-05-12 07:57:27 +0000
commit8857bdecc2174fd3ab5935af597f1b8a30d15c96 (patch)
tree131d8f317981a28b9aab9306aa176599faa27ebf /tests/auto/controls/data/tst_popup.qml
parent9cf30f1613bc18a1f16c70c8d293dad3bc23b6d9 (diff)
Popup: respect "dim: false" for modal popups
Task-number: QTBUG-53309 Change-Id: I024dfa32342a7c936f5ea53586c11e50d65845e9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/controls/data/tst_popup.qml')
-rw-r--r--tests/auto/controls/data/tst_popup.qml18
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index a681b2f9..20b5a551 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -971,6 +971,7 @@ TestCase {
property alias modalPopup: modalPopup
property alias modelessPopup: modelessPopup
property alias plainPopup: plainPopup
+ property alias modalPopupWithoutDim: modalPopupWithoutDim
visible: true
Drawer {
z: 5
@@ -1002,6 +1003,13 @@ TestCase {
enter: Transition { PauseAnimation { duration: 200 } }
exit: Transition { PauseAnimation { duration: 200 } }
}
+ Popup {
+ id: modalPopupWithoutDim
+ z: 5
+ dim: false
+ modal: true
+ exit: Transition { PauseAnimation { duration: 200 } }
+ }
}
}
@@ -1067,6 +1075,16 @@ TestCase {
compare(window.overlay.modal.opacity, 0.0)
compare(window.overlay.modeless.opacity, 0.0)
+ window.modalPopupWithoutDim.open()
+ tryCompare(window.modalPopupWithoutDim, "visible", true)
+ compare(window.overlay.modal.opacity, 0.0)
+ compare(window.overlay.modeless.opacity, 0.0)
+
+ window.modalPopupWithoutDim.close()
+ tryCompare(window.modalPopupWithoutDim, "visible", false)
+ compare(window.overlay.modal.opacity, 0.0)
+ compare(window.overlay.modeless.opacity, 0.0)
+
window.upperDrawer.open()
compare(window.overlay.modal.z, 1.0)
tryCompare(window.overlay.modal, "opacity", 1.0)