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

cssanimatedstyle: Merge two functions

Browse Source
This commit is contained in:
Benjamin Otte
2014-12-15 01:58:11 +01:00
parent 0bab285fe0
commit 980923c761
3 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkstylecontext.c
View File

@ -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;