diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-03-29 15:43:35 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-04-17 08:59:15 +0200 |
| commit | 40982eabbb6bc7515cf045c4c85eb18df42c125b (patch) | |
| tree | d9f685769ac0947d98f60fbb3dcb9d15f7a41343 /gtk | |
| parent | 751187aa0c246978713b51cee0c38f423bf04681 (diff) | |
| download | gtk+-40982eabbb6bc7515cf045c4c85eb18df42c125b.tar.gz | |
stylecontext: Keep the main style data around until revalidation
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkstylecontext.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index a0cb27cfea..218df50eec 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -1055,9 +1055,11 @@ gtk_style_context_queue_invalidate_internal (GtkStyleContext *context, GtkStyleContextPrivate *priv = context->priv; GtkStyleInfo *info = priv->info_stack->data; - info->data = NULL; - - if (!gtk_style_context_is_saved (context)) + if (gtk_style_context_is_saved (context)) + { + info->data = NULL; + } + else { _gtk_style_context_queue_invalidate (context, GTK_CSS_CHANGE_STATE); /* XXX: We need to invalidate siblings here somehow */ @@ -3342,8 +3344,10 @@ _gtk_style_context_validate (GtkStyleContext *context, if (priv->relevant_changes & change) { + GtkStyleInfo *info = priv->info_stack->data; gboolean clear_cache = ((priv->relevant_changes & change) & ~GTK_STYLE_CONTEXT_CACHED_CHANGE) != 0; + info->data = NULL; gtk_style_context_do_invalidate (context, clear_cache); } |