git.iko.soy/unity8
on xenial help sign in
use "paused" instead of enabled/visible
commitc2ac152f59a621f47b5bdaf380fb1047d01bc878 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 16 Feb 2017, 12:35 (10 years ago) parent01beee2
2 files changed+4−6
compare with xenial
unifiedsplit
qml/Shell.qml+2−4 tests/qmltests/tst_OrientedShell.qml+2−2
qml/Shell.qml+2−4
@@ -626,10 +626,8 @@ StyledItem {
626626 objectName: "tutorial"
627627 anchors.fill: parent
628628
629− enabled: shell.hasTouchscreen
630− visible: enabled
631− paused: callManager.hasCalls || !greeter || greeter.active ||
632− wizard.active
629+ paused: callManager.hasCalls || !greeter || greeter.active || wizard.active
630+ || !hasTouchscreen // TODO #1661557 something better for a touchscreen
633631 delayed: dialogs.hasActiveDialog || notifications.hasNotification ||
634632 inputMethod.visible ||
635633 (launcher.shown && !launcher.lockedVisible) ||
tests/qmltests/tst_OrientedShell.qml+2−2
@@ -1647,10 +1647,10 @@ Rectangle {
16471647
16481648 MockInputDeviceBackend.addMockDevice("/touchscreen", InputInfo.TouchScreen);
16491649 var tutorial = findChild(shell, "tutorial");
1650− tryCompare(tutorial, "enabled", true);
1650+ tryCompare(tutorial, "paused", false);
16511651
16521652 MockInputDeviceBackend.removeDevice("/touchscreen");
1653− tryCompare(tutorial, "enabled", false);
1653+ tryCompare(tutorial, "paused", true);
16541654 }
16551655 }
16561656}