git.iko.soy/unity8
on xenial help sign in
fix some tests warnings
commitc4318e8fc09063bf49b08fc2966f7973033a6331 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 7 Apr 2016, 00:28 (11 years ago) parent19df370
3 files changed+5−9
compare with xenial
unifiedsplit
qml/Notifications/NotificationButton.qml+2−2 qml/Notifications/SwipeToAct.qml+2−6 tests/qmltests/Notifications/tst_SwipeToAct.qml+1−1
qml/Notifications/NotificationButton.qml+2−2
@@ -22,8 +22,8 @@ Rectangle {
2222
2323 height: units.gu(4)
2424 radius: units.dp(4)
25− border.width: outline ? units.dp(1) : undefined
26− border.color: outline ? theme.palette.normal.base : undefined
25+ border.width: outline ? units.dp(1) : 0
26+ border.color: outline ? theme.palette.normal.base : "transparent"
2727
2828 // to be set from outside
2929 property bool outline: true
qml/Notifications/SwipeToAct.qml+2−6
@@ -76,9 +76,7 @@ Item {
7676 outline: false
7777 width: (parent.width / 2) - priv.gap / 2
7878 color: theme.palette.normal.negative
79− onClicked: {
80− leftTriggered()
81− }
79+ onClicked: leftTriggered()
8280 }
8381
8482 NotificationButton {
@@ -91,9 +89,7 @@ Item {
9189 outline: false
9290 width: (parent.width / 2) - priv.gap / 2
9391 color: theme.palette.normal.positive
94− onClicked: {
95− rightTriggered()
96− }
92+ onClicked: rightTriggered()
9793 }
9894
9995 UbuntuShape {
tests/qmltests/Notifications/tst_SwipeToAct.qml+1−1
@@ -73,7 +73,7 @@ Item {
7373 summary: "Incoming call",
7474 body: "Frank Zappa\n+44 (0)7736 027340",
7575 icon: "../../tests/graphics/avatars/amanda.png",
76− secondaryIcon: "incoming-call",
76+ secondaryIcon: "image://theme/incoming-call",
7777 actions: [{ id: "ok_id", label: "Ok"},
7878 { id: "cancel_id", label: "Cancel"},
7979 { id: "foo_id", label: "Foo"},