git.iko.soy/unity8
on xenial help sign in
fix hasActiveDialog
712a613Lukáš Tinkl
qml/Components/Dialogs.qml+1−1
compare with xenial
unifiedsplit
@@ -30,7 +30,7 @@ MouseArea {
30 hoverEnabled: true
30 hoverEnabled: true
31 onWheel: wheel.accepted = true
31 onWheel: wheel.accepted = true
32
32
33− readonly property alias hasActiveDialog: dialogLoader.active
33+ readonly property bool hasActiveDialog: dialogLoader.active || d.modeSwitchWarningPopup
34
34
35 // to be set from outside, useful mostly for testing purposes
35 // to be set from outside, useful mostly for testing purposes
36 property var unitySessionService: DBusUnitySessionService
36 property var unitySessionService: DBusUnitySessionService
tests/qmltests/tst_OrientedShell.qml+1−1
@@ -1584,7 +1584,7 @@ Rectangle {
1584 tryCompare(dialogLoader, "item", null);
1584 tryCompare(dialogLoader, "item", null);
1585 }
1585 }
1586
1586
1587− function test_escColosesShutdownDialog() {
1587+ function test_escClosesShutdownDialog() {
1588 loadShell("mako");
1588 loadShell("mako");
1589
1589
1590 testCase.showPowerDialog();
1590 testCase.showPowerDialog();
tests/qmltests/tst_Shell.qml−1
@@ -560,7 +560,6 @@ Rectangle {
560 // is loaded by default
560 // is loaded by default
561 tearDown();
561 tearDown();
562 }
562 }
563−
564 }
563 }
565
564
566 function cleanup() {
565 function cleanup() {