git.iko.soy/unity8
on xenial help sign in
fix a race condition
2ed301aLukáš Tinkl
qml/Notifications/Notification.qml+7−5
compare with xenial
unifiedsplit
@@ -119,6 +119,12 @@ StyledItem {
119 }
119 }
120 }
120 }
121
121
122+ onFullscreenChanged: {
123+ if (fullscreen) {
124+ notification.notification.urgency = Notification.Critical;
125+ }
126+ }
127+
122 Behavior on height {
128 Behavior on height {
123 UbuntuNumberAnimation {
129 UbuntuNumberAnimation {
124 duration: UbuntuAnimation.SnapDuration
130 duration: UbuntuAnimation.SnapDuration
@@ -386,7 +392,7 @@ StyledItem {
386 objectName: "dialogListView"
392 objectName: "dialogListView"
387 spacing: notification.margins
393 spacing: notification.margins
388
394
389− visible: count > 0 && notification.expanded
395+ visible: count > 0 && (notification.expanded || notification.fullscreen)
390
396
391 anchors {
397 anchors {
392 left: parent.left
398 left: parent.left
@@ -414,10 +420,6 @@ StyledItem {
414
420
415 onLoaded: {
421 onLoaded: {
416 notification.fullscreen = Qt.binding(function() { return fullscreen; });
422 notification.fullscreen = Qt.binding(function() { return fullscreen; });
417− if (notification.fullscreen) {
418− notification.notification.urgency = Notification.Critical;
419− ListView.view.currentIndex = index;
420− }
421 }
423 }
422 onAccepted: {
424 onAccepted: {
423 notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
425 notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
qml/Notifications/Notifications.qml−2
@@ -77,8 +77,6 @@ ListView {
77 function updateListTopMostIsFullscreen() {
77 function updateListTopMostIsFullscreen() {
78 if (fullscreen) { // effectively hide any non-fullscreen snaps
78 if (fullscreen) { // effectively hide any non-fullscreen snaps
79 notificationList.positionViewAtIndex(index, ListView.Beginning);
79 notificationList.positionViewAtIndex(index, ListView.Beginning);
80− } else {
81− notificationList.positionViewAtBeginning();
82 }
80 }
83 // index 1 because 0 is the PlaceHolder...
81 // index 1 because 0 is the PlaceHolder...
84 if (index == 1) {
82 if (index == 1) {