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

Reset effective_attrs when necessary

Browse Source 
This fixes both bug 607217 and bug 607269.
This commit is contained in:
Matthias Clasen 2010-01-17 23:33:19 -05:00 committed by Tristan Van Berkom
parent 58956ad7e2
commit b5061249e7
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtklabel.c
View File

@ -1911,24 +1911,22 @@ gtk_label_recalculate (GtkLabel *label)
guint keyval = label->mnemonic_keyval; guint keyval = label->mnemonic_keyval;
if (label->use_markup) if (label->use_markup)
{ gtk_label_set_markup_internal (label, label->label, label->use_underline);
gtk_label_set_markup_internal (label, label->label, label->use_underline);
gtk_label_compose_effective_attrs (label);
}
else else
{ {
if (label->use_underline) if (label->use_underline)
{ gtk_label_set_uline_text_internal (label, label->label);
gtk_label_set_uline_text_internal (label, label->label);
gtk_label_compose_effective_attrs (label);
}
else else
{ {
gtk_label_set_text_internal (label, g_strdup (label->label)); if (label->effective_attrs)
gtk_label_compose_effective_attrs (label); pango_attr_list_unref (label->effective_attrs);
} label->effective_attrs = NULL;
gtk_label_set_text_internal (label, g_strdup (label->label));
}
} }
gtk_label_compose_effective_attrs (label);
if (!label->use_underline) if (!label->use_underline)
label->mnemonic_keyval = GDK_VoidSymbol; label->mnemonic_keyval = GDK_VoidSymbol;
@ -1995,7 +1993,7 @@ gtk_label_set_attributes (GtkLabel *label,
gtk_label_recalculate (label); gtk_label_recalculate (label);
gtk_label_clear_layout (label); gtk_label_clear_layout (label);
gtk_widget_queue_resize (GTK_WIDGET (label)); gtk_widget_queue_resize (GTK_WIDGET (label));
} }