git.iko.soy/unity8
on xenial help sign in
Further tweak the Loader for the SwipeToAct-widget.
5a66853Mirco Müller
qml/Notifications/Notification.qml+13−16
compare with xenial
unifiedsplit
@@ -406,25 +406,21 @@ Item {
406
406
407 Loader {
407 Loader {
408 id: notifySwipeButtonLoader
408 id: notifySwipeButtonLoader
409+ active: notification.hints["x-canonical-snap-decisions-swipe"] === "true"
410+
411+ sourceComponent: SwipeToAct {
412+ objectName: "notify_swipe_button"
413+ width: buttonRow.width
414+ leftIconName: "call-end"
415+ rightIconName: "call-start"
416+ onLeftTriggered: {
417+ notification.notification.invokeAction(notification.actions.data(0, ActionModel.RoleActionId))
418+ }
409
419
410− Component {
411− id: notifySwipeButton
412−
413− SwipeToAct {
414− objectName: "notify_swipe_button"
415− width: buttonRow.width
416− leftIconName: "call-end"
417− rightIconName: "call-start"
418− onLeftTriggered: {
419− notification.notification.invokeAction(notification.actions.data(0, ActionModel.RoleActionId))
420− }
421−
422− onRightTriggered: {
420+ onRightTriggered: {
423− notification.notification.invokeAction(notification.actions.data(1, ActionModel.RoleActionId))
421+ notification.notification.invokeAction(notification.actions.data(1, ActionModel.RoleActionId))
424− }
425 }
422 }
426 }
423 }
427− sourceComponent: notification.hints["x-canonical-snap-decisions-swipe"] === "true" ? notifySwipeButton : undefined
428 }
424 }
429
425
430 Repeater {
426 Repeater {
@@ -435,6 +431,7 @@ Item {
435
431
436 property string actionId: id
432 property string actionId: id
437 property string actionLabel: label
433 property string actionLabel: label
434+ active: !notifySwipeButtonLoader.active
438
435
439 Component {
436 Component {
440 id: actionButton
437 id: actionButton