on xenial help sign in
Relocate timer outside of Greeter
commit2dccdfccaaaae96aaad234d172295cc3d7d8082f authorJosh Arenson <joshua.arenson@canonical.com> dateTue 21 Apr 2015, 15:16 (12 years ago) parentc1ae7b5
1 file changed+10−12
qml/Shell.qml+10−12
qml/Shell.qml+10−12
@@ -363,9 +363,6 @@ Item {
363363 Greeter {
364364 objectName: "greeter"
365365
366− // Needed to expose the timer to outside objects
367− property alias showGreeterDelayed: showGreeterDelayed
368−
369366 hides: [launcher, panel.indicators]
370367 tabletMode: shell.sideStageEnabled
371368 launcherOffset: launcher.progress
@@ -398,6 +395,15 @@ Item {
398395 }
399396 }
400397
398+ Timer {
399+ // See powerConnection for why this is useful
400+ id: showGreeterDelayed
401+ interval: 1
402+ onTriggered: {
403+ greeter.forceShow();
404+ }
405+ }
406+
401407 Connections {
402408 id: callConnection
403409 target: callManager
@@ -433,15 +439,7 @@ Item {
433439 // make the greeter load asynchronously instead, but that
434440 // introduces a whole host of timing issues, especially with
435441 // its animations. So this is simpler.
436− greeter.showGreeterDelayed.start();
437− }
438− }
439−
440− Timer {
441− id: showGreeterDelayed
442− interval: 1
443− onTriggered: {
444− greeter.forceShow();
442+ showGreeterDelayed.start();
445443 }
446444 }
447445 }