git.iko.soy/unity8
on xenial help sign in
Merge refactor branch
commita4585f5d51b5fc012032b3b2fd75cf2e6d04bdbe authorMichael Terry <michael.terry@canonical.com> dateTue 6 Jan 2015, 14:50 (12 years ago) parentaa2feffefc5d22
2 files changed+7−1
compare with xenial
unifiedsplit
qml/Tutorial/Tutorial.qml+6 tests/qmltests/Tutorial/tst_Tutorial.qml+1−1
qml/Tutorial/Tutorial.qml+6
@@ -35,6 +35,12 @@ Item {
3535 readonly property bool panelContentEnabled: loader.item ? loader.item.panelContentEnabled : true
3636 readonly property bool running: loader.item ? loader.item.running : false
3737
38+ function finish() {
39+ if (loader.item) {
40+ loader.item.finish();
41+ }
42+ }
43+
3844 signal finished()
3945
4046 Loader {
tests/qmltests/Tutorial/tst_Tutorial.qml+1−1
@@ -256,7 +256,7 @@ Item {
256256 // Make sure we don't do anything if we don't pull the launcher
257257 // out much.
258258 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);
260260 tryCompare(launcher, "state", ""); // should remain hidden
261261 tryCompare(left, "shown", true); // and we should still be on left
262262