git.iko.soy/unity8
on xenial help sign in
Merge refactor branch
a4585f5Michael Terry
qml/Tutorial/Tutorial.qml+6
compare with xenial
unifiedsplit
@@ -35,6 +35,12 @@ Item {
35 readonly property bool panelContentEnabled: loader.item ? loader.item.panelContentEnabled : true
35 readonly property bool panelContentEnabled: loader.item ? loader.item.panelContentEnabled : true
36 readonly property bool running: loader.item ? loader.item.running : false
36 readonly property bool running: loader.item ? loader.item.running : false
37
37
38+ function finish() {
39+ if (loader.item) {
40+ loader.item.finish();
41+ }
42+ }
43+
38 signal finished()
44 signal finished()
39
45
40 Loader {
46 Loader {
tests/qmltests/Tutorial/tst_Tutorial.qml+1−1
@@ -256,7 +256,7 @@ Item {
256 // Make sure we don't do anything if we don't pull the launcher
256 // Make sure we don't do anything if we don't pull the launcher
257 // out much.
257 // out much.
258 var launcher = findChild(shell, "launcher");
258 var launcher = findChild(shell, "launcher");
259− touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.6, halfHeight);
259+ touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight);
260 tryCompare(launcher, "state", ""); // should remain hidden
260 tryCompare(launcher, "state", ""); // should remain hidden
261 tryCompare(left, "shown", true); // and we should still be on left
261 tryCompare(left, "shown", true); // and we should still be on left
262
262