diff options
| author | Benjamin Otte <otte@redhat.com> | 2015-01-31 11:56:15 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-02-06 11:26:31 +0100 |
| commit | 1116914ea03685ffbff188e48e32685a4985c2d3 (patch) | |
| tree | 13ba596816f999356a705ce410e588e7dfef56c4 /gtk/gtkcssanimatedstyle.c | |
| parent | 808bfe0a98ac4cd2e11ea4eed82a66470121c19b (diff) | |
| download | gtk+-1116914ea03685ffbff188e48e32685a4985c2d3.tar.gz | |
css: Move scale to GtkStyleProviderPrivatewip/mir2
This way, we can remove it as a separate argument from
gtk_css_value_compute() and allow computation to only depend on one
thing: the style provider.
Diffstat (limited to 'gtk/gtkcssanimatedstyle.c')
| -rw-r--r-- | gtk/gtkcssanimatedstyle.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/gtkcssanimatedstyle.c b/gtk/gtkcssanimatedstyle.c index 98aa930865..4583d8cc71 100644 --- a/gtk/gtkcssanimatedstyle.c +++ b/gtk/gtkcssanimatedstyle.c @@ -313,7 +313,6 @@ gtk_css_animated_style_create_css_animations (GSList *animation GtkCssStyle *parent_style, gint64 timestamp, GtkStyleProviderPrivate *provider, - int scale, GtkCssStyle *source) { GtkCssValue *durations, *delays, *timing_functions, *animation_names; @@ -358,7 +357,7 @@ gtk_css_animated_style_create_css_animations (GSList *animation if (keyframes == NULL) continue; - keyframes = _gtk_css_keyframes_compute (keyframes, provider, scale, base_style, parent_style); + keyframes = _gtk_css_keyframes_compute (keyframes, provider, base_style, parent_style); animation = _gtk_css_animation_new (name, keyframes, @@ -401,7 +400,6 @@ gtk_css_animated_style_new (GtkCssStyle *base_style, GtkCssStyle *parent_style, gint64 timestamp, GtkStyleProviderPrivate *provider, - int scale, GtkCssStyle *previous_style) { GtkCssAnimatedStyle *result; @@ -416,7 +414,7 @@ gtk_css_animated_style_new (GtkCssStyle *base_style, if (previous_style != NULL) animations = gtk_css_animated_style_create_css_transitions (animations, base_style, timestamp, previous_style); - animations = gtk_css_animated_style_create_css_animations (animations, base_style, parent_style, timestamp, provider, scale, previous_style); + animations = gtk_css_animated_style_create_css_animations (animations, base_style, parent_style, timestamp, provider, previous_style); if (animations == NULL) return g_object_ref (base_style); |