diff options
| author | Benjamin Otte <otte@redhat.com> | 2014-12-15 14:22:00 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-01-07 14:26:47 +0100 |
| commit | b53d5d064341161a8cf002aaa1d259cf69c2ab65 (patch) | |
| tree | 5399b100619155d08670e34cb067405f7916a2e9 /gtk/gtkstylecontext.c | |
| parent | f3f021106d467f909458a2dba8e7053f27dd1e2b (diff) | |
| download | gtk+-b53d5d064341161a8cf002aaa1d259cf69c2ab65.tar.gz | |
stylecontext: Fold a function into only caller
Diffstat (limited to 'gtk/gtkstylecontext.c')
| -rw-r--r-- | gtk/gtkstylecontext.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 1813505345..14aaecacfc 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -2720,23 +2720,6 @@ gtk_style_context_do_invalidate (GtkStyleContext *context, priv->invalidating_context = NULL; } -static GtkBitmask * -gtk_style_context_update_animations (GtkStyleContext *context, - gint64 timestamp) -{ - GtkBitmask *differences; - GtkCssStyle *values; - - values = style_values_lookup (context); - - differences = gtk_css_animated_style_advance (GTK_CSS_ANIMATED_STYLE (values), timestamp); - - if (gtk_css_animated_style_is_static (GTK_CSS_ANIMATED_STYLE (values))) - _gtk_style_context_update_animating (context); - - return differences; -} - static gboolean gtk_style_context_needs_full_revalidate (GtkStyleContext *context, GtkCssChange change) @@ -2892,9 +2875,13 @@ _gtk_style_context_validate (GtkStyleContext *context, { GtkBitmask *animation_changes; - animation_changes = gtk_style_context_update_animations (context, timestamp); + animation_changes = gtk_css_animated_style_advance (GTK_CSS_ANIMATED_STYLE (info->values), timestamp); + changes = _gtk_bitmask_union (changes, animation_changes); _gtk_bitmask_free (animation_changes); + + if (gtk_css_animated_style_is_static (GTK_CSS_ANIMATED_STYLE (info->values))) + _gtk_style_context_update_animating (context); } if (!_gtk_bitmask_is_empty (changes)) |