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

Fixed notification overlays over each other

Browse Source
This commit is contained in:
Erik Reider
2021-12-21 20:11:22 +01:00
parent f0c39187b9
commit f7096fbdb8
3 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/notiDaemon/notiDaemon.vala
View File

@@ -6,14 +6,16 @@ namespace SwayNotificatonCenter {
private bool dnd = false;
private DBusInit dbusInit;
private NotiWindow notiWindow;
public NotiDaemon (DBusInit dbusInit) {
this.dbusInit = dbusInit;
this.notiWindow = new NotiWindow (this.dbusInit);
}
public void set_noti_window_visibility (bool value)
throws DBusError, IOError {
NotiWindow.instance (dbusInit).change_visibility (value);
notiWindow.change_visibility (value);
}
public uint32 Notify (string app_name,
@@ -40,14 +42,13 @@ namespace SwayNotificatonCenter {
expire_timeout);
if (id == replaces_id) {
NotiWindow.instance (dbusInit).close_notification (id);
notiWindow.close_notification (id);
dbusInit.ccDaemon.close_notification (id);
}
if (!dbusInit.ccDaemon.get_visibility ()) {
if (param.urgency == UrgencyLevels.CRITICAL ||
(!dnd && param.urgency != UrgencyLevels.CRITICAL)) {
NotiWindow.instance (dbusInit)
.add_notification (param, this);
notiWindow.add_notification (param, this);
}
}
dbusInit.ccDaemon.add_notification (param);
@@ -72,17 +73,17 @@ namespace SwayNotificatonCenter {
public void click_close_notification (uint32 id)
throws DBusError, IOError {
NotiWindow.instance (dbusInit).close_notification (id);
notiWindow.close_notification (id);
dbusInit.ccDaemon.close_notification (id);
NotificationClosed (id, ClosedReasons.DISMISSED);
}
public void close_all_notifications () throws DBusError, IOError {
NotiWindow.instance (dbusInit).close_all_notifications ();
notiWindow.close_all_notifications ();
}
public void CloseNotification (uint32 id) throws DBusError, IOError {
NotiWindow.instance (dbusInit).close_notification (id);
notiWindow.close_notification (id);
dbusInit.ccDaemon.close_notification (id);
NotificationClosed (id, ClosedReasons.CLOSED_BY_CLOSENOTIFICATION);
}

3
src/notiWindow/notiWindow.ui
View File

@@ -2,8 +2,9 @@
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<template class="SwayNotificatonCenterNotiWindow" parent="GtkApplicationWindow">
<template class="SwayNotificatonCenterNotificationWindow" parent="GtkApplicationWindow">
<property name="can-focus">False</property>
<property name="role">NotificationWindow</property>
<property name="resizable">False</property>
<property name="default-width">500</property>
<property name="type-hint">notification</property>

71
src/notiWindow/notiWindow.vala
View File

@@ -1,28 +1,50 @@
namespace SwayNotificatonCenter {
[GtkTemplate (ui = "/org/erikreider/sway-notification-center/notiWindow/notiWindow.ui")]
public class NotiWindow : Gtk.ApplicationWindow {
public class NotiWindow {
private DBusInit dbusInit;
private NotificationWindow notis = new NotificationWindow ();
private static NotiWindow _noti_window = null;
public static NotiWindow instance (DBusInit dbusInit) {
if (_noti_window == null) _noti_window = new NotiWindow (dbusInit);
return _noti_window;
private unowned NotificationWindow notificationWindow {
get {
if (!notis.get_realized ()) notis = new NotificationWindow ();
return notis;
}
}
public NotiWindow (DBusInit dbusInit) {
this.dbusInit = dbusInit;
}
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 notiDaemon) {
notificationWindow.add_notification (param, notiDaemon);
}
public void close_notification (uint32 id) {
notificationWindow.close_notification (id);
}
}
[GtkTemplate (ui = "/org/erikreider/sway-notification-center/notiWindow/notiWindow.ui")]
private class NotificationWindow : Gtk.ApplicationWindow {
[GtkChild]
unowned Gtk.Viewport viewport;
[GtkChild]
unowned Gtk.Box box;
private DBusInit dbusInit;
private bool list_reverse = false;
private double last_upper = 0;
private NotiWindow (DBusInit dbusInit) {
this.dbusInit = dbusInit;
public NotificationWindow () {
GtkLayerShell.init_for_window (this);
GtkLayerShell.set_layer (this, GtkLayerShell.Layer.OVERLAY);
this.set_anchor ();
@@ -42,7 +64,7 @@ namespace SwayNotificatonCenter {
this, GtkLayerShell.Edge.RIGHT, false);
GtkLayerShell.set_anchor (
this, GtkLayerShell.Edge.LEFT, false);
break;
break;
default:
GtkLayerShell.set_anchor (
this, GtkLayerShell.Edge.LEFT, false);
@@ -84,7 +106,6 @@ namespace SwayNotificatonCenter {
}
public void change_visibility (bool value) {
this.set_visible (value);
if (!value) {
close_all_notifications ();
} else {
@@ -93,26 +114,20 @@ namespace SwayNotificatonCenter {
}
public void close_all_notifications () {
if (!this.get_realized ()) return;
foreach (var w in box.get_children ()) {
var noti = (Notification) w;
if (noti != null) remove_notification (noti);
remove_notification ((Notification) w);
}
}
private void remove_notification (Notification noti) {
if (_noti_window == null) return;
if (box.get_children ().index (noti) >= 0) {
if (noti != null) box.remove (noti);
}
if (box.get_children ().length () == 0) {
// Hack to close and recreate the window
// Fixes notifications enter_notify_event still being active
// when closed
this.close ();
this.destroy ();
this.dispose ();
_noti_window = null;
// Remove notification
if (noti != null) {
noti.destroy ();
}
if (!this.get_realized ()) return;
if (box.get_children ().length () == 0) this.close ();
}
public void add_notification (NotifyParams param,