git.iko.soy/unity8
on xenial help sign in
Fix some code that accidentally landed in trunk before it got cleaned up. The current code just has some duplication to it that should be unified.
7ae0699Michael Terry
qml/Shell.qml+8−13
compare with xenial
unifiedsplit
@@ -513,16 +513,19 @@ Item {
513 }
513 }
514
514
515 function showDash() {
515 function showDash() {
516− if (shell.locked) {
516+ if (greeter.fakeActiveForApp !== "") { // just in case user gets here
517− return;
517+ return
518 }
518 }
519+
519 if (greeter.shown) {
520 if (greeter.shown) {
520 greeter.hideRight();
521 greeter.hideRight();
521 launcher.fadeOut();
522 launcher.fadeOut();
522 }
523 }
523
524
525+ if (ApplicationManager.focusedApplicationId != "unity8-dash") {
524− ApplicationManager.requestFocusApplication("unity8-dash")
526+ ApplicationManager.requestFocusApplication("unity8-dash")
525− launcher.fadeOut();
527+ launcher.fadeOut();
528+ }
526 }
529 }
527
530
528 Item {
531 Item {
@@ -564,15 +567,7 @@ Item {
564 available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && greeter.fakeActiveForApp === ""
567 available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && greeter.fakeActiveForApp === ""
565
568
566 onShowDashHome: showHome()
569 onShowDashHome: showHome()
567− onDash: {
568− if (ApplicationManager.focusedApplicationId != "unity8-dash") {
569− showDash()
570+ onDash: showDash()
570− }
571− if (greeter.shown) {
572− launcher.fadeOut()
573− greeter.hideRight()
574− }
575− }
576 onDashSwipeChanged: {
571 onDashSwipeChanged: {
577 if (dashSwipe) {
572 if (dashSwipe) {
578 dash.setCurrentScope("clickscope", false, true)
573 dash.setCurrentScope("clickscope", false, true)