git.iko.soy/unity8
on xenial help sign in
Get rid of skipBackground flag... use background again... make pinpad flush to the screen-edges... bottom-edge still to be done
commit3ee3c50f6cc7e94d73051a42f40f27b0bfe35e87 authorMirco Müller <mirco.mueller@ubuntu.com> dateThu 21 Nov 2013, 16:17 (13 years ago) parentd106d17
3 files changed+4−5
compare with xenial
unifiedsplit
Greeter/Lockscreen.qml−3 Notifications/Notification.qml+3−1 Notifications/NotificationMenuItemFactory.qml+1−1
Greeter/Lockscreen.qml−3
@@ -35,7 +35,6 @@ Showable {
3535 property int pinLength: 4
3636
3737 property url background: ""
38− property bool skipBackground: false
3938
4039 signal entered(string passphrase)
4140 signal cancel()
@@ -60,7 +59,6 @@ Showable {
6059 Rectangle {
6160 // In case background fails to load or is undefined
6261 id: backgroundBackup
63− visible: !skipBackground
6462 anchors.fill: parent
6563 color: "black"
6664 }
@@ -68,7 +66,6 @@ Showable {
6866 Image {
6967 id: backgroundImage
7068 objectName: "lockscreenBackground"
71− visible: !skipBackground
7269 anchors {
7370 fill: parent
7471 topMargin: backgroundTopMargin
Notifications/Notification.qml+3−1
@@ -115,7 +115,7 @@ Item {
115115 left: parent.left
116116 right: parent.right
117117 top: parent.top
118− margins: spacing
118+ margins: fullscreen ? 0 : spacing
119119 }
120120
121121 spacing: units.gu(1)
@@ -199,6 +199,8 @@ Item {
199199 visible: count > 0
200200
201201 anchors.left: parent.left; anchors.right: parent.right
202+ anchors.top: fullscreen ? parent.top : undefined
203+ anchors.bottom: fullscreen ? parent.bottom : undefined
202204
203205 Repeater {
204206 model: unityMenuModel
Notifications/NotificationMenuItemFactory.qml+1−1
@@ -98,7 +98,7 @@ Loader {
9898 Lockscreen {
9999 anchors.left: parent.left; anchors.right: parent.right
100100 height: units.gu(60)
101− skipBackground: true
101+ background: shell.background
102102
103103 onEntered: {
104104 menuModel.changeState(menuIndex, passphrase);