git.iko.soy/unity8
on xenial help sign in
Implemented special 1over2 buttons layout-case in snap-decisions for design-requirement of e.g. event-reminder notification.
2a3e96cMirco Müller
qml/Notifications/Notification.qml+70−2
compare with xenial
unifiedsplit
@@ -317,6 +317,74 @@ Item {
317 }
317 }
318 }
318 }
319
319
320+ Column {
321+ id: oneOverTwoCase
322+
323+ anchors {
324+ left: parent.left
325+ right: parent.right
326+ margins: contentSpacing
327+ }
328+
329+ spacing: contentSpacing
330+
331+ visible: notification.type == Notification.SnapDecision && oneOverTwoRepeaterTop.count == 3
332+
333+ Repeater {
334+ id: oneOverTwoRepeaterTop
335+
336+ model: notification.actions
337+ delegate: Loader {
338+ id: oneOverTwoLoaderTop
339+
340+ property string actionId: id
341+ property string actionLabel: label
342+
343+ Component {
344+ id: oneOverTwoButtonTop
345+
346+ Button {
347+ objectName: "button" + index
348+ width: oneOverTwoCase.width
349+ text: oneOverTwoLoaderTop.actionLabel
350+ color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? green : sdDarkGrey
351+ onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
352+ }
353+ }
354+ sourceComponent: index == 0 ? oneOverTwoButtonTop : undefined
355+ }
356+ }
357+
358+ Row {
359+ spacing: contentSpacing
360+
361+ Repeater {
362+ id: oneOverTwoRepeaterBottom
363+
364+ model: notification.actions
365+ delegate: Loader {
366+ id: oneOverTwoLoaderBottom
367+
368+ property string actionId: id
369+ property string actionLabel: label
370+
371+ Component {
372+ id: oneOverTwoButtonBottom
373+
374+ Button {
375+ objectName: "button" + index
376+ width: oneOverTwoCase.width / 2 - spacing * 2
377+ text: oneOverTwoLoaderBottom.actionLabel
378+ color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? red : sdDarkGrey
379+ onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
380+ }
381+ }
382+ sourceComponent: (index == 1 || index == 2) ? oneOverTwoButtonBottom : undefined
383+ }
384+ }
385+ }
386+ }
387+
320 Row {
388 Row {
321 id: buttonRow
389 id: buttonRow
322
390
@@ -326,7 +394,7 @@ Item {
326 right: parent.right
394 right: parent.right
327 margins: contentSpacing
395 margins: contentSpacing
328 }
396 }
329− visible: notification.type == Notification.SnapDecision && actionRepeater.count > 0
397+ visible: notification.type == Notification.SnapDecision && actionRepeater.count > 0 && !oneOverTwoCase.visible
330 spacing: units.gu(2)
398 spacing: units.gu(2)
331 layoutDirection: Qt.RightToLeft
399 layoutDirection: Qt.RightToLeft
332
400
@@ -376,7 +444,7 @@ Item {
376 margins: contentSpacing
444 margins: contentSpacing
377 }
445 }
378
446
379− visible: notification.type == Notification.SnapDecision && actionRepeater.count > 3
447+ visible: notification.type == Notification.SnapDecision && actionRepeater.count > 3 && !oneOverTwoCase.visible
380 color: sdDarkGrey
448 color: sdDarkGrey
381 onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
449 onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
382 expanded: false
450 expanded: false