colin/SwayNotificationCenter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor grouped notifications fixes

Browse Source
This commit is contained in:
Erik Reider
2023-12-14 16:50:45 +01:00
parent 86166a46b7
commit a6cf977e90
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/notificationGroup/notificationGroup.vala
View File

@@ -163,6 +163,23 @@ namespace SwayNotificationCenter {
} }
} }
private void set_icon () {
if (is_empty ()) return;
unowned Notification first = (Notification) group.widgets.first ().data;
unowned NotifyParams param = first.param;
// Get the app icon
Icon ? icon = null;
if (param.desktop_app_info != null
&& (icon = param.desktop_app_info.get_icon ()) != null) {
app_icon.set_from_gicon (icon, Gtk.IconSize.LARGE_TOOLBAR);
app_icon.show ();
} else {
app_icon.set_from_icon_name ("application-x-executable-symbolic",
Gtk.IconSize.LARGE_TOOLBAR);
}
}
/// Returns if there's more than one notification /// Returns if there's more than one notification
public bool only_single_notification () { public bool only_single_notification () {
unowned Gtk.Widget ? widget = group.widgets.nth_data (1); unowned Gtk.Widget ? widget = group.widgets.nth_data (1);
@@ -190,8 +207,12 @@ namespace SwayNotificationCenter {
} }
group.add (noti); group.add (noti);
if (!only_single_notification ()) { if (!only_single_notification ()) {
if (!group.is_expanded) {
group.set_sensitive (false); group.set_sensitive (false);
} }
} else {
set_icon ();
}
} }
public void remove_notification (Notification noti) { public void remove_notification (Notification noti) {
@@ -240,23 +261,7 @@ namespace SwayNotificationCenter {
} }
public void update () { public void update () {
if (!is_empty ()) { set_icon ();
unowned Notification first = (Notification) group.widgets.first ().data;
unowned NotifyParams param = first.param;
// Get the app icon
Icon ? icon = null;
if (param.desktop_app_info != null
&& (icon = param.desktop_app_info.get_icon ()) != null) {
app_icon.set_from_gicon (icon, Gtk.IconSize.LARGE_TOOLBAR);
app_icon.show ();
} else {
app_icon.set_from_icon_name ("application-x-executable-symbolic",
Gtk.IconSize.LARGE_TOOLBAR);
// app_icon.hide ();
}
} else {
// app_icon.hide ();
}
foreach (unowned Gtk.Widget widget in group.widgets) { foreach (unowned Gtk.Widget widget in group.widgets) {
var noti = (Notification) widget; var noti = (Notification) widget;
if (noti != null) noti.set_time (); if (noti != null) noti.set_time ();