on xenial help sign in
Fix background for sim lockscreen
commit4d6d28b63352de3c4349723a0d70e6b55720e491 authorMichael Terry <michael.terry@canonical.com> dateTue 20 May 2014, 14:44 (12 years ago) parent9fdde2b
3 files changed+27−12
qml/Components/Lockscreen.qml−2 qml/Notifications/NotificationMenuItemFactory.qml+26−9 qml/Shell.qml+1−1
qml/Components/Lockscreen.qml−2
@@ -33,8 +33,6 @@ Showable {
3333 // This is ignored by the alphaNumeric lockscreen as that one is confirmed with pressing enter on the OSK.
3434 property int pinLength: -1
3535
36− property url background: ""
37−
3836 signal entered(string passphrase)
3937 signal cancel()
4038 signal emergencyCall()
qml/Notifications/NotificationMenuItemFactory.qml+26−9
@@ -97,19 +97,36 @@ Loader {
9797 Component {
9898 id: pinLock
9999
100− Lockscreen {
101− anchors.left: parent.left; anchors.right: parent.right
100+ Item {
102101 height: menuFactory.maxHeight
103− placeholderText: i18n.tr("Please enter SIM PIN")
104− background: shell.background
102+ anchors.left: parent.left
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+ }
105110
106− onEntered: {
107− menuModel.changeState(menuIndex, passphrase);
108− entryEnabled = false;
111+ Image {
112+ objectName: "lockscreenBackground"
113+ anchors.fill: parent
114+ source: shell.background
115+ fillMode: Image.PreserveAspectCrop
109116 }
110117
111− onCancel: {
112− menuModel.activate(menuIndex, false);
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+
127+ onCancel: {
128+ menuModel.activate(menuIndex, false);
129+ }
113130 }
114131 }
115132 }
qml/Shell.qml+1−1
@@ -403,7 +403,7 @@ BasicShell {
403403 Rectangle {
404404 id: modalNotificationBackground
405405
406− visible: notifications.useModal && !greeter.shown && (notifications.state == "narrow")
406+ visible: notifications.useModal && (notifications.state == "narrow")
407407 color: "#000000"
408408 anchors.fill: parent
409409 opacity: 0.5