[Xfce4-commits] [apps/xfce4-notifyd] 01/01: Improve wrapping and ellipsizing of notification bubble (Bug #12674)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-notifyd.

commit addbc3e8340af75607ea774d7163d110820cf91d
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Mar 1 00:45:29 2018 +0100

    Improve wrapping and ellipsizing of notification bubble (Bug #12674)
    
    By setting the line-wrap and line-wrap-mode correctly, we can control the
    horizontal overflow better now and make the bubble vertically expand
    instead.
---
 xfce4-notifyd/xfce-notify-window.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c
index 83db269..c5b515e 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -258,11 +258,12 @@ xfce_notify_window_init(XfceNotifyWindow *window)
     gtk_widget_set_name (window->summary, "summary");
     gtk_label_set_max_width_chars (GTK_LABEL(window->summary), screen_width);
     gtk_label_set_ellipsize (GTK_LABEL (window->summary), PANGO_ELLIPSIZE_END);
-    gtk_label_set_line_wrap(GTK_LABEL(window->summary), TRUE);
+    gtk_label_set_line_wrap (GTK_LABEL(window->summary), TRUE);
+    gtk_label_set_line_wrap_mode (GTK_LABEL (window->body), PANGO_WRAP_WORD_CHAR);
+    gtk_label_set_lines (GTK_LABEL (window->body), 1);
+    gtk_widget_set_halign (window->summary, GTK_ALIGN_FILL);
 #if GTK_CHECK_VERSION (3, 16, 0)
     gtk_label_set_xalign (GTK_LABEL(window->summary), 0);
-#else
-    gtk_widget_set_halign (window->summary, GTK_ALIGN_START);
 #endif
     gtk_widget_set_valign (window->summary, GTK_ALIGN_BASELINE);
     gtk_box_pack_start(GTK_BOX(vbox), window->summary, TRUE, TRUE, 0);
@@ -271,11 +272,12 @@ xfce_notify_window_init(XfceNotifyWindow *window)
     gtk_widget_set_name (window->body, "body");
     gtk_label_set_max_width_chars (GTK_LABEL(window->body), screen_width);
     gtk_label_set_ellipsize (GTK_LABEL (window->body), PANGO_ELLIPSIZE_END);
-    gtk_label_set_line_wrap(GTK_LABEL(window->body), TRUE);
+    gtk_label_set_line_wrap (GTK_LABEL(window->body), TRUE);
+    gtk_label_set_line_wrap_mode (GTK_LABEL (window->body), PANGO_WRAP_WORD_CHAR);
+    gtk_label_set_lines (GTK_LABEL (window->body), 6);
+    gtk_widget_set_halign (window->body, GTK_ALIGN_FILL);
 #if GTK_CHECK_VERSION (3, 16, 0)
     gtk_label_set_xalign (GTK_LABEL(window->body), 0);
-#else
-    gtk_widget_set_halign (window->body, GTK_ALIGN_START);
 #endif
     gtk_widget_set_valign (window->body, GTK_ALIGN_BASELINE);
     gtk_box_pack_start(GTK_BOX(vbox), window->body, TRUE, TRUE, 0);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.