summaryrefslogtreecommitdiff
path: root/gtk/gtkcssanimation.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2014-10-23 04:10:03 +0200
committerBenjamin Otte <otte@redhat.com>2015-01-07 14:26:46 +0100
commit4168e0385efd9231731ed35b96ce58bafc3eb03f (patch)
tree1b43a6658abd650fce4f1eb1a4a17dd16d0098d6 /gtk/gtkcssanimation.c
parent572f46067f44da99e9ee0ea3210e1c0fac148928 (diff)
downloadgtk+-4168e0385efd9231731ed35b96ce58bafc3eb03f.tar.gz
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle
GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
Diffstat (limited to 'gtk/gtkcssanimation.c')
-rw-r--r--gtk/gtkcssanimation.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkcssanimation.c b/gtk/gtkcssanimation.c
index 8ffb537e83..601e4064ca 100644
--- a/gtk/gtkcssanimation.c
+++ b/gtk/gtkcssanimation.c
@@ -104,7 +104,7 @@ gtk_css_animation_get_progress_from_iteration (GtkCssAnimation *animation,
static void
gtk_css_animation_set_values (GtkStyleAnimation *style_animation,
gint64 for_time_us,
- GtkCssStyle *values)
+ GtkCssAnimatedStyle *style)
{
GtkCssAnimation *animation = GTK_CSS_ANIMATION (style_animation);
double iteration, progress;
@@ -128,8 +128,8 @@ gtk_css_animation_set_values (GtkStyleAnimation *style_animation,
value = _gtk_css_keyframes_get_value (animation->keyframes,
i,
progress,
- gtk_css_style_get_intrinsic_value (values, property_id));
- gtk_css_style_set_animated_value (values, property_id, value);
+ gtk_css_animated_style_get_intrinsic_value (style, property_id));
+ gtk_css_animated_style_set_animated_value (style, property_id, value);
_gtk_css_value_unref (value);
}
}