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

widget: Set parent style context

Browse Source
This commit is contained in:
Benjamin Otte 2011-12-29 12:40:21 +01:00
parent b50d2b74d7
commit 0ac519e8a1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkwidget.c
View File

@ -3785,6 +3785,8 @@ gtk_widget_unparent (GtkWidget *widget)
/* Unset window-unfocused since we are no longer inside a toplevel window */ /* Unset window-unfocused since we are no longer inside a toplevel window */
gtk_widget_unset_state_flags (widget, GTK_STATE_FLAG_WINDOW_UNFOCUSED); gtk_widget_unset_state_flags (widget, GTK_STATE_FLAG_WINDOW_UNFOCUSED);
if (priv->context)
gtk_style_context_set_parent (priv->context, NULL);
g_signal_emit (widget, widget_signals[PARENT_SET], 0, old_parent); g_signal_emit (widget, widget_signals[PARENT_SET], 0, old_parent);
if (toplevel) if (toplevel)
@ -7815,6 +7817,9 @@ gtk_widget_set_parent (GtkWidget *widget,
data.operation = STATE_CHANGE_REPLACE; data.operation = STATE_CHANGE_REPLACE;
gtk_widget_propagate_state (widget, &data); gtk_widget_propagate_state (widget, &data);
if (priv->context)
gtk_style_context_set_parent (priv->context,
gtk_widget_get_style_context (parent));
gtk_widget_reset_style (widget); gtk_widget_reset_style (widget);
g_signal_emit (widget, widget_signals[PARENT_SET], 0, NULL); g_signal_emit (widget, widget_signals[PARENT_SET], 0, NULL);
@ -13867,6 +13872,9 @@ gtk_widget_get_style_context (GtkWidget *widget)
gtk_style_context_set_screen (priv->context, screen); gtk_style_context_set_screen (priv->context, screen);
gtk_style_context_set_path (priv->context, path); gtk_style_context_set_path (priv->context, path);
if (priv->parent)
gtk_style_context_set_parent (priv->context,
gtk_widget_get_style_context (priv->parent));
} }
return widget->priv->context; return widget->priv->context;