on xenial help sign in
fixed edge demo
0742924Nick Dedekind
qml/Components/EdgeDemo.qml+13−10
@@ -23,7 +23,7 @@ Item {
23
23
24 property Item greeter
24 property Item greeter
25 property Item launcher
25 property Item launcher
26− property Item indicators
26+ property Item panel
27 property Item stages
27 property Item stages
28
28
29 property bool launcherEnabled: true
29 property bool launcherEnabled: true
@@ -139,11 +139,11 @@ Item {
139 function startTopEdgeDemo() {
139 function startTopEdgeDemo() {
140 demo.panelEnabled = true;
140 demo.panelEnabled = true;
141 if (demo.stages) {
141 if (demo.stages) {
142− d.topEdgeDemo = d.overlay.createObject(demo.stages, {
142+ d.topEdgeDemo = d.overlay.createObject(demo.panel, {
143 "edge": "top",
143 "edge": "top",
144 "title": i18n.tr("Top edge"),
144 "title": i18n.tr("Top edge"),
145 "text": i18n.tr("Try swiping from the top edge to access the indicators"),
145 "text": i18n.tr("Try swiping from the top edge to access the indicators"),
146− "anchors.fill": demo.stages,
146+ "anchors.fill": demo.panel,
147 });
147 });
148 }
148 }
149 if (d.topEdgeDemo) {
149 if (d.topEdgeDemo) {
@@ -154,9 +154,9 @@ Item {
154 }
154 }
155
155
156 Connections {
156 Connections {
157− target: demo.indicators
157+ target: demo.panel.indicators
158 onFullyOpenedChanged: {
158 onFullyOpenedChanged: {
159− if (d.topEdgeDemo && d.topEdgeDemo.available && demo.indicators.fullyOpened) {
159+ if (d.topEdgeDemo && d.topEdgeDemo.available && demo.panel.indicators.fullyOpened) {
160 d.topEdgeDemo.hideNow()
160 d.topEdgeDemo.hideNow()
161 startBottomEdgeDemo()
161 startBottomEdgeDemo()
162 }
162 }
@@ -164,12 +164,12 @@ Item {
164 }
164 }
165
165
166 function startBottomEdgeDemo() {
166 function startBottomEdgeDemo() {
167− if (demo.indicators) {
167+ if (demo.panel.indicators) {
168− d.bottomEdgeDemo = d.overlay.createObject(demo.indicators, {
168+ d.bottomEdgeDemo = d.overlay.createObject(demo.panel.indicators, {
169 "edge": "bottom",
169 "edge": "bottom",
170 "title": i18n.tr("Close"),
170 "title": i18n.tr("Close"),
171 "text": i18n.tr("Swipe up again to close the settings screen"),
171 "text": i18n.tr("Swipe up again to close the settings screen"),
172− "anchors.fill": demo.indicators.content,
172+ "anchors.fill": demo.panel.indicators,
173 });
173 });
174 }
174 }
175 if (d.bottomEdgeDemo) {
175 if (d.bottomEdgeDemo) {
@@ -180,9 +180,12 @@ Item {
180 }
180 }
181
181
182 Connections {
182 Connections {
183− target: demo.indicators
183+ target: demo.panel.indicators
184 onPartiallyOpenedChanged: {
184 onPartiallyOpenedChanged: {
185+ if (d.bottomEdgeDemo &&
186+ d.bottomEdgeDemo.available &&
185− if (d.bottomEdgeDemo && d.bottomEdgeDemo.available && !demo.indicators.partiallyOpened && !demo.indicators.fullyOpened) {
187+ !demo.panel.indicators.partiallyOpened &&
188+ !demo.panel.indicators.fullyOpened) {
186 d.bottomEdgeDemo.hideNow()
189 d.bottomEdgeDemo.hideNow()
187 startLeftEdgeDemo()
190 startLeftEdgeDemo()
188 }
191 }
qml/Shell.qml+1−1
@@ -774,7 +774,7 @@ Item {
774 paused: Powerd.status === Powerd.Off // Saves power
774 paused: Powerd.status === Powerd.Off // Saves power
775 greeter: greeter
775 greeter: greeter
776 launcher: launcher
776 launcher: launcher
777− indicators: panel.indicators
777+ panel: panel
778 stages: stages
778 stages: stages
779 }
779 }
780
780