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

widget: Don't go via path when resetting style

Browse Source 
Instead, invalidate the path when the style context changes. And
invalidate the style context directly.
This commit is contained in:
Benjamin Otte 2012-03-20 16:04:13 +01:00
parent d589566f40
commit 969daec353
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkwidget.c
View File

@ -8507,13 +8507,7 @@ _gtk_widget_propagate_screen_changed (GtkWidget *widget,
static void static void
reset_style_recurse (GtkWidget *widget, gpointer data) reset_style_recurse (GtkWidget *widget, gpointer data)
{ {
if (widget->priv->path) _gtk_widget_invalidate_style_context (widget, GTK_CSS_CHANGE_ANY);
{
gtk_widget_path_free (widget->priv->path);
widget->priv->path = NULL;
}
gtk_widget_get_path (widget);
if (GTK_IS_CONTAINER (widget)) if (GTK_IS_CONTAINER (widget))
gtk_container_forall (GTK_CONTAINER (widget), gtk_container_forall (GTK_CONTAINER (widget),
@ -14065,8 +14059,6 @@ gtk_widget_get_path (GtkWidget *widget)
gtk_widget_path_append_for_widget (widget->priv->path, widget); gtk_widget_path_append_for_widget (widget->priv->path, widget);
} }
_gtk_widget_invalidate_style_context (widget, GTK_CSS_CHANGE_ANY);
} }
return widget->priv->path; return widget->priv->path;
@ -14075,6 +14067,12 @@ gtk_widget_get_path (GtkWidget *widget)
void void
_gtk_widget_style_context_invalidated (GtkWidget *widget) _gtk_widget_style_context_invalidated (GtkWidget *widget)
{ {
if (widget->priv->path)
{
gtk_widget_path_free (widget->priv->path);
widget->priv->path = NULL;
}
if (gtk_widget_get_realized (widget)) if (gtk_widget_get_realized (widget))
g_signal_emit (widget, widget_signals[STYLE_UPDATED], 0); g_signal_emit (widget, widget_signals[STYLE_UPDATED], 0);
else else