[libadwaita] timed-animation: Rename interpolator to easing



commit d5fdcdd3b64bb0a5483ba1652d50c88d37b620e6
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Nov 16 16:38:46 2021 +0500

    timed-animation: Rename interpolator to easing
    
    Rename the values as well.

 src/adw-tab.c                     |  4 +--
 src/adw-timed-animation-private.h | 14 +++++------
 src/adw-timed-animation.c         | 51 +++++++++++++++++++--------------------
 3 files changed, 34 insertions(+), 35 deletions(-)
---
diff --git a/src/adw-tab.c b/src/adw-tab.c
index f4686351..b6883f58 100644
--- a/src/adw-tab.c
+++ b/src/adw-tab.c
@@ -845,8 +845,8 @@ adw_tab_init (AdwTab *self)
     adw_timed_animation_new (GTK_WIDGET (self), 0, 0,
                              CLOSE_BTN_ANIMATION_DURATION, target);
 
-  adw_timed_animation_set_interpolator (ADW_TIMED_ANIMATION (self->close_btn_animation),
-                                        ADW_ANIMATION_INTERPOLATOR_EASE_IN_OUT);
+  adw_timed_animation_set_easing (ADW_TIMED_ANIMATION (self->close_btn_animation),
+                                  ADW_EASING_EASE_IN_OUT_CUBIC);
 }
 
 AdwTab *
diff --git a/src/adw-timed-animation-private.h b/src/adw-timed-animation-private.h
index 6d284d7e..998e0e0c 100644
--- a/src/adw-timed-animation-private.h
+++ b/src/adw-timed-animation-private.h
@@ -24,10 +24,10 @@ G_BEGIN_DECLS
 GDK_DECLARE_INTERNAL_TYPE (AdwTimedAnimation, adw_timed_animation, ADW, TIMED_ANIMATION, AdwAnimation)
 
 typedef enum {
-  ADW_ANIMATION_INTERPOLATOR_EASE_IN,
-  ADW_ANIMATION_INTERPOLATOR_EASE_OUT,
-  ADW_ANIMATION_INTERPOLATOR_EASE_IN_OUT,
-} AdwAnimationInterpolator;
+  ADW_EASING_EASE_IN_CUBIC,
+  ADW_EASING_EASE_OUT_CUBIC,
+  ADW_EASING_EASE_IN_OUT_CUBIC,
+} AdwEasing;
 
 AdwAnimation *adw_timed_animation_new (GtkWidget          *widget,
                                        double              from,
@@ -47,9 +47,9 @@ guint adw_timed_animation_get_duration (AdwTimedAnimation *self);
 void  adw_timed_animation_set_duration (AdwTimedAnimation *self,
                                         guint              duration);
 
-AdwAnimationInterpolator adw_timed_animation_get_interpolator (AdwTimedAnimation        *self);
-void                     adw_timed_animation_set_interpolator (AdwTimedAnimation        *self,
-                                                               AdwAnimationInterpolator  interpolator);
+AdwEasing adw_timed_animation_get_easing (AdwTimedAnimation *self);
+void      adw_timed_animation_set_easing (AdwTimedAnimation *self,
+                                          AdwEasing          easing);
 
 guint adw_timed_animation_get_repeat_count (AdwTimedAnimation *self);
 void  adw_timed_animation_set_repeat_count (AdwTimedAnimation *self,
diff --git a/src/adw-timed-animation.c b/src/adw-timed-animation.c
index c78c1762..9af67cd2 100644
--- a/src/adw-timed-animation.c
+++ b/src/adw-timed-animation.c
@@ -18,11 +18,10 @@ struct _AdwTimedAnimation
   double value_from;
   double value_to;
   guint duration; /* ms */
+  AdwEasing easing;
   guint repeat_count;
   gboolean reverse;
   gboolean alternate;
-
-  AdwAnimationInterpolator interpolator;
 };
 
 struct _AdwTimedAnimationClass
@@ -37,7 +36,7 @@ enum {
   PROP_VALUE_FROM,
   PROP_VALUE_TO,
   PROP_DURATION,
-  PROP_INTERPOLATOR,
+  PROP_EASING,
   PROP_REPEAT_COUNT,
   PROP_REVERSE,
   PROP_ALTERNATE,
@@ -86,14 +85,14 @@ adw_timed_animation_calculate_value (AdwAnimation *animation,
 
   progress = reverse ? (1 - progress) : progress;
 
-  switch (self->interpolator) {
-    case ADW_ANIMATION_INTERPOLATOR_EASE_IN:
+  switch (self->easing) {
+    case ADW_EASING_EASE_IN_CUBIC:
       value = adw_ease_in_cubic (progress);
       break;
-    case ADW_ANIMATION_INTERPOLATOR_EASE_OUT:
+    case ADW_EASING_EASE_OUT_CUBIC:
       value = adw_ease_out_cubic (progress);
       break;
-    case ADW_ANIMATION_INTERPOLATOR_EASE_IN_OUT:
+    case ADW_EASING_EASE_IN_OUT_CUBIC:
       value = adw_ease_in_out_cubic (progress);
       break;
     default:
@@ -124,8 +123,8 @@ adw_timed_animation_get_property (GObject    *object,
     g_value_set_uint (value, adw_timed_animation_get_duration (self));
     break;
 
-  case PROP_INTERPOLATOR:
-    g_value_set_enum (value, adw_timed_animation_get_interpolator (self));
+  case PROP_EASING:
+    g_value_set_enum (value, adw_timed_animation_get_easing (self));
     break;
 
   case PROP_REPEAT_COUNT:
@@ -166,8 +165,8 @@ adw_timed_animation_set_property (GObject      *object,
     adw_timed_animation_set_duration (self, g_value_get_uint (value));
     break;
 
-  case PROP_INTERPOLATOR:
-    adw_timed_animation_set_interpolator (self, g_value_get_enum (value));
+  case PROP_EASING:
+    adw_timed_animation_set_easing (self, g_value_get_enum (value));
     break;
 
   case PROP_REPEAT_COUNT:
@@ -226,12 +225,12 @@ adw_timed_animation_class_init (AdwTimedAnimationClass *klass)
                        0,
                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
 
-  props[PROP_INTERPOLATOR] =
-    g_param_spec_enum ("interpolator",
-                       "Interpolator",
+  props[PROP_EASING] =
+    g_param_spec_enum ("easing",
+                       "Easing",
                        "Easing function used in the animation",
-                       ADW_TYPE_ANIMATION_INTERPOLATOR,
-                       ADW_ANIMATION_INTERPOLATOR_EASE_OUT,
+                       ADW_TYPE_EASING,
+                       ADW_EASING_EASE_OUT_CUBIC,
                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
 
   props[PROP_REPEAT_COUNT] =
@@ -356,28 +355,28 @@ adw_timed_animation_set_duration (AdwTimedAnimation *self,
   g_object_notify_by_pspec (G_OBJECT (self), props[PROP_DURATION]);
 }
 
-AdwAnimationInterpolator
-adw_timed_animation_get_interpolator (AdwTimedAnimation *self)
+AdwEasing
+adw_timed_animation_get_easing (AdwTimedAnimation *self)
 {
   g_return_val_if_fail (ADW_IS_TIMED_ANIMATION (self),
-                        ADW_ANIMATION_INTERPOLATOR_EASE_IN);
+                        ADW_EASING_EASE_IN_CUBIC);
 
-  return self->interpolator;
+  return self->easing;
 }
 
 void
-adw_timed_animation_set_interpolator (AdwTimedAnimation        *self,
-                                      AdwAnimationInterpolator  interpolator)
+adw_timed_animation_set_easing (AdwTimedAnimation *self,
+                                AdwEasing          easing)
 {
   g_return_if_fail (ADW_IS_TIMED_ANIMATION (self));
-  g_return_if_fail (interpolator <= ADW_ANIMATION_INTERPOLATOR_EASE_IN_OUT);
+  g_return_if_fail (easing <= ADW_EASING_EASE_IN_OUT_CUBIC);
 
-  if (self->interpolator == interpolator)
+  if (self->easing == easing)
     return;
 
-  self->interpolator = interpolator;
+  self->easing = easing;
 
-  g_object_notify_by_pspec (G_OBJECT (self), props[PROP_INTERPOLATOR]);
+  g_object_notify_by_pspec (G_OBJECT (self), props[PROP_EASING]);
 }
 
 guint


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]