[libadwaita/wip/exalm/animation-cleanup: 9/10] animation: Rename status to state
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita/wip/exalm/animation-cleanup: 9/10] animation: Rename status to state
- Date: Thu, 18 Nov 2021 13:56:48 +0000 (UTC)
commit 82fb899dc15410b5e789f1e42cb889518e67f67b
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Thu Nov 18 18:56:05 2021 +0500
animation: Rename status to state
Simplify the enum values as well.
src/adw-animation-private.h | 15 ++++++++-------
src/adw-animation.c | 34 +++++++++++++++++-----------------
2 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/src/adw-animation-private.h b/src/adw-animation-private.h
index c1398fbb..73d89580 100644
--- a/src/adw-animation-private.h
+++ b/src/adw-animation-private.h
@@ -34,12 +34,13 @@ typedef enum {
} AdwAnimationInterpolator;
typedef enum {
- ADW_ANIMATION_STATUS_NONE,
- ADW_ANIMATION_STATUS_COMPLETED,
- ADW_ANIMATION_STATUS_RUNNING,
- ADW_ANIMATION_STATUS_PAUSED,
- ADW_ANIMATION_STATUS_CANCELED,
-} AdwAnimationStatus;
+ ADW_ANIMATION_NONE,
+ ADW_ANIMATION_RUNNING,
+ ADW_ANIMATION_PAUSED,
+ ADW_ANIMATION_COMPLETED,
+ ADW_ANIMATION_CANCELED,
+ ADW_ANIMATION_STOPPED,
+} AdwAnimationState;
/**
* AdwAnimation
@@ -65,7 +66,7 @@ AdwAnimationTarget *adw_animation_get_target (AdwAnimation *self);
double adw_animation_get_value (AdwAnimation *self);
-AdwAnimationStatus adw_animation_get_status (AdwAnimation *self);
+AdwAnimationState adw_animation_get_state (AdwAnimation *self);
void adw_animation_start (AdwAnimation *self);
void adw_animation_stop (AdwAnimation *self);
diff --git a/src/adw-animation.c b/src/adw-animation.c
index aed9aea0..a640f15f 100644
--- a/src/adw-animation.c
+++ b/src/adw-animation.c
@@ -29,7 +29,7 @@ typedef struct
AdwAnimationTarget *target;
gpointer user_data;
- AdwAnimationStatus status;
+ AdwAnimationState state;
} AdwAnimationPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (AdwAnimation, adw_animation, G_TYPE_OBJECT)
@@ -43,7 +43,7 @@ enum {
PROP_DURATION,
PROP_INTERPOLATOR,
PROP_TARGET,
- PROP_STATUS,
+ PROP_STATE,
LAST_PROP,
};
@@ -72,11 +72,11 @@ done (AdwAnimation *self)
{
AdwAnimationPrivate *priv = adw_animation_get_instance_private (self);
- if (priv->status == ADW_ANIMATION_STATUS_COMPLETED)
+ if (priv->state == ADW_ANIMATION_COMPLETED)
return;
- priv->status = ADW_ANIMATION_STATUS_COMPLETED;
- g_object_notify_by_pspec (G_OBJECT (self), props[PROP_STATUS]);
+ priv->state = ADW_ANIMATION_COMPLETED;
+ g_object_notify_by_pspec (G_OBJECT (self), props[PROP_STATE]);
g_signal_emit (self, signals[SIGNAL_DONE], 0);
}
@@ -189,8 +189,8 @@ adw_animation_get_property (GObject *object,
g_value_set_object (value, adw_animation_get_target (self));
break;
- case PROP_STATUS:
- g_value_set_enum (value, adw_animation_get_status (self));
+ case PROP_STATE:
+ g_value_set_enum (value, adw_animation_get_state (self));
break;
default:
@@ -305,12 +305,12 @@ adw_animation_class_init (AdwAnimationClass *klass)
ADW_TYPE_ANIMATION_TARGET,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
- props[PROP_STATUS] =
- g_param_spec_enum ("status",
- "Status",
- "Status of the animation",
- ADW_TYPE_ANIMATION_STATUS,
- ADW_ANIMATION_STATUS_NONE,
+ props[PROP_STATE] =
+ g_param_spec_enum ("state",
+ "State",
+ "State of the animation",
+ ADW_TYPE_ANIMATION_STATE,
+ ADW_ANIMATION_NONE,
G_PARAM_READABLE);
g_object_class_install_properties (object_class, LAST_PROP, props);
@@ -391,16 +391,16 @@ adw_animation_get_value (AdwAnimation *self)
return priv->value;
}
-AdwAnimationStatus
-adw_animation_get_status (AdwAnimation *self)
+AdwAnimationState
+adw_animation_get_state (AdwAnimation *self)
{
AdwAnimationPrivate *priv;
- g_return_val_if_fail (ADW_IS_ANIMATION (self), ADW_ANIMATION_STATUS_NONE);
+ g_return_val_if_fail (ADW_IS_ANIMATION (self), ADW_ANIMATION_NONE);
priv = adw_animation_get_instance_private (self);
- return priv->status;
+ return priv->state;
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]