diff options
| author | Benjamin Otte <otte@redhat.com> | 2014-12-15 01:58:11 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-01-07 14:26:47 +0100 |
| commit | 980923c761a7f38197817cfa9168e8b78f1a73ac (patch) | |
| tree | 08b47d43abddd20c932dcf2d477655094ce43230 /gtk/gtkstylecontext.c | |
| parent | 0bab285fe0f5ce4accec8b941742306ef54f4655 (diff) | |
| download | gtk+-980923c761a7f38197817cfa9168e8b78f1a73ac.tar.gz | |
cssanimatedstyle: Merge two functions
Diffstat (limited to 'gtk/gtkstylecontext.c')
| -rw-r--r-- | gtk/gtkstylecontext.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index bc79821370..9ed0b448a8 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -2838,17 +2838,14 @@ _gtk_style_context_validate (GtkStyleContext *context, style_info_set_values (info, NULL); values = style_values_lookup (context); - values = gtk_css_animated_style_new (values); - - if (values != current) - gtk_css_animated_style_create_animations (GTK_CSS_ANIMATED_STYLE (values), - priv->parent ? style_values_lookup (priv->parent) : NULL, - timestamp, - GTK_STYLE_PROVIDER_PRIVATE (priv->cascade), - priv->scale, - gtk_style_context_should_create_transitions (context) - ? current - : NULL); + + values = gtk_css_animated_style_new (values, + priv->parent ? style_values_lookup (priv->parent) : NULL, + timestamp, + GTK_STYLE_PROVIDER_PRIVATE (priv->cascade), + priv->scale, + gtk_style_context_should_create_transitions (context) ? current : NULL); + if (gtk_css_animated_style_is_static (GTK_CSS_ANIMATED_STYLE (values))) { change &= ~GTK_CSS_CHANGE_ANIMATE; |