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

stylecontext: Fold a function into only caller

Browse Source
This commit is contained in:
Benjamin Otte
2014-12-15 14:22:00 +01:00
parent f3f021106d
commit b53d5d0643
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkstylecontext.c
View File

@ -2720,23 +2720,6 @@ gtk_style_context_do_invalidate (GtkStyleContext *context,
priv->invalidating_context = NULL; 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 static gboolean
gtk_style_context_needs_full_revalidate (GtkStyleContext *context, gtk_style_context_needs_full_revalidate (GtkStyleContext *context,
GtkCssChange change) GtkCssChange change)
@ -2892,9 +2875,13 @@ _gtk_style_context_validate (GtkStyleContext *context,
{ {
GtkBitmask *animation_changes; 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); changes = _gtk_bitmask_union (changes, animation_changes);
_gtk_bitmask_free (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)) if (!_gtk_bitmask_is_empty (changes))