@@ -43,15 +43,12 @@ Item {
4343 }
4444
4545 function hideEdgeDemoInShell() {
46− var user = LightDM.Users.data(greeter.currentIndex, LightDM.UserRoles.NameRole);
4746 AccountsService.demoEdges = false;
48− d.showEdgeDemo = false;
4947 stopDemo();
5048 }
5149
5250 function hideEdgeDemoInGreeter() {
5351 // TODO: AccountsService.demoEdges = false as lightdm user
54− d.showEdgeDemoInGreeter = false;
5552 }
5653
5754 function hideEdgeDemos() {
@@ -71,6 +68,24 @@ Item {
7168 if (d.finalEdgeDemo) d.finalEdgeDemo.destroy()
7269 }
7370
71+ function startDemo() {
72+ if (!d.overlay) {
73+ d.overlay = Qt.createComponent("EdgeDemoOverlay.qml")
74+ }
75+
76+ launcherEnabled = false;
77+ dashEnabled = false;
78+ panelEnabled = false;
79+ panelContentEnabled = false;
80+
81+ // Begin with either greeter or dash, depending on which is visible
82+ if (greeter && greeter.shown) {
83+ startRightEdgeDemo()
84+ } else {
85+ startTopEdgeDemo()
86+ }
87+ }
88+
7489 QtObject {
7590 id: d
7691 property Component overlay
@@ -79,22 +94,18 @@ Item {
7994 property QtObject bottomEdgeDemo
8095 property QtObject leftEdgeDemo
8196 property QtObject finalEdgeDemo
82− property bool showEdgeDemo: false
83− property bool showEdgeDemoInGreeter: d.showEdgeDemo // TODO: AccountsService.demoEdges as lightdm user
97+ property bool showEdgeDemo: AccountsService.demoEdges
98+ property bool showEdgeDemoInGreeter: AccountsService.demoEdges // TODO: AccountsService.demoEdges as lightdm user
8499
85− onShowEdgeDemoInGreeterChanged: {
86− if (!d.overlay && d.showEdgeDemoInGreeter) {
87− d.overlay = Qt.createComponent("EdgeDemoOverlay.qml")
88− startRightEdgeDemo()
100+ onShowEdgeDemoChanged: {
101+ stopDemo()
102+ if (d.showEdgeDemo) {
103+ startDemo()
89104 }
90105 }
91106 }
92107
93108 function startRightEdgeDemo() {
94− launcherEnabled = false;
95− demo.dashEnabled = false;
96− demo.panelEnabled = false;
97− demo.panelContentEnabled = false;
98109 if (demo.greeter) {
99110 d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
100111 "edge": "right",
@@ -123,11 +134,6 @@ Item {
123134
124135 onUnlocked: hide()
125136 onShownChanged: if (!greeter.shown) hide()
126−
127− onSelected: {
128− var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole)
129− d.showEdgeDemo = AccountsService.demoEdges
130− }
131137 }
132138
133139 function startTopEdgeDemo() {