git.iko.soy/unity8
on xenial help sign in
Avoid input falling through notifications onto surfaces below, thus fixing LP: #1257312. Fixes: https://bugs.launchpad.net/bugs/1257312.
f80112bAndrea Cimitan
qml/Notifications/Notification.qml+5−2
compare with xenial
unifiedsplit
@@ -106,8 +106,11 @@ Item {
106
106
107 anchors.fill: contentColumn
107 anchors.fill: contentColumn
108 objectName: "interactiveArea"
108 objectName: "interactiveArea"
109+ onClicked: {
109− enabled: notification.type == Notification.Interactive
110+ if (notification.type == Notification.Interactive) {
110− onClicked: notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
111+ notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
112+ }
113+ }
111 }
114 }
112
115
113 Column {
116 Column {
tests/qmltests/Notifications/tst_Notifications.qml+4−10
@@ -225,7 +225,6 @@ Row {
225 { id: "nada_id", label: "Nada"}],
225 { id: "nada_id", label: "Nada"}],
226 summaryVisible: true,
226 summaryVisible: true,
227 bodyVisible: true,
227 bodyVisible: true,
228− interactiveAreaEnabled: false,
229 iconVisible: true,
228 iconVisible: true,
230 shapedIcon: true,
229 shapedIcon: true,
231 nonShapedIcon: false,
230 nonShapedIcon: false,
@@ -244,7 +243,6 @@ Row {
244 actions: [],
243 actions: [],
245 summaryVisible: true,
244 summaryVisible: true,
246 bodyVisible: false,
245 bodyVisible: false,
247− interactiveAreaEnabled: false,
248 iconVisible: false,
246 iconVisible: false,
249 shapedIcon: false,
247 shapedIcon: false,
250 nonShapedIcon: false,
248 nonShapedIcon: false,
@@ -282,7 +280,6 @@ Row {
282 actions: [{ id: "reply_id", label: "Dummy"}],
280 actions: [{ id: "reply_id", label: "Dummy"}],
283 summaryVisible: true,
281 summaryVisible: true,
284 bodyVisible: true,
282 bodyVisible: true,
285− interactiveAreaEnabled: true,
286 iconVisible: true,
283 iconVisible: true,
287 shapedIcon: true,
284 shapedIcon: true,
288 nonShapedIcon: false,
285 nonShapedIcon: false,
@@ -302,7 +299,6 @@ Row {
302 { id: "reject_id", label: "Reject"}],
299 { id: "reject_id", label: "Reject"}],
303 summaryVisible: true,
300 summaryVisible: true,
304 bodyVisible: true,
301 bodyVisible: true,
305− interactiveAreaEnabled: false,
306 iconVisible: true,
302 iconVisible: true,
307 shapedIcon: true,
303 shapedIcon: true,
308 nonShapedIcon: false,
304 nonShapedIcon: false,
@@ -321,7 +317,6 @@ Row {
321 actions: [],
317 actions: [],
322 summaryVisible: true,
318 summaryVisible: true,
323 bodyVisible: true,
319 bodyVisible: true,
324− interactiveAreaEnabled: false,
325 iconVisible: true,
320 iconVisible: true,
326 shapedIcon: true,
321 shapedIcon: true,
327 nonShapedIcon: false,
322 nonShapedIcon: false,
@@ -341,7 +336,6 @@ Row {
341 actions: [],
336 actions: [],
342 summaryVisible: true,
337 summaryVisible: true,
343 bodyVisible: true,
338 bodyVisible: true,
344− interactiveAreaEnabled: false,
345 iconVisible: true,
339 iconVisible: true,
346 shapedIcon: false,
340 shapedIcon: false,
347 nonShapedIcon: true,
341 nonShapedIcon: true,
@@ -395,14 +389,14 @@ Row {
395 compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
389 compare(icon.visible, data.iconVisible, "avatar-icon visibility is incorrect")
396 compare(shapedIcon.visible, data.shapedIcon, "shaped-icon visibility is incorrect")
390 compare(shapedIcon.visible, data.shapedIcon, "shaped-icon visibility is incorrect")
397 compare(nonShapedIcon.visible, data.nonShapedIcon, "non-shaped-icon visibility is incorrect")
391 compare(nonShapedIcon.visible, data.nonShapedIcon, "non-shaped-icon visibility is incorrect")
398− compare(interactiveArea.enabled, data.interactiveAreaEnabled, "check for interactive area")
399
392
400− if(data.interactiveAreaEnabled) {
393+ // test input does not fall through
401− mouseClick(notification, notification.width / 2, notification.height / 2)
394+ mouseClick(notification, notification.width / 2, notification.height / 2)
395+ if(data.type == Notification.Interactive) {
402 actionSpy.wait()
396 actionSpy.wait()
403 compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
397 compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
404− compare(clickThroughSpy.count, 0, "click on interactive notification fell through")
405 }
398 }
399+ compare(clickThroughSpy.count, 0, "click on notification fell through")
406
400
407 compare(secondaryIcon.visible, data.secondaryIconVisible, "secondary-icon visibility is incorrect")
401 compare(secondaryIcon.visible, data.secondaryIconVisible, "secondary-icon visibility is incorrect")
408 compare(summaryLabel.visible, data.summaryVisible, "summary-text visibility is incorrect")
402 compare(summaryLabel.visible, data.summaryVisible, "summary-text visibility is incorrect")