callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

messagedialog: don't use gtk_widget_override_font()

Browse Source 
Instead of overriding the font theme settings, just set the Pango
attributes we want on the label. This fixes message dialogs growing on
style_update after recent GTK+ changes.
This commit is contained in:
Cosimo Cecchi 2012-04-18 13:46:39 -04:00
parent 8febbcaf6a
commit eea0cb3a68
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtkmessagedialog.c
View File

@ -384,25 +384,27 @@ static void
setup_primary_label_font (GtkMessageDialog *dialog) setup_primary_label_font (GtkMessageDialog *dialog)
{ {
GtkMessageDialogPrivate *priv = dialog->priv; GtkMessageDialogPrivate *priv = dialog->priv;
gint size;
PangoFontDescription *font_desc;
GtkStyleContext *context;
GtkStateFlags state;
/* unset the font settings */
gtk_widget_override_font (priv->label, NULL);
if (priv->has_secondary_text && !priv->has_primary_markup) if (priv->has_secondary_text && !priv->has_primary_markup)
{ {
context = gtk_widget_get_style_context (priv->label); PangoAttrList *attributes;
state = gtk_widget_get_state_flags (priv->label); PangoAttribute *attr;
size = pango_font_description_get_size (gtk_style_context_get_font (context, state)); attributes = pango_attr_list_new ();
font_desc = pango_font_description_new ();
pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD); attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
pango_font_description_set_size (font_desc, size * PANGO_SCALE_LARGE); pango_attr_list_insert (attributes, attr);
gtk_widget_override_font (priv->label, font_desc);
pango_font_description_free (font_desc); attr = pango_attr_scale_new (PANGO_SCALE_LARGE);
pango_attr_list_insert (attributes, attr);
gtk_label_set_attributes (GTK_LABEL (priv->label), attributes);
pango_attr_list_unref (attributes);
}
else
{
/* unset the font settings */
gtk_label_set_attributes (GTK_LABEL (priv->label), NULL);
} }
} }
@ -1007,7 +1009,5 @@ gtk_message_dialog_style_updated (GtkWidget *widget)
MAX (0, border_width - 7)); MAX (0, border_width - 7));
} }
setup_primary_label_font (dialog);
GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_updated (widget); GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_updated (widget);
} }