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.
commite5db9726c7b32c384b6b05b786215e5969f84b32 authorMirco Müller <mirco.mueller@ubuntu.com> dateFri 25 Oct 2013, 12:37 (13 years ago) parent1322cfa
3 files changed+6−5
compare with xenial
unifiedsplit
Greeter/Lockscreen.qml+3 Notifications/Notification.qml+2−4 Notifications/NotificationMenuItemFactory.qml+1−1
Greeter/Lockscreen.qml+3
@@ -35,6 +35,7 @@ Showable {
3535 property int pinLength: 4
3636
3737 property url background: ""
38+ property bool skipBackground: false
3839
3940 signal entered(string passphrase)
4041 signal cancel()
@@ -59,12 +60,14 @@ Showable {
5960 Rectangle {
6061 // In case wallpaper fails to load or is undefined
6162 id: wallpaperBackup
63+ visible: !skipBackground
6264 anchors.fill: parent
6365 color: "black"
6466 }
6567
6668 Image {
6769 id: wallpaper
70+ visible: !skipBackground
6871 anchors.fill: parent
6972 source: root.required ? root.background : ""
7073 fillMode: Image.PreserveAspectCrop
Notifications/Notification.qml+2−4
@@ -37,7 +37,7 @@ Item {
3737
3838 fullscreen: notification.hints["x-canonical-private-fullscreen"] == "true" ? true : false
3939 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
4141
4242 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
4343 opacity: 0
@@ -50,9 +50,7 @@ Item {
5050
5151 visible: !fullscreen
5252 anchors.fill: parent
53− anchors.leftMargin: notificationList.margin
54− anchors.rightMargin: notificationList.margin
55− //anchors.topMargin: notificationList.margin
53+ anchors.margins: notificationList.margin
5654 color: parent.color
5755 opacity: parent.opacity
5856 radius: "medium"
Notifications/NotificationMenuItemFactory.qml+1−1
@@ -79,7 +79,7 @@ Loader {
7979 Lockscreen {
8080 anchors.left: parent.left; anchors.right: parent.right
8181 height: units.gu(60)
82− background: shell.background
82+ skipBackground: true
8383
8484 Component.onCompleted: {
8585 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-pin-length': 'int'});