diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-06-04 21:13:19 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-06-04 21:18:09 +0200 |
| commit | c6285387e3b8b839df377b32c4b4d1210d3afb29 (patch) | |
| tree | 919f33e729664258cc4786f83209b9da9c12997b /gtk/gtkwidget.c | |
| parent | 0ba14bb2567ddc97757aac3f7c06413d44cc26ea (diff) | |
| download | gtk+-c6285387e3b8b839df377b32c4b4d1210d3afb29.tar.gz | |
widget: Update the font at the right place
Doing it unconditionally is not useful when the subclasses actually
using them can only ever do it in the style_updated signal. So do it in
the style_updated handler instead.
Diffstat (limited to 'gtk/gtkwidget.c')
| -rw-r--r-- | gtk/gtkwidget.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 340dd9ef00..95079d9015 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -6495,6 +6495,8 @@ gtk_widget_real_style_updated (GtkWidget *widget) { GtkWidgetPrivate *priv = widget->priv; + gtk_widget_update_pango_context (widget); + if (priv->style != NULL && priv->style != gtk_widget_get_default_style ()) { @@ -14330,8 +14332,6 @@ style_context_changed (GtkStyleContext *context, { GtkWidget *widget = user_data; - gtk_widget_update_pango_context (widget); - if (gtk_widget_get_realized (widget)) g_signal_emit (widget, widget_signals[STYLE_UPDATED], 0); else |