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

stylecontext: update_animating() properly

Browse Source 
Because we can switch from animating to non-animating pretty much
anywhere, do the check for animations unconditionally instead of trying
to cram it into the correct if path (and failing).
This commit is contained in:
Benjamin Otte 2015-01-06 12:08:49 +01:00
parent 059cd3e51f
commit 2664082549
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkstylecontext.c
View File

@ -2948,7 +2948,6 @@ _gtk_style_context_validate (GtkStyleContext *context,
gtk_style_context_should_create_transitions (context) ? current : NULL); gtk_style_context_should_create_transitions (context) ? current : NULL);
style_info_set_values (info, style); style_info_set_values (info, style);
_gtk_style_context_update_animating (context);
g_object_unref (static_style); g_object_unref (static_style);
g_object_unref (style); g_object_unref (style);
@ -2995,13 +2994,11 @@ _gtk_style_context_validate (GtkStyleContext *context,
timestamp); timestamp);
style_info_set_values (info, new_values); style_info_set_values (info, new_values);
g_object_unref (new_values); g_object_unref (new_values);
if (!GTK_IS_CSS_ANIMATED_STYLE (info->values) ||
gtk_css_animated_style_is_static (GTK_CSS_ANIMATED_STYLE (info->values)))
_gtk_style_context_update_animating (context);
} }
} }
_gtk_style_context_update_animating (context);
changes = gtk_css_style_get_difference (info->values, current); changes = gtk_css_style_get_difference (info->values, current);
g_object_unref (current); g_object_unref (current);