git.iko.soy/unity8
on xenial help sign in
fix some tests warnings
c4318e8Lukáš Tinkl
qml/Notifications/NotificationButton.qml+2−2
compare with xenial
unifiedsplit
@@ -22,8 +22,8 @@ Rectangle {
22
22
23 height: units.gu(4)
23 height: units.gu(4)
24 radius: units.dp(4)
24 radius: units.dp(4)
25− border.width: outline ? units.dp(1) : undefined
25+ border.width: outline ? units.dp(1) : 0
26− border.color: outline ? theme.palette.normal.base : undefined
26+ border.color: outline ? theme.palette.normal.base : "transparent"
27
27
28 // to be set from outside
28 // to be set from outside
29 property bool outline: true
29 property bool outline: true
qml/Notifications/SwipeToAct.qml+2−6
@@ -76,9 +76,7 @@ Item {
76 outline: false
76 outline: false
77 width: (parent.width / 2) - priv.gap / 2
77 width: (parent.width / 2) - priv.gap / 2
78 color: theme.palette.normal.negative
78 color: theme.palette.normal.negative
79− onClicked: {
80− leftTriggered()
79+ onClicked: leftTriggered()
81− }
82 }
80 }
83
81
84 NotificationButton {
82 NotificationButton {
@@ -91,9 +89,7 @@ Item {
91 outline: false
89 outline: false
92 width: (parent.width / 2) - priv.gap / 2
90 width: (parent.width / 2) - priv.gap / 2
93 color: theme.palette.normal.positive
91 color: theme.palette.normal.positive
94− onClicked: {
95− rightTriggered()
92+ onClicked: rightTriggered()
96− }
97 }
93 }
98
94
99 UbuntuShape {
95 UbuntuShape {
tests/qmltests/Notifications/tst_SwipeToAct.qml+1−1
@@ -73,7 +73,7 @@ Item {
73 summary: "Incoming call",
73 summary: "Incoming call",
74 body: "Frank Zappa\n+44 (0)7736 027340",
74 body: "Frank Zappa\n+44 (0)7736 027340",
75 icon: "../../tests/graphics/avatars/amanda.png",
75 icon: "../../tests/graphics/avatars/amanda.png",
76− secondaryIcon: "incoming-call",
76+ secondaryIcon: "image://theme/incoming-call",
77 actions: [{ id: "ok_id", label: "Ok"},
77 actions: [{ id: "ok_id", label: "Ok"},
78 { id: "cancel_id", label: "Cancel"},
78 { id: "cancel_id", label: "Cancel"},
79 { id: "foo_id", label: "Foo"},
79 { id: "foo_id", label: "Foo"},