git.iko.soy/unity8
on xenial help sign in
Small Flickable-related fix... also make sure no regular buttons are created, if the SwipeToAct-widget is used.
0c162fcMirco Müller
qml/Notifications/Notification.qml+4−4
compare with xenial
unifiedsplit
@@ -20,7 +20,6 @@ import Ubuntu.Components 1.1
20import Unity.Notifications 1.0
20import Unity.Notifications 1.0
21import QMenuModel 0.1
21import QMenuModel 0.1
22import Utils 0.1
22import Utils 0.1
23−import "../Components/Flickables" as Flickables
24
23
25import Ubuntu.Components.ListItems 0.1 as ListItem
24import Ubuntu.Components.ListItems 0.1 as ListItem
26
25
@@ -335,7 +334,7 @@ Item {
335
334
336 spacing: contentSpacing
335 spacing: contentSpacing
337
336
338− visible: notification.type == Notification.SnapDecision && oneOverTwoRepeaterTop.count == 3
337+ visible: notification.type === Notification.SnapDecision && oneOverTwoRepeaterTop.count === 3
339
338
340 Repeater {
339 Repeater {
341 id: oneOverTwoRepeaterTop
340 id: oneOverTwoRepeaterTop
@@ -406,6 +405,7 @@ Item {
406 layoutDirection: Qt.RightToLeft
405 layoutDirection: Qt.RightToLeft
407
406
408 SwipeToAct {
407 SwipeToAct {
408+ id: notifySwipeButton
409 objectName: "notify_swipe_button"
409 objectName: "notify_swipe_button"
410 visible: notification.hints["x-canonical-snap-decisions-swipe"] === "true"
410 visible: notification.hints["x-canonical-snap-decisions-swipe"] === "true"
411 leftIconName: "call-end"
411 leftIconName: "call-end"
@@ -424,7 +424,6 @@ Item {
424 Repeater {
424 Repeater {
425 id: actionRepeater
425 id: actionRepeater
426 model: notification.actions
426 model: notification.actions
427− visible: notification.hints["x-canonical-snap-decisions-swipe"] !== "true"
428 delegate: Loader {
427 delegate: Loader {
429 id: loader
428 id: loader
430
429
@@ -437,6 +436,7 @@ Item {
437 Button {
436 Button {
438 objectName: "notify_button" + index
437 objectName: "notify_button" + index
439 width: buttonRow.width / 2 - spacing * 2
438 width: buttonRow.width / 2 - spacing * 2
439+ visible: !notifySwipeButton.visible
440 text: loader.actionLabel
440 text: loader.actionLabel
441 color: {
441 color: {
442 var result = sdDarkGrey;
442 var result = sdDarkGrey;
@@ -472,7 +472,7 @@ Item {
472 onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
472 onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
473 expanded: false
473 expanded: false
474 expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
474 expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
475− comboList: Flickables.Flickable {
475+ comboList: Flickable {
476 // this has to be wrapped inside a flickable
476 // this has to be wrapped inside a flickable
477 // to work around a feature/bug? of the
477 // to work around a feature/bug? of the
478 // ComboButton SDK-element, making a regular
478 // ComboButton SDK-element, making a regular