git.iko.soy/unity8
on xenial help sign in
WIP: notifications visuals

- margins, fonts, colors, spacing, etc. - swipe to close to both sides

commit26cc55013e3b2477e13b6f4dd06eea0259de4a7e authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 5 Apr 2016, 21:29 (11 years ago) parent8e46b45
10 files changed+82−123
compare with xenial
unifiedsplit
CMakeLists.txt+1−1 qml/Notifications/Notification.qml+58−69 qml/Notifications/NotificationMenuItemFactory.qml+5−11 qml/Notifications/Notifications.qml+2−4 qml/Notifications/OptionToggle.qml+5−4 qml/Notifications/SwipeToAct.qml+7−7 qml/Shell.qml−14 tests/qmltests/Notifications/tst_Notifications.qml+1−12 tests/qmltests/Notifications/tst_OptionToggle.qml+2−1 tests/qmltests/Notifications/tst_SwipeToAct.qml+1
CMakeLists.txt+1−1
@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.4 REQUIRED)
5757find_package(Qt5Concurrent 5.4 REQUIRED)
5858find_package(Qt5Sql 5.4 REQUIRED)
5959
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=14)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application>=14)
6161pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
6262pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
6363pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
qml/Notifications/Notification.qml+58−69
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013, 2015 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -36,38 +36,37 @@ StyledItem {
3636 property var type
3737 property var hints
3838 property var notification
39− property color color
39+ property color color: UbuntuColors.silk // TODO theme.palette.normal.overlay
4040 property bool fullscreen: false
4141 property int maxHeight
42− property int margins
43− readonly property bool draggable: (type === Notification.SnapDecision && state === "contracted") || type === Notification.Interactive || type === Notification.Ephemeral
44− readonly property bool darkOnBright: inverseMode || type === Notification.SnapDecision
45− readonly property color sdLightGrey: "#eaeaea"
46− readonly property real contentSpacing: units.gu(2)
42+ property int margins: units.gu(1)
43+ readonly property bool draggable: (type === Notification.SnapDecision && state === "contracted") ||
44+ type === Notification.Interactive ||
45+ type === Notification.Ephemeral
4746 readonly property bool canBeClosed: type === Notification.Ephemeral
47+ readonly property real defaultOpacity: 0.95
4848 property bool hasMouse
49− property bool inverseMode
5049 property url background: ""
5150
5251 objectName: "background"
53− implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : outterColumn.height - shapedBack.anchors.topMargin + contentSpacing * 2) : 0
52+ implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : outterColumn.height + margins * 2) : 0
5453
55− color: (type === Notification.Confirmation && notificationList.useModal && !greeter.shown) || darkOnBright ? sdLightGrey : Qt.rgba(0.132, 0.117, 0.109, 0.97)
56− opacity: 1 - (x / notification.width) // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
54+ // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
55+ opacity: defaultOpacity - Math.abs(x / notification.width)
5756
5857 theme: ThemeSettings {
59− name: darkOnBright ? "Ubuntu.Components.Themes.Ambiance" : "Ubuntu.Components.Themes.SuruDark"
58+ name: "Ubuntu.Components.Themes.Ambiance"
6059 }
6160
6261 state: {
6362 var result = "";
6463
65− if (type == Notification.SnapDecision) {
66− if (ListView.view.currentIndex == index) {
64+ if (type === Notification.SnapDecision) {
65+ if (ListView.view.currentIndex === index) {
6766 result = "expanded";
6867 } else {
6968 if (ListView.view.count > 2) {
70− if (ListView.view.currentIndex == -1 && index == 1) {
69+ if (ListView.view.currentIndex === -1 && index == 1) {
7170 result = "expanded";
7271 } else {
7372 result = "contracted";
@@ -90,39 +89,30 @@ StyledItem {
9089 Component.onCompleted: {
9190 // Turn on screen as needed (Powerd.Notification means the screen
9291 // stays on for a shorter amount of time)
93− if (type == Notification.SnapDecision) {
92+ if (type === Notification.SnapDecision) {
9493 Powerd.setStatus(Powerd.On, Powerd.SnapDecision);
95− } else if (type != Notification.Confirmation) {
94+ } else if (type !== Notification.Confirmation) {
9695 Powerd.setStatus(Powerd.On, Powerd.Notification);
9796 }
9897
9998 // FIXME: using onCompleted because of LP: #1354406 workaround, has to be onOpacityChanged really
100− if (opacity == 1.0 && hints["suppress-sound"] !== "true" && sound.source !== "") {
99+ if (opacity == defaultOpacity && hints["suppress-sound"] !== "true" && sound.source !== "") {
101100 sound.play();
102101 }
103102 }
104103
105104 Behavior on x {
106− id: normalXBehavior
107−
108105 enabled: draggable
109− UbuntuNumberAnimation {
110− duration: UbuntuAnimation.FastDuration
111− easing.type: Easing.OutBounce
112− }
106+ UbuntuNumberAnimation { easing.type: Easing.OutBounce }
113107 }
114108
115109 onHintsChanged: {
116− if (type === Notification.Confirmation && opacity == 1.0 && hints["suppress-sound"] !== "true" && sound.source !== "") {
110+ if (type === Notification.Confirmation && opacity == defaultOpacity && hints["suppress-sound"] !== "true" && sound.source !== "") {
117111 sound.play();
118112 }
119113 }
120114
121115 Behavior on height {
122− id: normalHeightBehavior
123−
124− //enabled: menuItemFactory.progress == 1
125− enabled: true
126116 UbuntuNumberAnimation {
127117 duration: UbuntuAnimation.SnapDuration
128118 }
@@ -131,7 +121,7 @@ StyledItem {
131121 states:[
132122 State {
133123 name: "contracted"
134− PropertyChanges {target: notification; height: units.gu(10)}
124+ PropertyChanges {target: notification; height: topRow.childrenRect.height + notification.margins * 2}
135125 },
136126 State {
137127 name: "expanded"
@@ -141,7 +131,7 @@ StyledItem {
141131
142132 clip: fullscreen ? false : true
143133
144− visible: type != Notification.PlaceHolder
134+ visible: type !== Notification.PlaceHolder
145135
146136 UbuntuShape {
147137 id: shapedBack
@@ -149,9 +139,6 @@ StyledItem {
149139 visible: !fullscreen
150140 anchors {
151141 fill: parent
152− leftMargin: notification.margins
153− rightMargin: notification.margins
154− topMargin: type === Notification.Confirmation ? units.gu(.5) : 0
155142 }
156143 backgroundColor: parent.color
157144 opacity: parent.opacity
@@ -169,7 +156,7 @@ StyledItem {
169156 }
170157
171158 onXChanged: {
172− if (draggable && notification.x > 0.75 * notification.width) {
159+ if (draggable && Math.abs(notification.x) > 0.75 * notification.width) {
173160 notification.notification.close()
174161 }
175162 }
@@ -212,11 +199,11 @@ StyledItem {
212199
213200 drag.target: draggable ? notification : undefined
214201 drag.axis: Drag.XAxis
215− drag.minimumX: 0
202+ drag.minimumX: -notification.width
216203 drag.maximumX: notification.width
217204
218205 onClicked: {
219− if (notification.type == Notification.Interactive) {
206+ if (notification.type === Notification.Interactive) {
220207 notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
221208 } else if (hasMouse && canBeClosed) {
222209 notification.notification.close()
@@ -225,7 +212,7 @@ StyledItem {
225212 }
226213 }
227214 onReleased: {
228− if (notification.x < notification.width / 2) {
215+ if (Math.abs(notification.x) < notification.width / 2) {
229216 notification.x = 0
230217 } else {
231218 notification.x = notification.width
@@ -240,30 +227,28 @@ StyledItem {
240227 left: parent.left
241228 right: parent.right
242229 top: parent.top
243− margins: 0
244− topMargin: fullscreen ? 0 : type === Notification.Confirmation ? units.gu(1) : units.gu(2)
230+ margins: notification.margins
245231 }
246232
247− spacing: type === Notification.Confirmation ? units.gu(1) : units.gu(2)
233+ spacing: notification.margins
248234
249235 Row {
250236 id: topRow
251237
252− spacing: contentSpacing
238+ spacing: notification.margins
253239 anchors {
254240 left: parent.left
255241 right: parent.right
256− margins: contentSpacing
257242 }
258243
259244 ShapedIcon {
260245 id: icon
261246
262247 objectName: "icon"
263− width: type == Notification.Ephemeral && !bodyLabel.visible ? units.gu(3) : units.gu(6)
248+ width: units.gu(6)
264249 height: width
265− shaped: notification.hints["x-canonical-non-shaped-icon"] == "true" ? false : true
266− visible: iconSource !== undefined && iconSource !== "" && type !== Notification.Confirmation
250+ shaped: notification.hints["x-canonical-non-shaped-icon"] !== "true"
251+ visible: iconSource !== "" && type !== Notification.Confirmation
267252 }
268253
269254 Column {
@@ -282,6 +267,8 @@ StyledItem {
282267 }
283268 visible: type !== Notification.Confirmation
284269 fontSize: "medium"
270+ font.weight: Font.Light
271+ color: theme.palette.normal.backgroundSecondaryText
285272 elide: Text.ElideRight
286273 textFormat: Text.PlainText
287274 }
@@ -296,8 +283,10 @@ StyledItem {
296283 }
297284 visible: body != "" && type !== Notification.Confirmation
298285 fontSize: "small"
286+ font.weight: Font.Light
287+ color: theme.palette.normal.backgroundTertiaryText
299288 wrapMode: Text.Wrap
300− maximumLineCount: type == Notification.SnapDecision ? 12 : 2
289+ maximumLineCount: type === Notification.SnapDecision ? 12 : 2
301290 elide: Text.ElideRight
302291 textFormat: Text.PlainText
303292 }
@@ -315,17 +304,17 @@ StyledItem {
315304 }
316305
317306 ListItem.ThinDivider {
318− visible: type == Notification.SnapDecision
307+ visible: type === Notification.SnapDecision && notification.state !== "contracted"
319308 }
320309
321310 ShapedIcon {
322311 id: centeredIcon
323312 objectName: "centeredIcon"
324− width: units.gu(5)
313+ width: units.gu(6)
325314 height: width
326− shaped: notification.hints["x-canonical-non-shaped-icon"] == "true" ? false : true
315+ shaped: notification.hints["x-canonical-non-shaped-icon"] !== "true"
327316 fileSource: icon.fileSource
328− visible: fileSource !== undefined && fileSource !== "" && type === Notification.Confirmation
317+ visible: fileSource !== "" && type === Notification.Confirmation
329318 anchors.horizontalCenter: parent.horizontalCenter
330319 }
331320
@@ -336,6 +325,8 @@ StyledItem {
336325 anchors.horizontalCenter: parent.horizontalCenter
337326 visible: type === Notification.Confirmation && body !== ""
338327 fontSize: "medium"
328+ font.weight: Font.Light
329+ color: theme.palette.normal.backgroundSecondaryText
339330 wrapMode: Text.WordWrap
340331 maximumLineCount: 1
341332 elide: Text.ElideRight
@@ -351,7 +342,6 @@ StyledItem {
351342 anchors {
352343 left: parent.left
353344 right: parent.right
354− margins: contentSpacing
355345 }
356346
357347 height: units.gu(1)
@@ -364,7 +354,7 @@ StyledItem {
364354 objectName: "innerBar"
365355 width: valueIndicator.width * valueIndicator.value / 100
366356 height: units.gu(1)
367− backgroundColor: notification.hints["x-canonical-value-bar-tint"] === "true" ? theme.palette.normal.activity : theme.palette.highlighted.foreground
357+ backgroundColor: notification.hints["x-canonical-value-bar-tint"] === "true" ? theme.palette.highlighted.activity : theme.palette.normal.activity
368358 aspect: UbuntuShape.Flat
369359 radius: "small"
370360 }
@@ -373,7 +363,7 @@ StyledItem {
373363 Column {
374364 id: dialogColumn
375365 objectName: "dialogListView"
376− spacing: units.gu(2)
366+ spacing: notification.margins
377367
378368 visible: count > 0
379369
@@ -417,12 +407,11 @@ StyledItem {
417407 anchors {
418408 left: parent.left
419409 right: parent.right
420− margins: contentSpacing
421410 }
422411
423− spacing: contentSpacing
412+ spacing: notification.margins
424413
425− visible: notification.type === Notification.SnapDecision && oneOverTwoRepeaterTop.count === 3
414+ visible: notification.type === Notification.SnapDecision && oneOverTwoRepeaterTop.count === 3 && notification.state === "expanded"
426415
427416 Repeater {
428417 id: oneOverTwoRepeaterTop
@@ -441,7 +430,8 @@ StyledItem {
441430 objectName: "notify_oot_button" + index
442431 width: oneOverTwoCase.width
443432 text: oneOverTwoLoaderTop.actionLabel
444− color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? UbuntuColors.green : theme.palette.normal.baseText
433+ color: notification.hints["x-canonical-private-affirmative-tint"] === "true" ? theme.palette.normal.positive
434+ : theme.palette.normal.baseText
445435 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
446436 }
447437 }
@@ -450,7 +440,7 @@ StyledItem {
450440 }
451441
452442 Row {
453− spacing: contentSpacing
443+ spacing: notification.margins
454444
455445 Repeater {
456446 id: oneOverTwoRepeaterBottom
@@ -469,7 +459,8 @@ StyledItem {
469459 objectName: "notify_oot_button" + index
470460 width: oneOverTwoCase.width / 2 - spacing * 2
471461 text: oneOverTwoLoaderBottom.actionLabel
472− color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? UbuntuColors.red : theme.palette.normal.baseText
462+ color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] === "true" ? theme.palette.normal.negative
463+ : theme.palette.normal.baseText
473464 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
474465 }
475466 }
@@ -486,10 +477,9 @@ StyledItem {
486477 anchors {
487478 left: parent.left
488479 right: parent.right
489− margins: contentSpacing
490480 }
491− visible: notification.type === Notification.SnapDecision && actionRepeater.count > 0 && !oneOverTwoCase.visible
492− spacing: contentSpacing
481+ visible: notification.type === Notification.SnapDecision && actionRepeater.count > 0 && !oneOverTwoCase.visible && notification.state === "expanded"
482+ spacing: notification.margins
493483 layoutDirection: Qt.RightToLeft
494484
495485 Loader {
@@ -531,11 +521,11 @@ StyledItem {
531521 text: loader.actionLabel
532522 color: {
533523 var result = theme.palette.normal.baseText;
534− if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] == "true") {
535− result = UbuntuColors.green;
524+ if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] === "true") {
525+ result = theme.palette.normal.positive;
536526 }
537− if (index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true") {
538− result = UbuntuColors.red;
527+ if (index == 1 && notification.hints["x-canonical-private-rejection-tint"] === "true") {
528+ result = theme.palette.normal.negative;
539529 }
540530 return result;
541531 }
@@ -554,10 +544,9 @@ StyledItem {
554544 anchors {
555545 left: parent.left
556546 right: parent.right
557− margins: contentSpacing
558547 }
559548
560− visible: notification.type == Notification.SnapDecision && actionRepeater.count > 3 && !oneOverTwoCase.visible
549+ visible: notification.type === Notification.SnapDecision && actionRepeater.count > 3 && !oneOverTwoCase.visible && notification.state === "expanded"
561550 model: notification.actions
562551 expanded: false
563552 startIndex: 2
qml/Notifications/NotificationMenuItemFactory.qml+5−11
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -12,9 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
1815 */
1916
2017import QtQuick 2.4
@@ -71,7 +68,7 @@ Loader {
7168 id: textfield
7269
7370 Column {
74− spacing: units.gu(2)
71+ spacing: notification.margins
7572
7673 anchors {
7774 left: parent.left
@@ -87,12 +84,10 @@ Loader {
8784
8885 Label {
8986 text: menuData.label
90− color: notification.sdFontColor
87+ color: theme.palette.normal.backgroundSecondaryText
9188 }
9289
9390 TextField {
94− id: textfield
95−
9691 // TODO using Qt.ImhNoPredictiveText here until lp #1291575 is fixed for ubuntu-ui-toolkit
9792 inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
9893 anchors {
@@ -115,7 +110,7 @@ Loader {
115110 Row {
116111 id: checkBoxRow
117112
118− spacing: units.gu(.5)
113+ spacing: notification.margins
119114
120115 CheckBox {
121116 id: checkBox
@@ -127,7 +122,7 @@ Loader {
127122 Label {
128123 anchors.verticalCenter: checkBox.verticalCenter
129124 text: i18n.tr("Show password")
130− color: notification.sdFontColor
125+ color: theme.palette.normal.backgroundSecondaryText
131126
132127 MouseArea {
133128 anchors.fill: parent
@@ -151,7 +146,6 @@ Loader {
151146 errorText: errorAction.valid ? errorAction.state : ""
152147 retryText: notification.body
153148 background: menuFactory.background
154− darkenBackground: 0.4
155149
156150 onEntered: {
157151 menuModel.changeState(menuIndex, passphrase);
qml/Notifications/Notifications.qml+2−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@ ListView {
2929 property real margin
3030 property bool useModal: snapDecisionProxyModel.count > 0
3131 property bool hasMouse
32− property bool inverseMode
3332 property url background: ""
3433
3534 UnitySortFilterProxyModel {
@@ -42,7 +41,7 @@ ListView {
4241 }
4342
4443 property bool topmostIsFullscreen: false
45− spacing: topmostIsFullscreen ? 0 : units.gu(.5)
44+ spacing: topmostIsFullscreen ? 0 : units.gu(1)
4645
4746 currentIndex: count > 1 ? 1 : -1
4847
@@ -62,7 +61,6 @@ ListView {
6261 maxHeight: notificationList.height
6362 margins: notificationList.margin
6463 hasMouse: notificationList.hasMouse
65− inverseMode: notificationList.inverseMode
6664 background: notificationList.background
6765
6866 // make sure there's no opacity-difference between the several
qml/Notifications/OptionToggle.qml+5−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014,2015 Canonical, Ltd.
2+ * Copyright (C) 2014-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -75,7 +75,7 @@ UbuntuShape {
7575 id: delegateIcon
7676 anchors {
7777 left: parent.left
78− leftMargin: units.gu(2)
78+ leftMargin: units.gu(1)
7979 verticalCenter: parent.verticalCenter
8080 }
8181 visible: index !== startIndex
@@ -90,7 +90,7 @@ UbuntuShape {
9090 left: delegateIcon.visible ? delegateIcon.right : parent.left
9191 leftMargin: delegateIcon.visible ? units.gu(1) : units.gu(2)
9292 right: parent.right
93− rightMargin: units.gu(2)
93+ rightMargin: units.gu(1)
9494 verticalCenter: delegateIcon.visible ? delegateIcon.verticalCenter : parent.verticalCenter
9595 }
9696
@@ -98,6 +98,7 @@ UbuntuShape {
9898 text: splitLabel[3]
9999 color: theme.palette.normal.backgroundText
100100 fontSize: "small"
101+ font.weight: Font.Light
101102 maximumLineCount: 1
102103 elide: Text.ElideRight
103104 }
@@ -105,7 +106,7 @@ UbuntuShape {
105106 Icon {
106107 anchors {
107108 right: parent.right
108− rightMargin: units.gu(2)
109+ rightMargin: units.gu(1)
109110 verticalCenter: delegateIcon.verticalCenter
110111 }
111112
qml/Notifications/SwipeToAct.qml+7−7
@@ -35,9 +35,9 @@ Item {
3535
3636 property double opacityDelta
3737 readonly property double sliderHeight: units.gu(8)
38− readonly property double gap: units.gu(1)
39− readonly property color sliderMainColor: "#b2b2b2"
40− readonly property color sliderBGColor: "#f4f4f4"
38+ readonly property double gap: units.gu(0.5)
39+ readonly property color sliderMainColor: theme.palette.normal.base
40+ readonly property color sliderBGColor: theme.palette.normal.foreground
4141 readonly property double halfWay: mouseArea.drag.maximumX / 2
4242
4343 UbuntuNumberAnimation on opacityDelta {
@@ -74,7 +74,7 @@ Item {
7474 iconName: leftIconName
7575 visible: clickToAct
7676 width: (parent.width / 2) - priv.gap
77− color: UbuntuColors.red
77+ color: theme.palette.normal.negative
7878 onClicked: {
7979 leftTriggered()
8080 }
@@ -88,7 +88,7 @@ Item {
8888 iconName: rightIconName
8989 visible: clickToAct
9090 width: (parent.width / 2) - priv.gap
91− color: UbuntuColors.green
91+ color: theme.palette.normal.positive
9292 onClicked: {
9393 rightTriggered()
9494 }
@@ -108,7 +108,7 @@ Item {
108108 anchors.top: parent.top
109109 anchors.left: parent.left
110110 anchors.margins: priv.gap
111− backgroundColor: UbuntuColors.red
111+ backgroundColor: theme.palette.normal.negative
112112 aspect: UbuntuShape.Flat
113113
114114 state: "normal"
@@ -226,7 +226,7 @@ Item {
226226 anchors.top: parent.top
227227 anchors.right: parent.right
228228 anchors.margins: priv.gap
229− backgroundColor: UbuntuColors.green
229+ backgroundColor: theme.palette.normal.positive
230230 aspect: UbuntuShape.Flat
231231
232232 state: "normal"
qml/Shell.qml−14
@@ -627,26 +627,12 @@ Item {
627627 onActiveChanged: unlockWhenDoneWithWizard()
628628 }
629629
630− Rectangle {
631− id: modalNotificationBackground
632−
633− visible: notifications.useModal
634− color: "#000000"
635− anchors.fill: parent
636− opacity: 0.9
637−
638− MouseArea {
639− anchors.fill: parent
640− }
641− }
642−
643630 Notifications {
644631 id: notifications
645632
646633 model: NotificationBackend.Model
647634 margin: units.gu(1)
648635 hasMouse: shell.hasMouse
649− inverseMode: panel.indicators.shown
650636 background: wallpaperResolver.background
651637
652638 y: topmostIsFullscreen ? 0 : panel.panelHeight
tests/qmltests/Notifications/tst_Notifications.qml+1−12
@@ -186,9 +186,9 @@ Item {
186186 margin: units.gu(1)
187187
188188 anchors.fill: parent
189+ anchors.margins: units.gu(1)
189190 model: mockModel
190191 hasMouse: fakeMouseCB.checked
191− inverseMode: inverseModeCB.checked
192192 }
193193 }
194194
@@ -268,17 +268,6 @@ Item {
268268 anchors.verticalCenter: parent.verticalCenter
269269 }
270270 }
271−
272− RowLayout {
273− Layout.fillWidth: true
274− CheckBox {
275− id: inverseModeCB
276− }
277− Label {
278− text: "Inverse mode"
279− anchors.verticalCenter: parent.verticalCenter
280− }
281− }
282271 }
283272 }
284273
tests/qmltests/Notifications/tst_OptionToggle.qml+2−1
@@ -96,7 +96,7 @@ Row {
9696
9797 width: units.gu(40)
9898 height: units.gu(81)
99− color: "#cccccc"
99+ color: theme.palette.normal.background
100100
101101 MouseArea{
102102 id: clickThroughCatcher
@@ -110,6 +110,7 @@ Row {
110110 margin: units.gu(1)
111111
112112 anchors.fill: parent
113+ anchors.margins: units.gu(1)
113114 model: mockModel
114115 }
115116 }
tests/qmltests/Notifications/tst_SwipeToAct.qml+1
@@ -110,6 +110,7 @@ Item {
110110 margin: units.gu(1)
111111
112112 anchors.fill: parent
113+ anchors.margins: units.gu(1)
113114 model: mockModel
114115 hasMouse: false
115116 }