AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

tooltip: Don't play games with max-width-chars

Browse Source 
Setting max-width-chars to the number of characters
in the string works ok only as long as the average
char width we get from Pango matches reality. Sadly
that seems not always the case, and this code was
causing short Chinese tooltips to always be broken
into two lines.

Fixes: #4470
This commit is contained in:
Matthias Clasen 2023-01-28 13:04:01 -05:00
parent 56c1c4152f
commit dce21f06dd
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/gtktooltipwindow.c
View File

@ -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);
}

1
gtk/ui/gtktooltipwindow.ui
View File

@ -14,6 +14,7 @@
<child>
<object class="GtkLabel" id="label">
<property name="wrap">1</property>
<property name="max-width-chars">50</property>
</object>
</child>
</object>