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

Compress all ::style-updated prior to ::realize

Browse Source 
This is done to avoid early emission of this signal, that was
causing warnings during GtkDialog construction.
This commit is contained in:
Carlos Garnacho 2011-01-04 01:59:23 +01:00
parent 7981869308
commit dd8887c07d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkwidget.c
View File

@ -312,7 +312,7 @@ struct _GtkWidgetPrivate
guint has_grab : 1;
guint shadowed : 1;
guint rc_style : 1;
guint user_style : 1;
guint style_update_pending : 1;
guint app_paintable : 1;
guint double_buffered : 1;
guint redraw_on_alloc : 1;
@ -4266,6 +4266,9 @@ gtk_widget_realize (GtkWidget *widget)
gtk_widget_ensure_style (widget);
if (priv->style_update_pending)
g_signal_emit (widget, widget_signals[STYLE_UPDATED], 0);
g_signal_emit (widget, widget_signals[REALIZE], 0);
gtk_widget_real_set_has_tooltip (widget,
@ -13941,7 +13944,16 @@ style_context_changed (GtkStyleContext *context,
GtkWidget *widget = user_data;
gtk_widget_update_pango_context (widget);
g_signal_emit (widget, widget_signals[STYLE_UPDATED], 0);
if (gtk_widget_get_realized (widget))
g_signal_emit (widget, widget_signals[STYLE_UPDATED], 0);
else
{
/* Compress all style updates so it
* is only emitted once pre-realize.
*/
widget->priv->style_update_pending = TRUE;
}
if (widget->priv->anchored)
gtk_widget_queue_resize (widget);