ErikReider/SwayNotificationCenter
1
1
Fork 0
mirror of https://github.com/ErikReider/SwayNotificationCenter.git synced 2024-11-29 05:36:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ellipsize and wrap notification body (#37)

Browse Source 
* Ellipsize and wrap notification body

* Implement hack around clipped notification in notification window

* Removed lines hack

* Manually set scrolled window properties

Co-authored-by: Erik Reider <35975961+ErikReider@users.noreply.github.com>
This commit is contained in:
Nicolas Berbiche 2022-05-06 05:29:07 -04:00 committed by GitHub
parent debfb696cd
commit 312a69dd69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/notiWindow/notiWindow.ui
View File

@ -20,7 +20,6 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="hscrollbar-policy">never</property> <property name="hscrollbar-policy">never</property>
<property name="window-placement">top-right</property> <property name="window-placement">top-right</property>
<property name="max-content-height">600</property>
<property name="propagate-natural-height">True</property> <property name="propagate-natural-height">True</property>
<child> <child>
<object class="GtkViewport" id="viewport"> <object class="GtkViewport" id="viewport">

13
src/notiWindow/notiWindow.vala
View File

@ -37,6 +37,8 @@ namespace SwayNotificationCenter {
[GtkTemplate (ui = "/org/erikreider/sway-notification-center/notiWindow/notiWindow.ui")] [GtkTemplate (ui = "/org/erikreider/sway-notification-center/notiWindow/notiWindow.ui")]
private class NotificationWindow : Gtk.ApplicationWindow { private class NotificationWindow : Gtk.ApplicationWindow {
[GtkChild]
unowned Gtk.ScrolledWindow scrolled_window;
[GtkChild] [GtkChild]
unowned Gtk.Viewport viewport; unowned Gtk.Viewport viewport;
[GtkChild] [GtkChild]
@ -48,6 +50,8 @@ namespace SwayNotificationCenter {
public bool closed = false; public bool closed = false;
private const int MAX_HEIGHT = 600;
public NotificationWindow () { public NotificationWindow () {
if (!GtkLayerShell.is_supported ()) { if (!GtkLayerShell.is_supported ()) {
stderr.printf ("GTKLAYERSHELL IS NOT SUPPORTED!\n"); stderr.printf ("GTKLAYERSHELL IS NOT SUPPORTED!\n");
@ -59,6 +63,12 @@ namespace SwayNotificationCenter {
GtkLayerShell.init_for_window (this); GtkLayerShell.init_for_window (this);
GtkLayerShell.set_layer (this, GtkLayerShell.Layer.OVERLAY); GtkLayerShell.set_layer (this, GtkLayerShell.Layer.OVERLAY);
this.set_anchor (); this.set_anchor ();
// -1 should set it to the content size unless it exceeds max_height
scrolled_window.set_min_content_height (-1);
scrolled_window.set_max_content_height (MAX_HEIGHT);
scrolled_window.set_propagate_natural_height (true);
viewport.size_allocate.connect (size_alloc); viewport.size_allocate.connect (size_alloc);
this.default_width = ConfigModel.instance.notification_window_width; this.default_width = ConfigModel.instance.notification_window_width;
@ -162,6 +172,9 @@ namespace SwayNotificationCenter {
} }
this.grab_focus (); this.grab_focus ();
this.show (); this.show ();
// IMPORTANT: queue a resize event to force the layout to be recomputed
noti.queue_resize ();
scroll_to_start (list_reverse); scroll_to_start (list_reverse);
} }

22
src/notification/notification.vala
View File

@ -41,6 +41,7 @@ namespace SwayNotificationCenter {
private uint timeout_id = 0; private uint timeout_id = 0;
private int number_of_body_lines = 10;
public bool is_timed = false; public bool is_timed = false;
public NotifyParams param; public NotifyParams param;
private NotiDaemon noti_daemon; private NotiDaemon noti_daemon;
@ -81,8 +82,21 @@ namespace SwayNotificationCenter {
this.timeout_delay = timeout; this.timeout_delay = timeout;
this.timeout_low_delay = timeout_low; this.timeout_low_delay = timeout_low;
this.timeout_critical_delay = timeout_critical; this.timeout_critical_delay = timeout_critical;
this.number_of_body_lines = 5;
build_noti (param, noti_daemon); build_noti (param, noti_daemon);
add_noti_timeout (); add_noti_timeout ();
this.size_allocate.connect (on_size_allocation);
}
private void on_size_allocation (Gtk.Allocation _ignored) {
// Force recomputing the allocated size of the wrapped GTK label in the body.
// `queue_resize` alone DOES NOT WORK because it does not properly invalidate
// the cache, this is a GTK bug!
// See https://gitlab.gnome.org/GNOME/gtk/-/issues/2556
if (body != null) {
body.set_size_request (-1, body.get_allocated_height ());
}
} }
private void build_noti (NotifyParams param, NotiDaemon noti_daemon) { private void build_noti (NotifyParams param, NotiDaemon noti_daemon) {
@ -91,7 +105,13 @@ namespace SwayNotificationCenter {
this.noti_daemon = noti_daemon; this.noti_daemon = noti_daemon;
this.param = param; this.param = param;
this.body.set_line_wrap (true);
this.body.set_line_wrap_mode (Pango.WrapMode.WORD_CHAR);
this.body.set_ellipsize (Pango.EllipsizeMode.END);
this.summary.set_line_wrap (false);
this.summary.set_text (param.summary ?? param.app_name); this.summary.set_text (param.summary ?? param.app_name);
this.summary.set_ellipsize (Pango.EllipsizeMode.END);
this.button_press_event.connect ((event) => { this.button_press_event.connect ((event) => {
if (event.button != Gdk.BUTTON_SECONDARY) return false; if (event.button != Gdk.BUTTON_SECONDARY) return false;
@ -173,6 +193,8 @@ namespace SwayNotificationCenter {
private void set_body () { private void set_body () {
string text = param.body ?? ""; string text = param.body ?? "";
this.body.set_lines (this.number_of_body_lines);
// Removes all image tags and adds them to an array // Removes all image tags and adds them to an array
if (text.length > 0) { if (text.length > 0) {
try { try {