0b7586f · unity8 · git.iko.soy

on xenial help sign in

Shell: Show launcher after unlock or if all apps are closed

0b7586fAlfred Neumayer8 years ago

qml/Shell.qml+21−1

@@ -379,10 +379,30 @@ StyledItem {

379 Connections {

380 target: greeter

381 onActiveChanged: {

382+ if (greeter.active)

383+ return

384+

385+ // Show drawer in case showHome() requests it

382− if (!greeter.active && greeterLoader.openDrawerAfterUnlock) {

386+ if (greeterLoader.openDrawerAfterUnlock) {

383 launcher.openDrawer(false);

387 launcher.openDrawer(false);

384 greeterLoader.openDrawerAfterUnlock = false;

388 greeterLoader.openDrawerAfterUnlock = false;

385 }

389 }

390+ // Show the launcher when there are no running apps

391+ else if (topLevelSurfaceList.count < 1) {

392+ launcher.switchToNextState("visible")

393+ }

394+ }

395+ }

396+

397+ // Show the launcher in case there are no running apps

398+ Connections {

399+ target: topLevelSurfaceList

400+ onCountChanged: {

401+ if (topLevelSurfaceList.count > 0)

402+ return

403+

404+ stage.closeSpread()

405+ launcher.switchToNextState("visible")

386 }

406 }

387 }

407 }

388 }

408 }