git.iko.soy/unity8
on xenial help sign in
tweak linespacing, smaller confirmation icon
54eea8aLukáš Tinkl
qml/Notifications/Notification.qml+6−2
compare with xenial
unifiedsplit
@@ -218,6 +218,7 @@ StyledItem {
218 }
218 }
219
219
220 NotificationButton {
220 NotificationButton {
221+ objectName: "closeButton"
221 width: units.gu(2)
222 width: units.gu(2)
222 height: width
223 height: width
223 radius: width / 2
224 radius: width / 2
@@ -226,7 +227,9 @@ StyledItem {
226 outline: false
227 outline: false
227 color: theme.palette.normal.negative
228 color: theme.palette.normal.negative
228 anchors.horizontalCenter: parent.left
229 anchors.horizontalCenter: parent.left
230+ anchors.horizontalCenterOffset: notification.parent.state === "narrow" ? notification.margins / 2 : 0
229 anchors.verticalCenter: parent.top
231 anchors.verticalCenter: parent.top
232+ anchors.verticalCenterOffset: notification.parent.state === "narrow" ? notification.margins / 2 : 0
230
233
231 onClicked: notification.notification.close()
234 onClicked: notification.notification.close()
232 }
235 }
@@ -266,8 +269,8 @@ StyledItem {
266 Column {
269 Column {
267 id: labelColumn
270 id: labelColumn
268 width: secondaryIcon.visible ? parent.width - x - units.gu(3) : parent.width - x
271 width: secondaryIcon.visible ? parent.width - x - units.gu(3) : parent.width - x
269−
270 anchors.verticalCenter: (icon.visible && !bodyLabel.visible) ? icon.verticalCenter : undefined
272 anchors.verticalCenter: (icon.visible && !bodyLabel.visible) ? icon.verticalCenter : undefined
273+ spacing: units.gu(.4)
271
274
272 Label {
275 Label {
273 id: summaryLabel
276 id: summaryLabel
@@ -301,6 +304,7 @@ StyledItem {
301 maximumLineCount: type === Notification.SnapDecision ? 12 : 2
304 maximumLineCount: type === Notification.SnapDecision ? 12 : 2
302 elide: Text.ElideRight
305 elide: Text.ElideRight
303 textFormat: Text.PlainText
306 textFormat: Text.PlainText
307+ lineHeight: 1.1
304 }
308 }
305 }
309 }
306
310
@@ -331,7 +335,7 @@ StyledItem {
331 ShapedIcon {
335 ShapedIcon {
332 id: centeredIcon
336 id: centeredIcon
333 objectName: "centeredIcon"
337 objectName: "centeredIcon"
334− width: units.gu(6)
338+ width: units.gu(4)
335 height: width
339 height: width
336 shaped: notification.hints["x-canonical-non-shaped-icon"] !== "true"
340 shaped: notification.hints["x-canonical-non-shaped-icon"] !== "true"
337 fileSource: icon.fileSource
341 fileSource: icon.fileSource
qml/Notifications/Notifications.qml+2
@@ -30,6 +30,8 @@ ListView {
30 property bool hasMouse
30 property bool hasMouse
31 property url background: ""
31 property url background: ""
32
32
33+ readonly property bool useModal: snapDecisionProxyModel.count > 0
34+
33 UnitySortFilterProxyModel {
35 UnitySortFilterProxyModel {
34 id: snapDecisionProxyModel
36 id: snapDecisionProxyModel
35 objectName: "snapDecisionProxyModel"
37 objectName: "snapDecisionProxyModel"