@@ -283,6 +283,31 @@ Item {
283283 value: shell.background
284284 }
285285 }
286+
287+ Tutorial {
288+ id: tutorial
289+ objectName: "tutorial"
290+ anchors.fill: parent
291+ active: AccountsService.demoEdges
292+ paused: LightDM.Greeter.active
293+ launcher: launcher
294+ panel: panel
295+ edgeSize: shell.edgeSize
296+
297+ // EdgeDragAreas don't work with mice. So to avoid trapping the user,
298+ // we'll tell the tutorial to avoid using them on the Desktop. The
299+ // Desktop doesn't use the same spread design anyway. The tutorial is
300+ // all a bit of a placeholder on non-phone form factors right now.
301+ // When the design team gives us more guidance, we can do something
302+ // more clever here.
303+ // TODO: use DeviceConfiguration instead of checking source
304+ useEdgeDragArea: applicationsDisplayLoader.source != Qt.resolvedUrl("Stages/DesktopStage.qml")
305+
306+ onFinished: {
307+ AccountsService.demoEdges = false;
308+ active = false; // for immediate response / if AS is having problems
309+ }
310+ }
286311 }
287312
288313 InputMethod {
@@ -580,32 +605,6 @@ Item {
580605 }
581606 }
582607
583− Tutorial {
584− id: tutorial
585− objectName: "tutorial"
586− active: AccountsService.demoEdges
587− paused: LightDM.Greeter.active
588− launcher: launcher
589− panel: panel
590− stages: stages
591− overlay: overlay
592− edgeSize: shell.edgeSize
593−
594− // EdgeDragAreas don't work with mice. So to avoid trapping the user,
595− // we'll tell the tutorial to avoid using them on the Desktop. The
596− // Desktop doesn't use the same spread design anyway. The tutorial is
597− // all a bit of a placeholder on non-phone form factors right now.
598− // When the design team gives us more guidance, we can do something
599− // more clever here.
600− // TODO: use DeviceConfiguration instead of checking source
601− useEdgeDragArea: applicationsDisplayLoader.source != Qt.resolvedUrl("Stages/DesktopStage.qml")
602−
603− onFinished: {
604− AccountsService.demoEdges = false;
605− active = false; // for immediate response / if AS is having problems
606− }
607− }
608−
609608 Connections {
610609 target: SessionBroadcast
611610 onShowHome: showHome()