on xenial help sign in
more fixes for fullscreen stuff
5592a07Lukáš Tinkl
qml/Notifications/Notification.qml+2−8
@@ -98,13 +98,6 @@ StyledItem {
98 }
98 }
99 }
99 }
100
100
101− Binding {
102− target: ListView.view
103− property: "topmostIsFullscreen"
104− value: fullscreen
105− when: index == 0
106− }
107−
108 function closeNotification() {
101 function closeNotification() {
109 if (index === ListView.view.currentIndex) { // reset to get the 1st snap decision expanded
102 if (index === ListView.view.currentIndex) { // reset to get the 1st snap decision expanded
110 ListView.view.currentIndex = -1;
103 ListView.view.currentIndex = -1;
@@ -130,6 +123,7 @@ StyledItem {
130 if (fullscreen) {
123 if (fullscreen) {
131 notification.notification.urgency = Notification.Critical;
124 notification.notification.urgency = Notification.Critical;
132 }
125 }
126+ ListView.view.topmostIsFullscreen = fullscreen;
133 }
127 }
134
128
135 Behavior on implicitHeight {
129 Behavior on implicitHeight {
@@ -227,7 +221,7 @@ StyledItem {
227 if (notification.type === Notification.Interactive) {
221 if (notification.type === Notification.Interactive) {
228 notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
222 notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
229 } else {
223 } else {
230− notificationList.currentIndex = index;
224+ notification.ListView.view.currentIndex = index;
231 }
225 }
232 }
226 }
233 onReleased: {
227 onReleased: {
qml/Notifications/Notifications.qml+7
@@ -65,6 +65,13 @@ ListView {
65 hasMouse: notificationList.hasMouse
65 hasMouse: notificationList.hasMouse
66 background: notificationList.background
66 background: notificationList.background
67
67
68+ Component.onCompleted: topmostIsFullscreen = false; // async, the factory loader will set fullscreen to true later
69+
70+ property int theIndex: index
71+ onTheIndexChanged: {
72+ ListView.view.topmostIsFullscreen = fullscreen; // when we get pushed down by e.g. volume notification
73+ }
74+
68 // make sure there's no opacity-difference between the several
75 // make sure there's no opacity-difference between the several
69 // elements in a notification
76 // elements in a notification
70 // FIXME: disabled all transitions because of LP: #1354406 workaround
77 // FIXME: disabled all transitions because of LP: #1354406 workaround