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

messageList: Add grouped notifications to MessageView

Browse Source 
This makes use of the NotificationMessageGroup widget introduced in the
previous commit to add notifications to the MessageView.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3012>
This commit is contained in:
Julian Sparber 2025-02-03 18:33:19 +01:00 committed by Marge Bot
parent 219cd88c82
commit dae4179b3d
1 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
js/ui/messageList.js
View File

@ -1029,6 +1029,9 @@ export const MessageView = GObject.registerClass({
}, class MessageView extends St.BoxLayout { }, class MessageView extends St.BoxLayout {
messages = []; messages = [];
_notificationSourceToGroup = new Map();
_nUrgent = 0;
_playerToMessage = new Map(); _playerToMessage = new Map();
_mediaSource = new Mpris.MprisSource(); _mediaSource = new Mpris.MprisSource();
@ -1041,6 +1044,7 @@ export const MessageView = GObject.registerClass({
}); });
this._setupMpris(); this._setupMpris();
this._setupNotifications();
} }
get empty() { get empty() {
@ -1212,4 +1216,54 @@ export const MessageView = GObject.registerClass({
this._removeMessage(message); this._removeMessage(message);
this._playerToMessage.delete(player); this._playerToMessage.delete(player);
} }
_setupNotifications() {
Main.messageTray.connectObject(
'source-added', (_, source) => this._addNotificationSource(source),
'source-removed', (_, source) => this._removeNotificationSource(source),
this);
Main.messageTray.getSources().forEach(source => {
this._addNotificationSource(source);
});
}
_addNotificationSource(source) {
const group = new NotificationMessageGroup(source);
this._notificationSourceToGroup.set(source, group);
group.connectObject(
'notify::focus-child', () => this._onKeyFocusIn(group.focusChild),
'notify::has-urgent', () => {
if (group.hasUrgent)
this._nUrgent++;
else
this._nUrgent--;
const index = this._playerToMessage.size + (group.hasUrgent ? 0 : this._nUrgent);
this._moveMessage(group, index);
},
'notification-added', () => {
const index = this._playerToMessage.size + (group.hasUrgent ? 0 : this._nUrgent);
this._moveMessage(group, index);
}, this);
if (group.hasUrgent)
this._nUrgent++;
const index = this._playerToMessage.size + (group.hasUrgent ? 0 : this._nUrgent);
this._addMessageAtIndex(group, index);
}
_removeNotificationSource(source) {
const group = this._notificationSourceToGroup.get(source);
this._removeMessage(group);
if (group.hasUrgent)
this._nUrgent--;
this._notificationSourceToGroup.delete(source);
}
}); });