diff options
author | Benjamin Otte <otte.benjamin@googlemail.com> | 2023-01-28 18:26:00 +0000 |
---|---|---|
committer | Benjamin Otte <otte.benjamin@googlemail.com> | 2023-01-28 18:26:00 +0000 |
commit | 034a8a550194c870540edb8e3d39f619781f9512 (patch) | |
tree | 958957c6687819b60b66fc1565f6221f77b269d2 | |
parent | 56c1c4152f41c625f09937ee60098e1a3dfe3ba4 (diff) | |
parent | 1e9dbf2df06c80d62645f705b9d5ad5c37b8695f (diff) | |
download | gtk+-034a8a550194c870540edb8e3d39f619781f9512.tar.gz |
Merge branch 'tooltip-size-simplification' into 'main'
tooltip: Don't play games with max-width-chars
Closes #4470 and #5521
See merge request GNOME/gtk!5455
-rw-r--r-- | gtk/gtktooltipwindow.c | 31 | ||||
-rw-r--r-- | gtk/ui/gtktooltipwindow.ui | 2 |
2 files changed, 4 insertions, 29 deletions
diff --git a/gtk/gtktooltipwindow.c b/gtk/gtktooltipwindow.c index 491598a1f5..a24bcb4157 100644 --- a/gtk/gtktooltipwindow.c +++ b/gtk/gtktooltipwindow.c @@ -401,36 +401,12 @@ gtk_tooltip_window_new (void) return g_object_new (GTK_TYPE_TOOLTIP_WINDOW, NULL); } -static void -update_label_width (GtkLabel *label) -{ - const char *text; - - text = gtk_label_get_text (label); - if (strchr (text, '\n')) - { - gtk_label_set_wrap (label, FALSE); - } - else - { - int len; - - len = g_utf8_strlen (text, -1); - - gtk_label_set_max_width_chars (label, MIN (len, 50)); - gtk_label_set_wrap (label, TRUE); - } -} - void gtk_tooltip_window_set_label_markup (GtkTooltipWindow *window, const char *markup) { if (markup != NULL) - { - gtk_label_set_markup (GTK_LABEL (window->label), markup); - update_label_width (GTK_LABEL (window->label)); - } + gtk_label_set_markup (GTK_LABEL (window->label), markup); gtk_widget_set_visible (window->label, markup != NULL); } @@ -440,10 +416,7 @@ gtk_tooltip_window_set_label_text (GtkTooltipWindow *window, const char *text) { if (text != NULL) - { - gtk_label_set_text (GTK_LABEL (window->label), text); - update_label_width (GTK_LABEL (window->label)); - } + gtk_label_set_text (GTK_LABEL (window->label), text); gtk_widget_set_visible (window->label, text != NULL); } diff --git a/gtk/ui/gtktooltipwindow.ui b/gtk/ui/gtktooltipwindow.ui index 127fa045e4..d0fc9bc1c6 100644 --- a/gtk/ui/gtktooltipwindow.ui +++ b/gtk/ui/gtktooltipwindow.ui @@ -13,7 +13,9 @@ </child> <child> <object class="GtkLabel" id="label"> + <property name="hexpand">1</property> <property name="wrap">1</property> + <property name="max-width-chars">50</property> </object> </child> </object> |