git.iko.soy/unity8
on xenial help sign in
Made notification qml-test pass again. Added FIXME-remarks regarding currently used workaround for LP: #1354406. Avoid some QWARNs.
commit8eba0b8efda5e007189faf63d9fd037b86371b55 authorMirco Müller <mirco.mueller@ubuntu.com> dateThu 21 Aug 2014, 10:04 (12 years ago) parent3e0d35c
2 files changed+7−4
compare with xenial
unifiedsplit
qml/Notifications/Notification.qml+4−3 qml/Notifications/Notifications.qml+3−1
qml/Notifications/Notification.qml+4−3
@@ -52,7 +52,7 @@ Item {
5252 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
5353
5454 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
55− opacity: 1
55+ opacity: 1 // FIXME: 1 because of LP: #1354406 workaround, has to be 0 really
5656
5757 state: {
5858 var result = "";
@@ -82,7 +82,8 @@ Item {
8282 source: hints["suppress-sound"] != "true" && hints["sound-file"] != undefined ? hints["sound-file"] : ""
8383 }
8484
85− onOpacityChanged: {
85+ // FIXME: using onCompleted because of LP: #1354406 workaround, has to be onOpacityChanged really
86+ Component.onCompleted: {
8687 if (opacity == 1.0 && hints["suppress-sound"] != "true" && sound.source) {
8788 sound.play();
8889 }
@@ -380,7 +381,7 @@ Item {
380381 id: comboRepeater
381382
382383 onVisibleChanged: {
383− comboButton.text = comboRepeater.itemAt(2).actionLabel
384+ comboButton.text = comboRepeater.count >= 3 ? comboRepeater.itemAt(2).actionLabel : ""
384385 }
385386
386387 model: notification.actions
qml/Notifications/Notifications.qml+3−1
@@ -63,7 +63,8 @@ ListView {
6363
6464 // make sure there's no opacity-difference between the several
6565 // elements in a notification
66− layer.enabled: add.running || remove.running || populate.running
66+ // FIXME: disabled all transitions because of LP: #1354406 workaround
67+ //layer.enabled: add.running || remove.running || populate.running
6768
6869 Component.onCompleted: {
6970 if (index == 1) {
@@ -79,6 +80,7 @@ ListView {
7980 }
8081 }
8182
83+ // FIXME: disabled all transitions because of LP: #1354406 workaround
8284 /*populate: Transition {
8385 UbuntuNumberAnimation {
8486 property: "opacity"