@@ -250,13 +250,6 @@ FocusScope {
252 function hide() {
252 function hide() {
259− function forceHide() {
260 shown = false;
253 shown = false;
261 if (ApplicationManager.focusedApplicationId) {
254 if (ApplicationManager.focusedApplicationId) {
262 ApplicationManager.unfocusCurrentApplication();
255 ApplicationManager.unfocusCurrentApplication();
@@ -444,7 +437,7 @@ FocusScope {
444 var animate = !greeter.shown && !stages.shown
437 var animate = !greeter.shown && !stages.shown
445 greeter.hide()
438 greeter.hide()
446 dash.setCurrentScope("home.scope", animate, false)
439 dash.setCurrentScope("home.scope", animate, false)
447− stages.forceHide()
440+ stages.hide()
450 function hideIndicatorMenu(delay) {
443 function hideIndicatorMenu(delay) {
@@ -551,8 +544,10 @@ FocusScope {
552 onDash: {
545 onDash: {
553 if (stages.shown && !stages.overlayMode) {
546 if (stages.shown && !stages.overlayMode) {
547+ if (!stages.locked) {
554− stages.hide();
548+ stages.hide();
555− launcher.hide();
549+ launcher.hide();
558 onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("applications.scope", false, true)
553 onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("applications.scope", false, true)