[libadwaita/wip/exalm/animation-cleanups: 2/4] easing: Remove EASING_ from enum names
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita/wip/exalm/animation-cleanups: 2/4] easing: Remove EASING_ from enum names
- Date: Mon, 22 Nov 2021 19:28:25 +0000 (UTC)
commit c8e7a5708a93a1783e83e619be76c8b05c346678
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Mon Nov 22 20:59:16 2021 +0500
easing: Remove EASING_ from enum names
All of them except one have "EASING_EASE" in the name, this is awkward and
unnecessary.
demo/adw-demo-window.c | 65 +++++-----
doc/migrating-between-development-versions.md | 3 +-
doc/migrating-libhandy-1-4-to-libadwaita.md | 3 +-
src/adw-clamp-layout.c | 2 +-
src/adw-easing.c | 164 ++++++++++++--------------
src/adw-easing.h | 62 +++++-----
src/adw-tab-box.c | 2 +-
src/adw-tab.c | 2 +-
src/adw-timed-animation.c | 6 +-
src/adw-toast-overlay.c | 2 +-
src/gtkprogresstracker.c | 2 +-
tests/test-timed-animation.c | 10 +-
12 files changed, 155 insertions(+), 168 deletions(-)
---
diff --git a/demo/adw-demo-window.c b/demo/adw-demo-window.c
index 1030ec9b..81324159 100644
--- a/demo/adw-demo-window.c
+++ b/demo/adw-demo-window.c
@@ -450,68 +450,67 @@ animations_easing_name (AdwEnumListItem *value,
g_return_val_if_fail (ADW_IS_ENUM_LIST_ITEM (value), NULL);
switch (adw_enum_list_item_get_value (value)) {
- case ADW_EASING_LINEAR:
+ case ADW_LINEAR:
return g_strdup (_("Linear"));
-
- case ADW_EASING_EASE_IN_QUAD:
+ case ADW_EASE_IN_QUAD:
return g_strdup (_("Ease-in (Quadratic)"));
- case ADW_EASING_EASE_OUT_QUAD:
+ case ADW_EASE_OUT_QUAD:
return g_strdup (_("Ease-out (Quadratic)"));
- case ADW_EASING_EASE_IN_OUT_QUAD:
+ case ADW_EASE_IN_OUT_QUAD:
return g_strdup (_("Ease-in-out (Quadratic)"));
- case ADW_EASING_EASE_IN_CUBIC:
+ case ADW_EASE_IN_CUBIC:
return g_strdup (_("Ease-in (Cubic)"));
- case ADW_EASING_EASE_OUT_CUBIC:
+ case ADW_EASE_OUT_CUBIC:
return g_strdup (_("Ease-out (Cubic)"));
- case ADW_EASING_EASE_IN_OUT_CUBIC:
+ case ADW_EASE_IN_OUT_CUBIC:
return g_strdup (_("Ease-in-out (Cubic)"));
- case ADW_EASING_EASE_IN_QUART:
+ case ADW_EASE_IN_QUART:
return g_strdup (_("Ease-in (Quartic)"));
- case ADW_EASING_EASE_OUT_QUART:
+ case ADW_EASE_OUT_QUART:
return g_strdup (_("Ease-out (Quartic)"));
- case ADW_EASING_EASE_IN_OUT_QUART:
+ case ADW_EASE_IN_OUT_QUART:
return g_strdup (_("Ease-in-out (Quartic)"));
- case ADW_EASING_EASE_IN_QUINT:
+ case ADW_EASE_IN_QUINT:
return g_strdup (_("Ease-in (Quintic)"));
- case ADW_EASING_EASE_OUT_QUINT:
+ case ADW_EASE_OUT_QUINT:
return g_strdup (_("Ease-out (Quintic)"));
- case ADW_EASING_EASE_IN_OUT_QUINT:
+ case ADW_EASE_IN_OUT_QUINT:
return g_strdup (_("Ease-in-out (Quintic)"));
- case ADW_EASING_EASE_IN_SINE:
+ case ADW_EASE_IN_SINE:
return g_strdup (_("Ease-in (Sine)"));
- case ADW_EASING_EASE_OUT_SINE:
+ case ADW_EASE_OUT_SINE:
return g_strdup (_("Ease-out (Sine)"));
- case ADW_EASING_EASE_IN_OUT_SINE:
+ case ADW_EASE_IN_OUT_SINE:
return g_strdup (_("Ease-in-out (Sine)"));
- case ADW_EASING_EASE_IN_EXPO:
+ case ADW_EASE_IN_EXPO:
return g_strdup (_("Ease-in (Exponential)"));
- case ADW_EASING_EASE_OUT_EXPO:
+ case ADW_EASE_OUT_EXPO:
return g_strdup (_("Ease-out (Exponential)"));
- case ADW_EASING_EASE_IN_OUT_EXPO:
+ case ADW_EASE_IN_OUT_EXPO:
return g_strdup (_("Ease-in-out (Exponential)"));
- case ADW_EASING_EASE_IN_CIRC:
+ case ADW_EASE_IN_CIRC:
return g_strdup (_("Ease-in (Circular)"));
- case ADW_EASING_EASE_OUT_CIRC:
+ case ADW_EASE_OUT_CIRC:
return g_strdup (_("Ease-out (Circular)"));
- case ADW_EASING_EASE_IN_OUT_CIRC:
+ case ADW_EASE_IN_OUT_CIRC:
return g_strdup (_("Ease-in-out (Circular)"));
- case ADW_EASING_EASE_IN_ELASTIC:
+ case ADW_EASE_IN_ELASTIC:
return g_strdup (_("Ease-in (Elastic)"));
- case ADW_EASING_EASE_OUT_ELASTIC:
+ case ADW_EASE_OUT_ELASTIC:
return g_strdup (_("Ease-out (Elastic)"));
- case ADW_EASING_EASE_IN_OUT_ELASTIC:
+ case ADW_EASE_IN_OUT_ELASTIC:
return g_strdup (_("Ease-in-out (Elastic)"));
- case ADW_EASING_EASE_IN_BACK:
+ case ADW_EASE_IN_BACK:
return g_strdup (_("Ease-in (Back)"));
- case ADW_EASING_EASE_OUT_BACK:
+ case ADW_EASE_OUT_BACK:
return g_strdup (_("Ease-out (Back)"));
- case ADW_EASING_EASE_IN_OUT_BACK:
+ case ADW_EASE_IN_OUT_BACK:
return g_strdup (_("Ease-in-out (Back)"));
- case ADW_EASING_EASE_IN_BOUNCE:
+ case ADW_EASE_IN_BOUNCE:
return g_strdup (_("Ease-in (Bounce)"));
- case ADW_EASING_EASE_OUT_BOUNCE:
+ case ADW_EASE_OUT_BOUNCE:
return g_strdup (_("Ease-out (Bounce)"));
- case ADW_EASING_EASE_IN_OUT_BOUNCE:
+ case ADW_EASE_IN_OUT_BOUNCE:
return g_strdup (_("Ease-in-out (Bounce)"));
default:
return NULL;
@@ -841,7 +840,7 @@ animation_page_init (AdwDemoWindow *self)
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
adw_timed_animation_set_easing (ADW_TIMED_ANIMATION (self->timed_animation),
- ADW_EASING_EASE_IN_OUT_CUBIC);
+ ADW_EASE_IN_OUT_CUBIC);
g_object_notify_by_pspec (G_OBJECT (self), props[PROP_TIMED_ANIMATION]);
diff --git a/doc/migrating-between-development-versions.md b/doc/migrating-between-development-versions.md
index 898645f8..91ba63c4 100644
--- a/doc/migrating-between-development-versions.md
+++ b/doc/migrating-between-development-versions.md
@@ -307,8 +307,7 @@ changed from `gint64` to `guint`.
### Adapt to Miscellaneous Changes
The `adw_ease_out_cubic()` function has been removed. Instead,
-[func Adw Easing ease] can be used with the `ADW_EASING_EASE_OUT_CUBIC`
-parameter.
+[func Adw Easing ease] can be used with the `ADW_EASE_OUT_CUBIC` parameter.
### Adapt to Stylesheet Changes
diff --git a/doc/migrating-libhandy-1-4-to-libadwaita.md b/doc/migrating-libhandy-1-4-to-libadwaita.md
index 899df7d9..e746406f 100644
--- a/doc/migrating-libhandy-1-4-to-libadwaita.md
+++ b/doc/migrating-libhandy-1-4-to-libadwaita.md
@@ -363,8 +363,7 @@ changed from `gint64` to `guint`.
### Adapt to Miscellaneous Changes
The `hdy_ease_out_cubic()` function has been removed. Instead,
-[func Adw Easing ease] can be used with the `ADW_EASING_EASE_OUT_CUBIC`
-parameter.
+[func Adw Easing ease] can be used with the `ADW_EASE_OUT_CUBIC` parameter.
### Adapt to Stylesheet Changes
diff --git a/src/adw-clamp-layout.c b/src/adw-clamp-layout.c
index 3d5431d8..90621166 100644
--- a/src/adw-clamp-layout.c
+++ b/src/adw-clamp-layout.c
@@ -160,7 +160,7 @@ get_child_size (AdwClampLayout *self,
progress = (double) (for_size - lower) / (double) (upper - lower);
- return adw_easing_ease (ADW_EASING_EASE_OUT_CUBIC, progress) * amplitude + lower;
+ return adw_easing_ease (ADW_EASE_OUT_CUBIC, progress) * amplitude + lower;
}
static GtkSizeRequestMode
diff --git a/src/adw-easing.c b/src/adw-easing.c
index 4fb4b03b..dca50828 100644
--- a/src/adw-easing.c
+++ b/src/adw-easing.c
@@ -21,62 +21,52 @@
/**
* AdwEasing:
- * @ADW_EASING_LINEAR: Linear tweening.
- * @ADW_EASING_EASE_IN_QUAD: Quadratic tweening.
- * @ADW_EASING_EASE_OUT_QUAD: Quadratic tweening, inverse of
- * `ADW_EASING_EASE_IN_QUAD`.
- * @ADW_EASING_EASE_IN_OUT_QUAD: Quadratic tweening, combining
- * `ADW_EASING_EASE_IN_QUAD` and `ADW_EASING_EASE_OUT_QUAD`.
- * @ADW_EASING_EASE_IN_CUBIC: Cubic tweening.
- * @ADW_EASING_EASE_OUT_CUBIC: Cubic tweening, inverse of
- * `ADW_EASING_EASE_IN_CUBIC`.
- * @ADW_EASING_EASE_IN_OUT_CUBIC: Cubic tweening, combining
- * `ADW_EASING_EASE_IN_CUBIC` and `ADW_EASING_EASE_OUT_CUBIC`.
- * @ADW_EASING_EASE_IN_QUART: Quartic tweening.
- * @ADW_EASING_EASE_OUT_QUART: Quartic tweening, inverse of
- * `ADW_EASING_EASE_IN_QUART`.
- * @ADW_EASING_EASE_IN_OUT_QUART: Quartic tweening, combining
- * `ADW_EASING_EASE_IN_QUART` and `ADW_EASING_EASE_OUT_QUART`.
- * @ADW_EASING_EASE_IN_QUINT: Quintic tweening.
- * @ADW_EASING_EASE_OUT_QUINT: Quintic tweening, inverse of
- * `ADW_EASING_EASE_IN_QUINT`.
- * @ADW_EASING_EASE_IN_OUT_QUINT: Quintic tweening, combining
- * `ADW_EASING_EASE_IN_QUINT` and `ADW_EASING_EASE_OUT_QUINT`.
- * @ADW_EASING_EASE_IN_SINE: Sine wave tweening.
- * @ADW_EASING_EASE_OUT_SINE: Sine wave tweening, inverse of
- * `ADW_EASING_EASE_IN_SINE`.
- * @ADW_EASING_EASE_IN_OUT_SINE: Sine wave tweening, combining
- * `ADW_EASING_EASE_IN_SINE` and `ADW_EASING_EASE_OUT_SINE`.
- * @ADW_EASING_EASE_IN_EXPO: Exponential tweening.
- * @ADW_EASING_EASE_OUT_EXPO: Exponential tweening, inverse of
- * `ADW_EASING_EASE_IN_EXPO`.
- * @ADW_EASING_EASE_IN_OUT_EXPO: Exponential tweening, combining
- * `ADW_EASING_EASE_IN_EXPO` and `ADW_EASING_EASE_OUT_EXPO`.
- * @ADW_EASING_EASE_IN_CIRC: Circular tweening.
- * @ADW_EASING_EASE_OUT_CIRC: Circular tweening, inverse of
- * `ADW_EASING_EASE_IN_CIRC`.
- * @ADW_EASING_EASE_IN_OUT_CIRC: Circular tweening, combining
- * `ADW_EASING_EASE_IN_CIRC` and `ADW_EASING_EASE_OUT_CIRC`.
- * @ADW_EASING_EASE_IN_ELASTIC: Elastic tweening, with offshoot on start.
- * @ADW_EASING_EASE_OUT_ELASTIC: Elastic tweening, with offshoot on end,
- * inverse of `ADW_EASING_EASE_IN_ELASTIC`.
- * @ADW_EASING_EASE_IN_OUT_ELASTIC: Elastic tweening, with offshoot on both
- * ends, combining `ADW_EASING_EASE_IN_ELASTIC` and
- * `ADW_EASING_EASE_OUT_ELASTIC`.
- * @ADW_EASING_EASE_IN_BACK: Overshooting cubic tweening, with backtracking on
- * start.
- * @ADW_EASING_EASE_OUT_BACK: Overshooting cubic tweening, with backtracking on
- * end, inverse of `ADW_EASING_EASE_IN_BACK`.
- * @ADW_EASING_EASE_IN_OUT_BACK: Overshooting cubic tweening, with backtracking
- * on both ends, combining `ADW_EASING_EASE_IN_BACK` and
- * `ADW_EASING_EASE_OUT_BACK`.
- * @ADW_EASING_EASE_IN_BOUNCE: Exponentially decaying parabolic (bounce)
- * tweening, with bounce on start.
- * @ADW_EASING_EASE_OUT_BOUNCE: Exponentially decaying parabolic (bounce)
- * tweening, with bounce on end, inverse of `ADW_EASING_EASE_IN_BOUNCE`.
- * @ADW_EASING_EASE_IN_OUT_BOUNCE: Exponentially decaying parabolic (bounce)
- * tweening, with bounce on both ends, combining `ADW_EASING_EASE_IN_BOUNCE`
- * and `ADW_EASING_EASE_OUT_BOUNCE`.
+ * @ADW_LINEAR: Linear tweening.
+ * @ADW_EASE_IN_QUAD: Quadratic tweening.
+ * @ADW_EASE_OUT_QUAD: Quadratic tweening, inverse of `ADW_EASE_IN_QUAD`.
+ * @ADW_EASE_IN_OUT_QUAD: Quadratic tweening, combining `ADW_EASE_IN_QUAD` and
+ * `ADW_EASE_OUT_QUAD`.
+ * @ADW_EASE_IN_CUBIC: Cubic tweening.
+ * @ADW_EASE_OUT_CUBIC: Cubic tweening, inverse of `ADW_EASE_IN_CUBIC`.
+ * @ADW_EASE_IN_OUT_CUBIC: Cubic tweening, combining `ADW_EASE_IN_CUBIC` and
+ * `ADW_EASE_OUT_CUBIC`.
+ * @ADW_EASE_IN_QUART: Quartic tweening.
+ * @ADW_EASE_OUT_QUART: Quartic tweening, inverse of `ADW_EASE_IN_QUART`.
+ * @ADW_EASE_IN_OUT_QUART: Quartic tweening, combining `ADW_EASE_IN_QUART` and
+ * `ADW_EASE_OUT_QUART`.
+ * @ADW_EASE_IN_QUINT: Quintic tweening.
+ * @ADW_EASE_OUT_QUINT: Quintic tweening, inverse of `ADW_EASE_IN_QUINT`.
+ * @ADW_EASE_IN_OUT_QUINT: Quintic tweening, combining `ADW_EASE_IN_QUINT` and
+ * `ADW_EASE_OUT_QUINT`.
+ * @ADW_EASE_IN_SINE: Sine wave tweening.
+ * @ADW_EASE_OUT_SINE: Sine wave tweening, inverse of `ADW_EASE_IN_SINE`.
+ * @ADW_EASE_IN_OUT_SINE: Sine wave tweening, combining `ADW_EASE_IN_SINE` and
+ * `ADW_EASE_OUT_SINE`.
+ * @ADW_EASE_IN_EXPO: Exponential tweening.
+ * @ADW_EASE_OUT_EXPO: Exponential tweening, inverse of `ADW_EASE_IN_EXPO`.
+ * @ADW_EASE_IN_OUT_EXPO: Exponential tweening, combining `ADW_EASE_IN_EXPO` and
+ * `ADW_EASE_OUT_EXPO`.
+ * @ADW_EASE_IN_CIRC: Circular tweening.
+ * @ADW_EASE_OUT_CIRC: Circular tweening, inverse of `ADW_EASE_IN_CIRC`.
+ * @ADW_EASE_IN_OUT_CIRC: Circular tweening, combining `ADW_EASE_IN_CIRC` and
+ * `ADW_EASE_OUT_CIRC`.
+ * @ADW_EASE_IN_ELASTIC: Elastic tweening, with offshoot on start.
+ * @ADW_EASE_OUT_ELASTIC: Elastic tweening, with offshoot on end, inverse of
+ * `ADW_EASE_IN_ELASTIC`.
+ * @ADW_EASE_IN_OUT_ELASTIC: Elastic tweening, with offshoot on both ends,
+ * combining `ADW_EASE_IN_ELASTIC` and `ADW_EASE_OUT_ELASTIC`.
+ * @ADW_EASE_IN_BACK: Overshooting cubic tweening, with backtracking on start.
+ * @ADW_EASE_OUT_BACK: Overshooting cubic tweening, with backtracking on end,
+ * inverse of `ADW_EASE_IN_BACK`.
+ * @ADW_EASE_IN_OUT_BACK: Overshooting cubic tweening, with backtracking on both
+ * ends, combining `ADW_EASE_IN_BACK` and `ADW_EASE_OUT_BACK`.
+ * @ADW_EASE_IN_BOUNCE: Exponentially decaying parabolic (bounce) tweening,
+ * on start.
+ * @ADW_EASE_OUT_BOUNCE: Exponentially decaying parabolic (bounce) tweening,
+ * with bounce on end, inverse of `ADW_EASE_IN_BOUNCE`.
+ * @ADW_EASE_IN_OUT_BOUNCE: Exponentially decaying parabolic (bounce) tweening,
+ * with bounce on both ends, combining `ADW_EASE_IN_BOUNCE` and
+ * `ADW_EASE_OUT_BOUNCE`.
*
* Describes the available easing functions for use with
* [class@Adw.TimedAnimation].
@@ -455,67 +445,67 @@ adw_easing_ease (AdwEasing self,
double value)
{
switch (self) {
- case ADW_EASING_LINEAR:
+ case ADW_LINEAR:
return linear (value, 1);
- case ADW_EASING_EASE_IN_QUAD:
+ case ADW_EASE_IN_QUAD:
return ease_in_quad (value, 1);
- case ADW_EASING_EASE_OUT_QUAD:
+ case ADW_EASE_OUT_QUAD:
return ease_out_quad (value, 1);
- case ADW_EASING_EASE_IN_OUT_QUAD:
+ case ADW_EASE_IN_OUT_QUAD:
return ease_in_out_quad (value, 1);
- case ADW_EASING_EASE_IN_CUBIC:
+ case ADW_EASE_IN_CUBIC:
return ease_in_cubic (value, 1);
- case ADW_EASING_EASE_OUT_CUBIC:
+ case ADW_EASE_OUT_CUBIC:
return ease_out_cubic (value, 1);
- case ADW_EASING_EASE_IN_OUT_CUBIC:
+ case ADW_EASE_IN_OUT_CUBIC:
return ease_in_out_cubic (value, 1);
- case ADW_EASING_EASE_IN_QUART:
+ case ADW_EASE_IN_QUART:
return ease_in_quart (value, 1);
- case ADW_EASING_EASE_OUT_QUART:
+ case ADW_EASE_OUT_QUART:
return ease_out_quart (value, 1);
- case ADW_EASING_EASE_IN_OUT_QUART:
+ case ADW_EASE_IN_OUT_QUART:
return ease_in_out_quart (value, 1);
- case ADW_EASING_EASE_IN_QUINT:
+ case ADW_EASE_IN_QUINT:
return ease_in_quint (value, 1);
- case ADW_EASING_EASE_OUT_QUINT:
+ case ADW_EASE_OUT_QUINT:
return ease_out_quint (value, 1);
- case ADW_EASING_EASE_IN_OUT_QUINT:
+ case ADW_EASE_IN_OUT_QUINT:
return ease_in_out_quint (value, 1);
- case ADW_EASING_EASE_IN_SINE:
+ case ADW_EASE_IN_SINE:
return ease_in_sine (value, 1);
- case ADW_EASING_EASE_OUT_SINE:
+ case ADW_EASE_OUT_SINE:
return ease_out_sine (value, 1);
- case ADW_EASING_EASE_IN_OUT_SINE:
+ case ADW_EASE_IN_OUT_SINE:
return ease_in_out_sine (value, 1);
- case ADW_EASING_EASE_IN_EXPO:
+ case ADW_EASE_IN_EXPO:
return ease_in_expo (value, 1);
- case ADW_EASING_EASE_OUT_EXPO:
+ case ADW_EASE_OUT_EXPO:
return ease_out_expo (value, 1);
- case ADW_EASING_EASE_IN_OUT_EXPO:
+ case ADW_EASE_IN_OUT_EXPO:
return ease_in_out_expo (value, 1);
- case ADW_EASING_EASE_IN_CIRC:
+ case ADW_EASE_IN_CIRC:
return ease_in_circ (value, 1);
- case ADW_EASING_EASE_OUT_CIRC:
+ case ADW_EASE_OUT_CIRC:
return ease_out_circ (value, 1);
- case ADW_EASING_EASE_IN_OUT_CIRC:
+ case ADW_EASE_IN_OUT_CIRC:
return ease_in_out_circ (value, 1);
- case ADW_EASING_EASE_IN_ELASTIC:
+ case ADW_EASE_IN_ELASTIC:
return ease_in_elastic (value, 1);
- case ADW_EASING_EASE_OUT_ELASTIC:
+ case ADW_EASE_OUT_ELASTIC:
return ease_out_elastic (value, 1);
- case ADW_EASING_EASE_IN_OUT_ELASTIC:
+ case ADW_EASE_IN_OUT_ELASTIC:
return ease_in_out_elastic (value, 1);
- case ADW_EASING_EASE_IN_BACK:
+ case ADW_EASE_IN_BACK:
return ease_in_back (value, 1);
- case ADW_EASING_EASE_OUT_BACK:
+ case ADW_EASE_OUT_BACK:
return ease_out_back (value, 1);
- case ADW_EASING_EASE_IN_OUT_BACK:
+ case ADW_EASE_IN_OUT_BACK:
return ease_in_out_back (value, 1);
- case ADW_EASING_EASE_IN_BOUNCE:
+ case ADW_EASE_IN_BOUNCE:
return ease_in_bounce (value, 1);
- case ADW_EASING_EASE_OUT_BOUNCE:
+ case ADW_EASE_OUT_BOUNCE:
return ease_out_bounce (value, 1);
- case ADW_EASING_EASE_IN_OUT_BOUNCE:
+ case ADW_EASE_IN_OUT_BOUNCE:
return ease_in_out_bounce (value, 1);
default:
g_assert_not_reached ();
diff --git a/src/adw-easing.h b/src/adw-easing.h
index cfb82a4b..c9c87f12 100644
--- a/src/adw-easing.h
+++ b/src/adw-easing.h
@@ -20,37 +20,37 @@
G_BEGIN_DECLS
typedef enum {
- ADW_EASING_LINEAR,
- ADW_EASING_EASE_IN_QUAD,
- ADW_EASING_EASE_OUT_QUAD,
- ADW_EASING_EASE_IN_OUT_QUAD,
- ADW_EASING_EASE_IN_CUBIC,
- ADW_EASING_EASE_OUT_CUBIC,
- ADW_EASING_EASE_IN_OUT_CUBIC,
- ADW_EASING_EASE_IN_QUART,
- ADW_EASING_EASE_OUT_QUART,
- ADW_EASING_EASE_IN_OUT_QUART,
- ADW_EASING_EASE_IN_QUINT,
- ADW_EASING_EASE_OUT_QUINT,
- ADW_EASING_EASE_IN_OUT_QUINT,
- ADW_EASING_EASE_IN_SINE,
- ADW_EASING_EASE_OUT_SINE,
- ADW_EASING_EASE_IN_OUT_SINE,
- ADW_EASING_EASE_IN_EXPO,
- ADW_EASING_EASE_OUT_EXPO,
- ADW_EASING_EASE_IN_OUT_EXPO,
- ADW_EASING_EASE_IN_CIRC,
- ADW_EASING_EASE_OUT_CIRC,
- ADW_EASING_EASE_IN_OUT_CIRC,
- ADW_EASING_EASE_IN_ELASTIC,
- ADW_EASING_EASE_OUT_ELASTIC,
- ADW_EASING_EASE_IN_OUT_ELASTIC,
- ADW_EASING_EASE_IN_BACK,
- ADW_EASING_EASE_OUT_BACK,
- ADW_EASING_EASE_IN_OUT_BACK,
- ADW_EASING_EASE_IN_BOUNCE,
- ADW_EASING_EASE_OUT_BOUNCE,
- ADW_EASING_EASE_IN_OUT_BOUNCE,
+ ADW_LINEAR,
+ ADW_EASE_IN_QUAD,
+ ADW_EASE_OUT_QUAD,
+ ADW_EASE_IN_OUT_QUAD,
+ ADW_EASE_IN_CUBIC,
+ ADW_EASE_OUT_CUBIC,
+ ADW_EASE_IN_OUT_CUBIC,
+ ADW_EASE_IN_QUART,
+ ADW_EASE_OUT_QUART,
+ ADW_EASE_IN_OUT_QUART,
+ ADW_EASE_IN_QUINT,
+ ADW_EASE_OUT_QUINT,
+ ADW_EASE_IN_OUT_QUINT,
+ ADW_EASE_IN_SINE,
+ ADW_EASE_OUT_SINE,
+ ADW_EASE_IN_OUT_SINE,
+ ADW_EASE_IN_EXPO,
+ ADW_EASE_OUT_EXPO,
+ ADW_EASE_IN_OUT_EXPO,
+ ADW_EASE_IN_CIRC,
+ ADW_EASE_OUT_CIRC,
+ ADW_EASE_IN_OUT_CIRC,
+ ADW_EASE_IN_ELASTIC,
+ ADW_EASE_OUT_ELASTIC,
+ ADW_EASE_IN_OUT_ELASTIC,
+ ADW_EASE_IN_BACK,
+ ADW_EASE_OUT_BACK,
+ ADW_EASE_IN_OUT_BACK,
+ ADW_EASE_IN_BOUNCE,
+ ADW_EASE_OUT_BOUNCE,
+ ADW_EASE_IN_OUT_BOUNCE,
} AdwEasing;
ADW_AVAILABLE_IN_ALL
diff --git a/src/adw-tab-box.c b/src/adw-tab-box.c
index cce79abd..1effdea5 100644
--- a/src/adw-tab-box.c
+++ b/src/adw-tab-box.c
@@ -1260,7 +1260,7 @@ drag_autoscroll_cb (GtkWidget *widget,
autoscroll_factor = (x - end_threshold) / autoscroll_area;
autoscroll_factor = CLAMP (autoscroll_factor, -1, 1);
- autoscroll_factor = adw_easing_ease (ADW_EASING_EASE_IN_CUBIC,
+ autoscroll_factor = adw_easing_ease (ADW_EASE_IN_CUBIC,
autoscroll_factor);
self->drag_autoscroll_prev_time = time;
diff --git a/src/adw-tab.c b/src/adw-tab.c
index 154a1930..55dad957 100644
--- a/src/adw-tab.c
+++ b/src/adw-tab.c
@@ -845,7 +845,7 @@ adw_tab_init (AdwTab *self)
CLOSE_BTN_ANIMATION_DURATION, target);
adw_timed_animation_set_easing (ADW_TIMED_ANIMATION (self->close_btn_animation),
- ADW_EASING_EASE_IN_OUT_CUBIC);
+ ADW_EASE_IN_OUT_CUBIC);
}
AdwTab *
diff --git a/src/adw-timed-animation.c b/src/adw-timed-animation.c
index 2f32d8f2..f82c377d 100644
--- a/src/adw-timed-animation.c
+++ b/src/adw-timed-animation.c
@@ -293,7 +293,7 @@ adw_timed_animation_class_init (AdwTimedAnimationClass *klass)
"Easing",
"Easing function used in the animation",
ADW_TYPE_EASING,
- ADW_EASING_EASE_OUT_CUBIC,
+ ADW_EASE_OUT_CUBIC,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
/**
@@ -529,7 +529,7 @@ AdwEasing
adw_timed_animation_get_easing (AdwTimedAnimation *self)
{
g_return_val_if_fail (ADW_IS_TIMED_ANIMATION (self),
- ADW_EASING_LINEAR);
+ ADW_LINEAR);
return self->easing;
}
@@ -551,7 +551,7 @@ adw_timed_animation_set_easing (AdwTimedAnimation *self,
AdwEasing easing)
{
g_return_if_fail (ADW_IS_TIMED_ANIMATION (self));
- g_return_if_fail (easing <= ADW_EASING_EASE_IN_OUT_BOUNCE);
+ g_return_if_fail (easing <= ADW_EASE_IN_OUT_BOUNCE);
if (self->easing == easing)
return;
diff --git a/src/adw-toast-overlay.c b/src/adw-toast-overlay.c
index 9ba7f0f1..c22d0781 100644
--- a/src/adw-toast-overlay.c
+++ b/src/adw-toast-overlay.c
@@ -124,7 +124,7 @@ static void
hide_value_cb (ToastInfo *info,
double value)
{
- value = adw_easing_ease (ADW_EASING_EASE_OUT_CUBIC, value);
+ value = adw_easing_ease (ADW_EASE_OUT_CUBIC, value);
gtk_widget_set_opacity (info->widget, value);
gtk_widget_queue_allocate (GTK_WIDGET (info->overlay));
diff --git a/src/gtkprogresstracker.c b/src/gtkprogresstracker.c
index 0339cdd2..21b8dca5 100644
--- a/src/gtkprogresstracker.c
+++ b/src/gtkprogresstracker.c
@@ -244,5 +244,5 @@ gtk_progress_tracker_get_ease_out_cubic (GtkProgressTracker *tracker,
gboolean reversed)
{
double progress = gtk_progress_tracker_get_progress (tracker, reversed);
- return adw_easing_ease (ADW_EASING_EASE_OUT_CUBIC, progress);
+ return adw_easing_ease (ADW_EASE_OUT_CUBIC, progress);
}
diff --git a/tests/test-timed-animation.c b/tests/test-timed-animation.c
index 60650627..679b1f3a 100644
--- a/tests/test-timed-animation.c
+++ b/tests/test-timed-animation.c
@@ -147,16 +147,16 @@ test_adw_animation_easing (void)
g_signal_connect (animation, "notify::easing", G_CALLBACK (notify_cb), NULL);
g_object_get (animation, "easing", &easing, NULL);
- g_assert_cmpint (easing, ==, ADW_EASING_EASE_OUT_CUBIC);
+ g_assert_cmpint (easing, ==, ADW_EASE_OUT_CUBIC);
g_assert_cmpint (notified, ==, 0);
- adw_timed_animation_set_easing (animation, ADW_EASING_EASE_IN_CUBIC);
+ adw_timed_animation_set_easing (animation, ADW_EASE_IN_CUBIC);
g_object_get (animation, "easing", &easing, NULL);
- g_assert_cmpint (easing, ==, ADW_EASING_EASE_IN_CUBIC);
+ g_assert_cmpint (easing, ==, ADW_EASE_IN_CUBIC);
g_assert_cmpint (notified, ==, 1);
- g_object_set (animation, "easing", ADW_EASING_EASE_IN_OUT_CUBIC, NULL);
- g_assert_cmpint (adw_timed_animation_get_easing (animation), ==, ADW_EASING_EASE_IN_OUT_CUBIC);
+ g_object_set (animation, "easing", ADW_EASE_IN_OUT_CUBIC, NULL);
+ g_assert_cmpint (adw_timed_animation_get_easing (animation), ==, ADW_EASE_IN_OUT_CUBIC);
g_assert_cmpint (notified, ==, 2);
g_assert_finalize_object (animation);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
