git.iko.soy/unity8
on xenial help sign in
Further fixes from MP-comments.
100f300Mirco Müller
qml/Notifications/Notification.qml+4−5
compare with xenial
unifiedsplit
@@ -341,14 +341,13 @@ Item {
341 // to work around a feature/bug? of the
341 // to work around a feature/bug? of the
342 // ComboButton SDK-element, making a regular
342 // ComboButton SDK-element, making a regular
343 // unwrapped Column item flickable
343 // unwrapped Column item flickable
344+ // see LP: #1332590
344 interactive: false
345 interactive: false
345 Column {
346 Column {
346 Repeater {
347 Repeater {
347 id: comboRepeater
348 id: comboRepeater
348
349
349− Component.onCompleted: {
350+ onVisibleChanged: {
350− // an assignment is ok here, since this
351− // label is static and does not change
352 comboButton.text = comboRepeater.itemAt(2).actionLabel
351 comboButton.text = comboRepeater.itemAt(2).actionLabel
353 }
352 }
354
353
@@ -370,12 +369,12 @@ Item {
370 width: comboButton.width
369 width: comboButton.width
371 height: comboIcon.height + units.gu(2)
370 height: comboIcon.height + units.gu(2)
372
371
373− function getComboIcon (str) {
372+ function getComboIcon(str) {
374 var result = str.split(":")
373 var result = str.split(":")
375 return result[0]
374 return result[0]
376 }
375 }
377
376
378− function getComboLabel (str) {
377+ function getComboLabel(str) {
379 var result = str.split(":")
378 var result = str.split(":")
380 return result[1]
379 return result[1]
381 }
380 }