git.iko.soy/unity8
on xenial help sign in
Still trying to fix top- and bottom margin issues... added skipBackground property to Lockscreen to allow better blending with the notification styling when used with the extended snap-decision.
e5db972Mirco Müller
Greeter/Lockscreen.qml+3
compare with xenial
unifiedsplit
@@ -35,6 +35,7 @@ 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
38
39
39 signal entered(string passphrase)
40 signal entered(string passphrase)
40 signal cancel()
41 signal cancel()
@@ -59,12 +60,14 @@ Showable {
59 Rectangle {
60 Rectangle {
60 // In case wallpaper fails to load or is undefined
61 // In case wallpaper fails to load or is undefined
61 id: wallpaperBackup
62 id: wallpaperBackup
63+ visible: !skipBackground
62 anchors.fill: parent
64 anchors.fill: parent
63 color: "black"
65 color: "black"
64 }
66 }
65
67
66 Image {
68 Image {
67 id: wallpaper
69 id: wallpaper
70+ visible: !skipBackground
68 anchors.fill: parent
71 anchors.fill: parent
69 source: root.required ? root.background : ""
72 source: root.required ? root.background : ""
70 fillMode: Image.PreserveAspectCrop
73 fillMode: Image.PreserveAspectCrop
Notifications/Notification.qml+2−4
@@ -37,7 +37,7 @@ Item {
37
37
38 fullscreen: notification.hints["x-canonical-private-fullscreen"] == "true" ? true : false
38 fullscreen: notification.hints["x-canonical-private-fullscreen"] == "true" ? true : false
39 objectName: "background"
39 objectName: "background"
40− implicitHeight: type != Notification.PlaceHolder ? (fullscreen ? notificationList.fullHeight : contentColumn.height + contentColumn.spacing * 2) : 0
40+ implicitHeight: type != Notification.PlaceHolder ? (fullscreen ? notificationList.fullHeight : contentColumn.height + contentColumn.spacing * 3) : 0
41
41
42 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
42 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
43 opacity: 0
43 opacity: 0
@@ -50,9 +50,7 @@ Item {
50
50
51 visible: !fullscreen
51 visible: !fullscreen
52 anchors.fill: parent
52 anchors.fill: parent
53− anchors.leftMargin: notificationList.margin
54− anchors.rightMargin: notificationList.margin
55− //anchors.topMargin: notificationList.margin
53+ anchors.margins: notificationList.margin
56 color: parent.color
54 color: parent.color
57 opacity: parent.opacity
55 opacity: parent.opacity
58 radius: "medium"
56 radius: "medium"
Notifications/NotificationMenuItemFactory.qml+1−1
@@ -79,7 +79,7 @@ Loader {
79 Lockscreen {
79 Lockscreen {
80 anchors.left: parent.left; anchors.right: parent.right
80 anchors.left: parent.left; anchors.right: parent.right
81 height: units.gu(60)
81 height: units.gu(60)
82− background: shell.background
82+ skipBackground: true
83
83
84 Component.onCompleted: {
84 Component.onCompleted: {
85 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-pin-length': 'int'});
85 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-pin-length': 'int'});