on xenial help sign in
Don't show bottom and left tutorial at same time
commit9e5ce656e7512b36e532de00c1ae9aa4a490b6c5 authorMichael Terry <michael.terry@canonical.com> dateThu 17 Mar 2016, 18:12 (11 years ago) parent4851c7c
1 file changed+3−1
qml/Tutorial/TutorialContent.qml+3−1
qml/Tutorial/TutorialContent.qml+3−1
@@ -88,7 +88,8 @@ Item {
8888 hides: [launcher, panel.indicators]
8989 paused: root.paused
9090
91− isReady: !tutorialLeftLoader.skipped && !paused && !keyboardVisible
91+ isReady: !tutorialLeftLoader.skipped && !paused && !keyboardVisible &&
92+ !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow
9293
9394 // Use an idle timer here, because when constructed, all our isReady variables will be false.
9495 // Qml needs a moment to copy their values from Tutorial.qml. So we idle it and recheck.
@@ -277,6 +278,7 @@ Item {
277278
278279 skipped: tutorialBottomLoader.skipped
279280 isReady: !tutorialBottomLoader.skipped && !paused && !keyboardVisible &&
281+ !tutorialLeftLoader.shown && !tutorialLeftLongLoader.shown &&
280282 !tutorialTopLoader.shown && !tutorialRightLoader.shown &&
281283 tutorialBottomLoader.mightShow &&
282284 d.focusedApp.state === ApplicationInfoInterface.Running