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
3ee3c50Mirco Müller
Greeter/Lockscreen.qml−3
compare with xenial
unifiedsplit
@@ -35,7 +35,6 @@ Showable {
35 property int pinLength: 4
35 property int pinLength: 4
36
36
37 property url background: ""
37 property url background: ""
38− property bool skipBackground: false
39
38
40 signal entered(string passphrase)
39 signal entered(string passphrase)
41 signal cancel()
40 signal cancel()
@@ -60,7 +59,6 @@ Showable {
60 Rectangle {
59 Rectangle {
61 // In case background fails to load or is undefined
60 // In case background fails to load or is undefined
62 id: backgroundBackup
61 id: backgroundBackup
63− visible: !skipBackground
64 anchors.fill: parent
62 anchors.fill: parent
65 color: "black"
63 color: "black"
66 }
64 }
@@ -68,7 +66,6 @@ Showable {
68 Image {
66 Image {
69 id: backgroundImage
67 id: backgroundImage
70 objectName: "lockscreenBackground"
68 objectName: "lockscreenBackground"
71− visible: !skipBackground
72 anchors {
69 anchors {
73 fill: parent
70 fill: parent
74 topMargin: backgroundTopMargin
71 topMargin: backgroundTopMargin
Notifications/Notification.qml+3−1
@@ -115,7 +115,7 @@ Item {
115 left: parent.left
115 left: parent.left
116 right: parent.right
116 right: parent.right
117 top: parent.top
117 top: parent.top
118− margins: spacing
118+ margins: fullscreen ? 0 : spacing
119 }
119 }
120
120
121 spacing: units.gu(1)
121 spacing: units.gu(1)
@@ -199,6 +199,8 @@ Item {
199 visible: count > 0
199 visible: count > 0
200
200
201 anchors.left: parent.left; anchors.right: parent.right
201 anchors.left: parent.left; anchors.right: parent.right
202+ anchors.top: fullscreen ? parent.top : undefined
203+ anchors.bottom: fullscreen ? parent.bottom : undefined
202
204
203 Repeater {
205 Repeater {
204 model: unityMenuModel
206 model: unityMenuModel
Notifications/NotificationMenuItemFactory.qml+1−1
@@ -98,7 +98,7 @@ Loader {
98 Lockscreen {
98 Lockscreen {
99 anchors.left: parent.left; anchors.right: parent.right
99 anchors.left: parent.left; anchors.right: parent.right
100 height: units.gu(60)
100 height: units.gu(60)
101− skipBackground: true
101+ background: shell.background
102
102
103 onEntered: {
103 onEntered: {
104 menuModel.changeState(menuIndex, passphrase);
104 menuModel.changeState(menuIndex, passphrase);