on xenial help sign in
Make black greeter appear faster, still working on wallpaper version
6020150Michael Terry
qml/Greeter/Greeter.qml+2−3
@@ -23,7 +23,6 @@ import "../Components"
23Showable {
23Showable {
24 id: greeter
24 id: greeter
25 enabled: shown
25 enabled: shown
26− created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
27
26
28 property url background
27 property url background
29 property bool loadContent: required
28 property bool loadContent: required
@@ -58,13 +57,13 @@ Showable {
58 }
57 }
59
58
60 function tryToUnlock() {
59 function tryToUnlock() {
61− if (created) {
60+ if (greeterContentLoader.item) {
62 greeterContentLoader.item.tryToUnlock()
61 greeterContentLoader.item.tryToUnlock()
63 }
62 }
64 }
63 }
65
64
66 function reset() {
65 function reset() {
67− if (created) {
66+ if (greeterContentLoader.item) {
68 greeterContentLoader.item.reset()
67 greeterContentLoader.item.reset()
69 }
68 }
70 }
69 }
qml/Shell.qml+3−5
@@ -389,7 +389,7 @@ Item {
389
389
390 function maybeShow() {
390 function maybeShow() {
391 if (!shell.forcedUnlock) {
391 if (!shell.forcedUnlock) {
392− show()
392+ showNow();
393 }
393 }
394 }
394 }
395
395
@@ -543,8 +543,6 @@ Item {
543 property string lockedApp: ""
543 property string lockedApp: ""
544 property bool hasLockedApp: lockedApp !== ""
544 property bool hasLockedApp: lockedApp !== ""
545
545
546− property bool ready: shown && required && created
547−
548 available: true
546 available: true
549 hides: [launcher, panel.indicators]
547 hides: [launcher, panel.indicators]
550 shown: true
548 shown: true
@@ -582,8 +580,8 @@ Item {
582 enabled = true;
580 enabled = true;
583 }
581 }
584
582
585− onReadyChanged: {
583+ onShownChanged: {
586− if (ready) {
584+ if (shown) {
587 // Disable everything so that user can't swipe greeter or
585 // Disable everything so that user can't swipe greeter or
588 // launcher until we get the next prompt/authenticate, which
586 // launcher until we get the next prompt/authenticate, which
589 // will re-enable the shell.
587 // will re-enable the shell.