git.iko.soy/unity8
on xenial help sign in
Move showGreeterDelayed timer to Powerd connection instead of inside greeter
c1ae7b5Josh Arenson
qml/Shell.qml+9−10
compare with xenial
unifiedsplit
@@ -390,15 +390,6 @@ Item {
390
390
391 onEmergencyCall: startLockedApp("dialer-app")
391 onEmergencyCall: startLockedApp("dialer-app")
392
392
393− Timer {
394− // See powerConnection for why this is useful
395− id: showGreeterDelayed
396− interval: 1
397− onTriggered: {
398− greeter.forceShow();
399− }
400− }
401−
402 Binding {
393 Binding {
403 target: ApplicationManager
394 target: ApplicationManager
404 property: "suspended"
395 property: "suspended"
@@ -432,7 +423,7 @@ Item {
432
423
433 onStatusChanged: {
424 onStatusChanged: {
434 if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
425 if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
435− !callManager.hasCalls && !tutorial.running && shellMode != "shell") {
426+ !callManager.hasCalls && !tutorial.running) {
436 // We don't want to simply call greeter.showNow() here, because
427 // We don't want to simply call greeter.showNow() here, because
437 // that will take too long. Qt will delay button event
428 // that will take too long. Qt will delay button event
438 // handling until the greeter is done loading and may think the
429 // handling until the greeter is done loading and may think the
@@ -445,6 +436,14 @@ Item {
445 greeter.showGreeterDelayed.start();
436 greeter.showGreeterDelayed.start();
446 }
437 }
447 }
438 }
439+
440+ Timer {
441+ id: showGreeterDelayed
442+ interval: 1
443+ onTriggered: {
444+ greeter.forceShow();
445+ }
446+ }
448 }
447 }
449
448
450 function showHome() {
449 function showHome() {