fix hasActiveDialog
commit712a6131795e813d183dec6e4865be231d015359
authorLukáš Tinkl <lukas.tinkl@canonical.com>
dateWed 4 Jan 2017, 20:48 (10 years ago)
parent79c5d59
qml/Components/Dialogs.qml+1−1
@@ -30,7 +30,7 @@ MouseArea {
3030 hoverEnabled: true
3131 onWheel: wheel.accepted = true
3232
33− readonly property alias hasActiveDialog: dialogLoader.active
33+ readonly property bool hasActiveDialog: dialogLoader.active || d.modeSwitchWarningPopup
3434
3535 // to be set from outside, useful mostly for testing purposes
3636 property var unitySessionService: DBusUnitySessionService
tests/qmltests/tst_OrientedShell.qml+1−1
@@ -1584,7 +1584,7 @@ Rectangle {
15841584 tryCompare(dialogLoader, "item", null);
15851585 }
15861586
1587− function test_escColosesShutdownDialog() {
1587+ function test_escClosesShutdownDialog() {
15881588 loadShell("mako");
15891589
15901590 testCase.showPowerDialog();
tests/qmltests/tst_Shell.qml−1
@@ -560,7 +560,6 @@ Rectangle {
560560 // is loaded by default
561561 tearDown();
562562 }
563−
564563 }
565564
566565 function cleanup() {