brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

messageTray: Let the tray decide whether to show a banner

Browse Source 
Always use the same code path to add new messages to a source, and
let the `MessageTray` decide whether it shows a banner.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3173>
This commit is contained in:
Julian Sparber
2024-02-12 12:29:35 +01:00
committed by Florian Müllner
parent 940b658071
commit 34f05b075b
13 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
js/ui/messageTray.js
View File

@ -590,7 +590,7 @@ export const Source = GObject.registerClass({
'destroy': {param_types: [GObject.TYPE_UINT]},
'notification-added': {param_types: [Notification.$gtype]},
'notification-removed': {param_types: [Notification.$gtype]},
'notification-show': {param_types: [Notification.$gtype]},
'notification-request-banner': {param_types: [Notification.$gtype]},
},
}, class Source extends MessageList.Source {
constructor(params) {
@ -647,7 +647,7 @@ export const Source = GObject.registerClass({
this.destroy();
}
pushNotification(notification) {
addNotification(notification) {
if (this.notifications.includes(notification))
return;
@ -655,22 +655,17 @@ export const Source = GObject.registerClass({
this.notifications.shift().destroy(NotificationDestroyedReason.EXPIRED);
notification.connect('destroy', this._onNotificationDestroy.bind(this));
notification.connect('notify::acknowledged', this.countUpdated.bind(this));
notification.connect('notify::acknowledged', () => {
this.countUpdated();
// If acknowledged was set to false try to show the notification again
if (!notification.acknowledged)
this.emit('notification-request-banner', notification);
});
this.notifications.push(notification);
this.emit('notification-added', notification);
this.countUpdated();
}
showNotification(notification) {
notification.acknowledged = false;
this.pushNotification(notification);
if (notification.urgency === Urgency.LOW)
return;
if (this.policy.showBanners || notification.urgency === Urgency.CRITICAL)
this.emit('notification-show', notification);
this.emit('notification-request-banner', notification);
}
destroy(reason) {
@ -876,7 +871,7 @@ export const MessageTray = GObject.registerClass({
this._sources.add(source);
source.connectObject(
'notification-show', this._onNotificationShow.bind(this),
'notification-request-banner', this._onNotificationRequestBanner.bind(this),
'notification-removed', this._onNotificationRemoved.bind(this),
'destroy', () => this._removeSource(source), this);
@ -923,7 +918,17 @@ export const MessageTray = GObject.registerClass({
}
}
_onNotificationShow(_source, notification) {
_onNotificationRequestBanner(_source, notification) {
// We never display a banner for already acknowledged notifications
if (notification.acknowledged)
return;
if (notification.urgency === Urgency.LOW)
return;
if (!notification.source.policy.showBanners && notification.urgency !== Urgency.CRITICAL)
return;
if (this._notification === notification) {
// If a notification that is being shown is updated, we update
// how it is shown and extend the time until it auto-hides.