diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-29 08:05:07 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-05-03 07:59:00 +0000 |
| commit | 22bc04cf151d008e7bc1f825c5b55744144a0374 (patch) | |
| tree | c689ef3aeab38fb7ddff27f104012b2ca25abe27 /tests/auto | |
| parent | 1849608f838109020a9f8f71aa77d9b5c34cdd33 (diff) | |
Fix overlay stacking order
Task-number: QTBUG-53066
Change-Id: I552ee6e18e3f6a71c05ff3887a85501bbb6eebc7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/controls/data/tst_popup.qml | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml index f5b9398c..8ccac816 100644 --- a/tests/auto/controls/data/tst_popup.qml +++ b/tests/auto/controls/data/tst_popup.qml @@ -869,22 +869,30 @@ TestCase { Component { id: overlayTest ApplicationWindow { + property alias drawer: drawer property alias modalPopup: modalPopup property alias modelessPopup: modelessPopup property alias plainPopup: plainPopup visible: true + Drawer { + z: 1 + id: drawer + } Popup { id: modalPopup + z: 2 modal: true exit: Transition { PauseAnimation { duration: 200 } } } Popup { id: modelessPopup + z: 3 dim: true exit: Transition { PauseAnimation { duration: 200 } } } Popup { id: plainPopup + z: 4 enter: Transition { PauseAnimation { duration: 200 } } exit: Transition { PauseAnimation { duration: 200 } } } @@ -900,17 +908,26 @@ TestCase { compare(window.overlay.modal.opacity, 0.0) compare(window.overlay.modeless.opacity, 0.0) + window.drawer.open() + compare(window.overlay.modal.z, 1.0) + tryCompare(window.overlay.modal, "opacity", 1.0) + window.drawer.close() + tryCompare(window.overlay.modal, "opacity", 0.0) + window.modalPopup.open() + compare(window.overlay.modal.z, 2.0) compare(window.modalPopup.visible, true) tryCompare(window.overlay.modal, "opacity", 1.0) window.modelessPopup.open() + compare(window.overlay.modeless.z, 3.0) compare(window.modelessPopup.visible, true) tryCompare(window.overlay.modeless, "opacity", 1.0) window.modelessPopup.close() tryCompare(window.modelessPopup, "visible", false) tryCompare(window.overlay.modeless, "opacity", 0.0) + compare(window.overlay.modeless.z, 0.0) compare(window.modalPopup.visible, true) compare(window.overlay.modal.opacity, 1.0) @@ -918,12 +935,18 @@ TestCase { window.modalPopup.close() tryCompare(window.modalPopup, "visible", false) tryCompare(window.overlay.modal, "opacity", 0.0) + compare(window.overlay.modal.z, 1.0) window.plainPopup.open() tryCompare(window.plainPopup, "visible", true) compare(window.overlay.modal.opacity, 0.0) compare(window.overlay.modeless.opacity, 0.0) + window.plainPopup.close() + tryCompare(window.plainPopup, "visible", false) + compare(window.overlay.modal.opacity, 0.0) + compare(window.overlay.modeless.opacity, 0.0) + window.destroy() } |