git.iko.soy/unity8
on xenial help sign in
Make black greeter appear faster, still working on wallpaper version
commit602015038c3255fd8c5536dfc6ff3389498bb89b authorMichael Terry <michael.terry@canonical.com> dateWed 10 Dec 2014, 14:35 (12 years ago) parent995bb6c
2 files changed+5−8
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml+2−3 qml/Shell.qml+3−5
qml/Greeter/Greeter.qml+2−3
@@ -23,7 +23,6 @@ import "../Components"
2323Showable {
2424 id: greeter
2525 enabled: shown
26− created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
2726
2827 property url background
2928 property bool loadContent: required
@@ -58,13 +57,13 @@ Showable {
5857 }
5958
6059 function tryToUnlock() {
61− if (created) {
60+ if (greeterContentLoader.item) {
6261 greeterContentLoader.item.tryToUnlock()
6362 }
6463 }
6564
6665 function reset() {
67− if (created) {
66+ if (greeterContentLoader.item) {
6867 greeterContentLoader.item.reset()
6968 }
7069 }
qml/Shell.qml+3−5
@@ -389,7 +389,7 @@ Item {
389389
390390 function maybeShow() {
391391 if (!shell.forcedUnlock) {
392− show()
392+ showNow();
393393 }
394394 }
395395
@@ -543,8 +543,6 @@ Item {
543543 property string lockedApp: ""
544544 property bool hasLockedApp: lockedApp !== ""
545545
546− property bool ready: shown && required && created
547−
548546 available: true
549547 hides: [launcher, panel.indicators]
550548 shown: true
@@ -582,8 +580,8 @@ Item {
582580 enabled = true;
583581 }
584582
585− onReadyChanged: {
586− if (ready) {
583+ onShownChanged: {
584+ if (shown) {
587585 // Disable everything so that user can't swipe greeter or
588586 // launcher until we get the next prompt/authenticate, which
589587 // will re-enable the shell.