git.iko.soy/unity8
on xenial help sign in
Fix background for sim lockscreen
4d6d28bMichael Terry
qml/Components/Lockscreen.qml−2
compare with xenial
unifiedsplit
@@ -33,8 +33,6 @@ Showable {
33 // This is ignored by the alphaNumeric lockscreen as that one is confirmed with pressing enter on the OSK.
33 // This is ignored by the alphaNumeric lockscreen as that one is confirmed with pressing enter on the OSK.
34 property int pinLength: -1
34 property int pinLength: -1
35
35
36− property url background: ""
37−
38 signal entered(string passphrase)
36 signal entered(string passphrase)
39 signal cancel()
37 signal cancel()
40 signal emergencyCall()
38 signal emergencyCall()
qml/Notifications/NotificationMenuItemFactory.qml+26−9
@@ -97,19 +97,36 @@ Loader {
97 Component {
97 Component {
98 id: pinLock
98 id: pinLock
99
99
100− Lockscreen {
100+ Item {
101− anchors.left: parent.left; anchors.right: parent.right
102 height: menuFactory.maxHeight
101 height: menuFactory.maxHeight
103− placeholderText: i18n.tr("Please enter SIM PIN")
102+ anchors.left: parent.left
104− background: shell.background
103+ anchors.right: parent.right
104+
105+ Rectangle {
106+ // In case background fails to load or is undefined
107+ anchors.fill: parent
108+ color: "black"
109+ }
105
110
106− onEntered: {
111+ Image {
107− menuModel.changeState(menuIndex, passphrase);
112+ objectName: "lockscreenBackground"
108− entryEnabled = false;
113+ anchors.fill: parent
114+ source: shell.background
115+ fillMode: Image.PreserveAspectCrop
109 }
116 }
110
117
118+ Lockscreen {
119+ anchors.fill: parent
120+ placeholderText: i18n.tr("Please enter SIM PIN")
121+
122+ onEntered: {
123+ menuModel.changeState(menuIndex, passphrase);
124+ entryEnabled = false;
125+ }
126+
111− onCancel: {
127+ onCancel: {
112− menuModel.activate(menuIndex, false);
128+ menuModel.activate(menuIndex, false);
129+ }
113 }
130 }
114 }
131 }
115 }
132 }
qml/Shell.qml+1−1
@@ -403,7 +403,7 @@ BasicShell {
403 Rectangle {
403 Rectangle {
404 id: modalNotificationBackground
404 id: modalNotificationBackground
405
405
406− visible: notifications.useModal && !greeter.shown && (notifications.state == "narrow")
406+ visible: notifications.useModal && (notifications.state == "narrow")
407 color: "#000000"
407 color: "#000000"
408 anchors.fill: parent
408 anchors.fill: parent
409 opacity: 0.5
409 opacity: 0.5