Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkLabel: make patterns work a little better

Browse Source 
When a pattern has been set, we must not throw away
the attributes that contain it.

https://bugzilla.gnome.org/show_bug.cgi?id=658111
https://bugzilla.gnome.org/show_bug.cgi?id=676550
This commit is contained in:
Matthias Clasen
2011-09-03 23:59:40 -04:00
committed by Daniel Boles
parent 491d79d540
commit e6d2655e1e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtklabel.c
View File

@@ -1861,17 +1861,17 @@ gtk_label_recalculate (GtkLabel *label)
if (label->use_markup)
gtk_label_set_markup_internal (label, label->label, label->use_underline);
else if (label->use_underline)
gtk_label_set_uline_text_internal (label, label->label);
else
{
if (label->use_underline)
gtk_label_set_uline_text_internal (label, label->label);
else
if (!label->pattern_set)
{
if (label->effective_attrs)
pango_attr_list_unref (label->effective_attrs);
label->effective_attrs = NULL;
gtk_label_set_text_internal (label, g_strdup (label->label));
}
gtk_label_set_text_internal (label, g_strdup (label->label));
}
gtk_label_compose_effective_attrs (label);