@@ -48,8 +48,6 @@ Item {
4848 property url background
4949 readonly property real panelHeight: panel.panelHeight
5050
51− property bool dashShown: dash.shown && dash.available && underlay.visible
52−
5351 property bool sideStageEnabled: shell.width >= units.gu(100)
5452 readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
5553
@@ -59,7 +57,6 @@ Item {
5957 } else {
6058 var execFlags = shell.sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;
6159 ApplicationManager.startApplication(appId, execFlags);
62− stages.show();
6360 }
6461 }
6562
@@ -130,35 +127,6 @@ Item {
130127 }
131128 }
132129
133− EdgeDragArea {
134− id: stagesDragArea
135− direction: Direction.Leftwards
136−
137− anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
138− width: shell.edgeSize
139−
140− property real progress: stages.width
141−
142− onTouchXChanged: {
143− if (status == DirectionalDragArea.Recognized) {
144− if (ApplicationManager.empty) {
145− progress = Math.max(stages.width - stagesDragArea.width + touchX, stages.width * .3);
146− } else {
147− progress = stages.width - stagesDragArea.width + touchX;
148− }
149− }
150− }
151−
152− onDraggingChanged: {
153− if (!dragging) {
154− if (!ApplicationManager.empty && progress < stages.width - units.gu(10)) {
155− stages.show();
156− }
157− stagesDragArea.progress = Qt.binding(function () { return stages.width; });
158− }
159− }
160− }
161−
162130 Item {
163131 id: stages
164132 objectName: "stages"
@@ -614,6 +582,7 @@ Item {
614582 }
615583
616584 if (!stages.locked) {
585+ ApplicationManager.requestFocusApplication("unity8-dash")
617586 launcher.fadeOut();
618587 } else {
619588 launcher.switchToNextState("visible");