[gtk+/wip/watson/progress-tracker: 11/13] styleanimation: rename set_values -> advance_values
- From: Matthew Watson <watson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/watson/progress-tracker: 11/13] styleanimation: rename set_values -> advance_values
- Date: Sat, 26 Mar 2016 23:47:15 +0000 (UTC)
commit 77612738a8b5a0c4d8a97eb6b08ebe60206b90af
Author: Matt Watson <mattdangerw gmail com>
Date: Thu Mar 24 17:02:42 2016 -0700
styleanimation: rename set_values -> advance_values
With the switch to progress tracker we need to always call
set_values with an increasing timestamp. This will already always
happen, but the new name should help make the expectation clear
gtk/gtkcssanimatedstyle.c | 6 +++---
gtk/gtkcssanimation.c | 8 ++++----
gtk/gtkcsstransition.c | 8 ++++----
gtk/gtkstyleanimation.c | 16 ++++++++--------
gtk/gtkstyleanimationprivate.h | 4 ++--
5 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/gtk/gtkcssanimatedstyle.c b/gtk/gtkcssanimatedstyle.c
index f51d0eb..b15652e 100644
--- a/gtk/gtkcssanimatedstyle.c
+++ b/gtk/gtkcssanimatedstyle.c
@@ -405,9 +405,9 @@ gtk_css_animated_style_advance_animations (GtkCssAnimatedStyle *style,
{
GtkStyleAnimation *animation = l->data;
- _gtk_style_animation_set_values (animation,
- timestamp,
- GTK_CSS_ANIMATED_STYLE (style));
+ _gtk_style_animation_advance_values (animation,
+ timestamp,
+ GTK_CSS_ANIMATED_STYLE (style));
}
}
diff --git a/gtk/gtkcssanimation.c b/gtk/gtkcssanimation.c
index 9ee5153..1f71520 100644
--- a/gtk/gtkcssanimation.c
+++ b/gtk/gtkcssanimation.c
@@ -77,9 +77,9 @@ gtk_css_animation_get_ease (GtkCssAnimation *animation)
}
static void
-gtk_css_animation_set_values (GtkStyleAnimation *style_animation,
- gint64 for_time_us,
- GtkCssAnimatedStyle *style)
+gtk_css_animation_advance_values (GtkStyleAnimation *style_animation,
+ gint64 for_time_us,
+ GtkCssAnimatedStyle *style)
{
GtkCssAnimation *animation = GTK_CSS_ANIMATION (style_animation);
double ease;
@@ -149,7 +149,7 @@ _gtk_css_animation_class_init (GtkCssAnimationClass *klass)
object_class->finalize = gtk_css_animation_finalize;
- animation_class->set_values = gtk_css_animation_set_values;
+ animation_class->advance_values = gtk_css_animation_advance_values;
animation_class->is_finished = gtk_css_animation_is_finished;
animation_class->is_static = gtk_css_animation_is_static;
}
diff --git a/gtk/gtkcsstransition.c b/gtk/gtkcsstransition.c
index d5ff14d..cd10aba 100644
--- a/gtk/gtkcsstransition.c
+++ b/gtk/gtkcsstransition.c
@@ -27,9 +27,9 @@
G_DEFINE_TYPE (GtkCssTransition, _gtk_css_transition, GTK_TYPE_STYLE_ANIMATION)
static void
-gtk_css_transition_set_values (GtkStyleAnimation *animation,
- gint64 for_time_us,
- GtkCssAnimatedStyle *style)
+gtk_css_transition_advance_values (GtkStyleAnimation *animation,
+ gint64 for_time_us,
+ GtkCssAnimatedStyle *style)
{
GtkCssTransition *transition = GTK_CSS_TRANSITION (animation);
GtkCssValue *value, *end;
@@ -91,7 +91,7 @@ _gtk_css_transition_class_init (GtkCssTransitionClass *klass)
object_class->finalize = gtk_css_transition_finalize;
- animation_class->set_values = gtk_css_transition_set_values;
+ animation_class->advance_values = gtk_css_transition_advance_values;
animation_class->is_finished = gtk_css_transition_is_finished;
animation_class->is_static = gtk_css_transition_is_static;
}
diff --git a/gtk/gtkstyleanimation.c b/gtk/gtkstyleanimation.c
index 0ca8852..3ba62f7 100644
--- a/gtk/gtkstyleanimation.c
+++ b/gtk/gtkstyleanimation.c
@@ -24,9 +24,9 @@
G_DEFINE_ABSTRACT_TYPE (GtkStyleAnimation, _gtk_style_animation, G_TYPE_OBJECT)
static void
-gtk_style_animation_real_set_values (GtkStyleAnimation *animation,
- gint64 for_time_us,
- GtkCssAnimatedStyle *style)
+gtk_style_animation_real_advance_values (GtkStyleAnimation *animation,
+ gint64 for_time_us,
+ GtkCssAnimatedStyle *style)
{
}
@@ -45,7 +45,7 @@ gtk_style_animation_real_is_static (GtkStyleAnimation *animation)
static void
_gtk_style_animation_class_init (GtkStyleAnimationClass *klass)
{
- klass->set_values = gtk_style_animation_real_set_values;
+ klass->advance_values = gtk_style_animation_real_advance_values;
klass->is_finished = gtk_style_animation_real_is_finished;
klass->is_static = gtk_style_animation_real_is_static;
}
@@ -56,9 +56,9 @@ _gtk_style_animation_init (GtkStyleAnimation *animation)
}
void
-_gtk_style_animation_set_values (GtkStyleAnimation *animation,
- gint64 for_time_us,
- GtkCssAnimatedStyle *style)
+_gtk_style_animation_advance_values (GtkStyleAnimation *animation,
+ gint64 for_time_us,
+ GtkCssAnimatedStyle *style)
{
GtkStyleAnimationClass *klass;
@@ -67,7 +67,7 @@ _gtk_style_animation_set_values (GtkStyleAnimation *animation,
klass = GTK_STYLE_ANIMATION_GET_CLASS (animation);
- klass->set_values (animation, for_time_us, style);
+ klass->advance_values (animation, for_time_us, style);
}
gboolean
diff --git a/gtk/gtkstyleanimationprivate.h b/gtk/gtkstyleanimationprivate.h
index 5fc3a96..404baa7 100644
--- a/gtk/gtkstyleanimationprivate.h
+++ b/gtk/gtkstyleanimationprivate.h
@@ -45,14 +45,14 @@ struct _GtkStyleAnimationClass
gboolean (* is_finished) (GtkStyleAnimation *animation);
gboolean (* is_static) (GtkStyleAnimation *animation);
- void (* set_values) (GtkStyleAnimation *animation,
+ void (* advance_values) (GtkStyleAnimation *animation,
gint64 for_time_us,
GtkCssAnimatedStyle *style);
};
GType _gtk_style_animation_get_type (void) G_GNUC_CONST;
-void _gtk_style_animation_set_values (GtkStyleAnimation *animation,
+void _gtk_style_animation_advance_values (GtkStyleAnimation *animation,
gint64 for_time_us,
GtkCssAnimatedStyle *style);
gboolean _gtk_style_animation_is_finished (GtkStyleAnimation *animation);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]