From e6d2655e1e7d313ff7bc7917ef91945ec257caaa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 3 Sep 2011 23:59:40 -0400 Subject: [PATCH] GtkLabel: make patterns work a little better 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 --- gtk/gtklabel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 202ee549ee..c47de5924f 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -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);