ErikReider/SwayNotificationCenter
1
1
Fork 0
mirror of https://github.com/ErikReider/SwayNotificationCenter.git synced 2024-11-25 06:27:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary NotiWindow class

Browse Source
This commit is contained in:
Erik Reider 2022-06-14 11:19:38 +02:00
parent b84a24a632
commit 350f7a9beb
2 changed files with 8 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/notiDaemon/notiDaemon.vala
View File

@ -7,7 +7,7 @@ namespace SwayNotificationCenter {
new HashTable<string, uint32> (str_hash, str_equal);
public ControlCenter control_center;
public NotiWindow noti_window;
public NotificationWindow noti_window;
public NotiDaemon (SwayncDaemon swaync_daemon) {
this.notify["dnd"].connect (() => on_dnd_toggle (dnd));
@ -19,7 +19,7 @@ namespace SwayNotificationCenter {
BindingFlags.BIDIRECTIONAL
| BindingFlags.SYNC_CREATE);
this.noti_window = new NotiWindow ();
this.noti_window = new NotificationWindow ();
this.control_center = new ControlCenter (swaync_daemon, this);
}

49
src/notiWindow/notiWindow.vala
View File

@ -1,41 +1,6 @@
namespace SwayNotificationCenter {
public class NotiWindow {
private NotificationWindow notis = new NotificationWindow ();
private unowned NotificationWindow notificationWindow {
get {
if (!notis.get_realized () || notis.closed) {
notis = new NotificationWindow ();
}
return notis;
}
}
public void change_visibility (bool value) {
notificationWindow.change_visibility (value);
}
public void close_all_notifications () {
notificationWindow.close_all_notifications ();
}
public void add_notification (NotifyParams param,
NotiDaemon noti_daemon) {
notificationWindow.add_notification (param, noti_daemon);
}
public void close_notification (uint32 id) {
notificationWindow.close_notification (id);
}
public uint32 ? get_latest_notification () {
if (!notis.get_realized () || notis.closed) return null;
return notificationWindow.get_latest_notification ();
}
}
[GtkTemplate (ui = "/org/erikreider/sway-notification-center/notiWindow/notiWindow.ui")]
private class NotificationWindow : Gtk.ApplicationWindow {
public class NotificationWindow : Gtk.ApplicationWindow {
[GtkChild]
unowned Gtk.ScrolledWindow scrolled_window;
@ -48,8 +13,6 @@ namespace SwayNotificationCenter {
private double last_upper = 0;
public bool closed = false;
private const int MAX_HEIGHT = 600;
public NotificationWindow () {
@ -151,10 +114,7 @@ namespace SwayNotificationCenter {
}
if (!this.get_realized ()) return;
if (box.get_children ().length () == 0) {
this.closed = true;
this.close ();
}
if (box.get_children ().length () == 0) this.hide ();
}
public void add_notification (NotifyParams param,
@ -171,7 +131,10 @@ namespace SwayNotificationCenter {
box.pack_end (noti);
}
this.grab_focus ();
this.show ();
if (!this.get_mapped () || !this.get_realized ()) {
this.set_anchor ();
this.show ();
}
// IMPORTANT: queue a resize event to force the layout to be recomputed
noti.queue_resize ();