c2ac152 · unity8 · git.iko.soy

on xenial help sign in

use "paused" instead of enabled/visible

c2ac152Lukáš Tinkl10 years ago

qml/Shell.qml+2−4

@@ -626,10 +626,8 @@ StyledItem {

626 objectName: "tutorial"

627 anchors.fill: parent

628

629− enabled: shell.hasTouchscreen

630− visible: enabled

631− paused: callManager.hasCalls || !greeter || greeter.active ||

629+ paused: callManager.hasCalls || !greeter || greeter.active || wizard.active

632− wizard.active

630+ || !hasTouchscreen // TODO #1661557 something better for a touchscreen

633 delayed: dialogs.hasActiveDialog || notifications.hasNotification ||

631 delayed: dialogs.hasActiveDialog || notifications.hasNotification ||

634 inputMethod.visible ||

632 inputMethod.visible ||

635 (launcher.shown && !launcher.lockedVisible) ||

633 (launcher.shown && !launcher.lockedVisible) ||

tests/qmltests/tst_OrientedShell.qml+2−2

@@ -1647,10 +1647,10 @@ Rectangle {

1647

1648 MockInputDeviceBackend.addMockDevice("/touchscreen", InputInfo.TouchScreen);

1649 var tutorial = findChild(shell, "tutorial");

1650− tryCompare(tutorial, "enabled", true);

1650+ tryCompare(tutorial, "paused", false);

1651

1652 MockInputDeviceBackend.removeDevice("/touchscreen");

1653− tryCompare(tutorial, "enabled", false);

1653+ tryCompare(tutorial, "paused", true);

1654 }

1655 }

1656}