on xenial help sign in
Keep greeter content in memory for a quick show() call when cancelling on the lockscreen
commitc4fc210c410d934809a4dbe39841a44b07404510 authorMichael Terry <michael.terry@canonical.com> dateTue 29 Jul 2014, 11:26 (12 years ago) parentee72f92
2 files changed+4−2
qml/Greeter/Greeter.qml+3−2 qml/Shell.qml+1
qml/Greeter/Greeter.qml+3−2
@@ -26,11 +26,12 @@ Showable {
2626 created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
2727
2828 property url defaultBackground
29+ property bool loadContent: required
2930
3031 // 1 when fully shown and 0 when fully hidden
3132 property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
3233
33− showAnimation: StandardAnimation { property: "x"; to: 0 }
34+ showAnimation: StandardAnimation { property: "x"; to: 0; duration: UbuntuAnimation.FastDuration }
3435 hideAnimation: __leftHideAnimation
3536
3637 property alias dragHandleWidth: dragHandle.width
@@ -126,7 +127,7 @@ Showable {
126127 property var infographicModel: LightDM.Infographic
127128 readonly property int backgroundTopMargin: -greeter.y
128129
129− source: required ? "GreeterContent.qml" : ""
130+ source: loadContent ? "GreeterContent.qml" : ""
130131
131132 onLoaded: {
132133 selected(currentIndex);
qml/Shell.qml+1
@@ -588,6 +588,7 @@ FocusScope {
588588 available: true
589589 hides: [launcher, panel.indicators]
590590 shown: true
591+ loadContent: required || lockscreen.required // keeps content in memory for quick show()
591592
592593 defaultBackground: shell.background
593594