on xenial help sign in
Only change demo visibility if demo is enabled
commit195fdb90b0add534e837cd65f04624a57a7295ca authorMichael Terry <michael.terry@canonical.com> dateWed 31 Jul 2013, 14:12 (13 years ago) parent80acc01
1 file changed+8−8
Shell.qml+8−8
Shell.qml+8−8
@@ -220,12 +220,12 @@ FocusScope {
220220
221221 Connections {
222222 target: greeter
223− onShownChanged: if (!greeter.shown) topEdgeDemo.visible = true
223+ onShownChanged: if (topEdgeDemo.enabled && !greeter.shown) topEdgeDemo.visible = true
224224 }
225225
226226 Connections {
227227 target: panel.indicators
228− onFullyOpenedChanged: if (panel.indicators.fullyOpened) topEdgeDemo.visible = false
228+ onFullyOpenedChanged: if (topEdgeDemo.enabled && panel.indicators.fullyOpened) topEdgeDemo.visible = false
229229 }
230230 }
231231
@@ -242,13 +242,13 @@ FocusScope {
242242
243243 Connections {
244244 target: bottomEdgeDemo
245− onVisibleChanged: if (!bottomEdgeDemo.visible) leftEdgeDemo.visible = true
245+ onVisibleChanged: if (leftEdgeDemo.enabled && !bottomEdgeDemo.visible) leftEdgeDemo.visible = true
246246 }
247247
248248 Connections {
249249 target: launcher
250250 onProgressChanged: {
251− if (launcher.progress >= 1.0) {
251+ if (leftEdgeDemo.enabled && launcher.progress >= 1.0) {
252252 leftEdgeDemo.visible = false;
253253 shell.hideEdgeDemo();
254254 }
@@ -545,9 +545,9 @@ FocusScope {
545545
546546 Connections {
547547 target: greeter
548− onUnlocked: rightEdgeDemo.visible = false
548+ onUnlocked: if (rightEdgeDemo.enabled) rightEdgeDemo.visible = false
549549 onShownChanged: {
550− if (!greeter.shown) {
550+ if (rightEdgeDemo.enabled && !greeter.shown) {
551551 rightEdgeDemo.visible = false
552552 shell.hideEdgeDemoInGreeter()
553553 }
@@ -595,8 +595,8 @@ FocusScope {
595595
596596 Connections {
597597 target: panel.indicators
598− onFullyOpenedChanged: if (panel.indicators.fullyOpened) bottomEdgeDemo.visible = true
599− onPartiallyOpenedChanged: if (!panel.indicators.partiallyOpened && !panel.indicators.fullyOpened) bottomEdgeDemo.visible = false
598+ onFullyOpenedChanged: if (bottomEdgeDemo.enabled && panel.indicators.fullyOpened) bottomEdgeDemo.visible = true
599+ onPartiallyOpenedChanged: if (bottomEdgeDemo.enabled && !panel.indicators.partiallyOpened && !panel.indicators.fullyOpened) bottomEdgeDemo.visible = false
600600 }
601601 }
602602 }