on xenial help sign in
Don't show bottom and left tutorial at same time
9e5ce65Michael Terry
qml/Tutorial/TutorialContent.qml+3−1
@@ -88,7 +88,8 @@ Item {
88 hides: [launcher, panel.indicators]
88 hides: [launcher, panel.indicators]
89 paused: root.paused
89 paused: root.paused
90
90
91− isReady: !tutorialLeftLoader.skipped && !paused && !keyboardVisible
91+ isReady: !tutorialLeftLoader.skipped && !paused && !keyboardVisible &&
92+ !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow
92
93
93 // Use an idle timer here, because when constructed, all our isReady variables will be false.
94 // Use an idle timer here, because when constructed, all our isReady variables will be false.
94 // Qml needs a moment to copy their values from Tutorial.qml. So we idle it and recheck.
95 // Qml needs a moment to copy their values from Tutorial.qml. So we idle it and recheck.
@@ -277,6 +278,7 @@ Item {
277
278
278 skipped: tutorialBottomLoader.skipped
279 skipped: tutorialBottomLoader.skipped
279 isReady: !tutorialBottomLoader.skipped && !paused && !keyboardVisible &&
280 isReady: !tutorialBottomLoader.skipped && !paused && !keyboardVisible &&
281+ !tutorialLeftLoader.shown && !tutorialLeftLongLoader.shown &&
280 !tutorialTopLoader.shown && !tutorialRightLoader.shown &&
282 !tutorialTopLoader.shown && !tutorialRightLoader.shown &&
281 tutorialBottomLoader.mightShow &&
283 tutorialBottomLoader.mightShow &&
282 d.focusedApp.state === ApplicationInfoInterface.Running
284 d.focusedApp.state === ApplicationInfoInterface.Running