[libhandy/wip/haecker-felix/flap-widget] Rearrange functions
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libhandy/wip/haecker-felix/flap-widget] Rearrange functions
- Date: Tue, 24 Nov 2020 09:26:36 +0000 (UTC)
commit 609815e3d2486dc2bcce96b058128b300c95f60d
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Tue Nov 24 14:24:55 2020 +0500
Rearrange functions
src/hdy-flap.c | 304 ++++++++++++++++++++++++++++-----------------------------
src/hdy-flap.h | 30 +++---
2 files changed, 167 insertions(+), 167 deletions(-)
---
diff --git a/src/hdy-flap.c b/src/hdy-flap.c
index f6d2c760..fc20848e 100644
--- a/src/hdy-flap.c
+++ b/src/hdy-flap.c
@@ -104,14 +104,14 @@ enum {
PROP_0,
PROP_FLAP,
PROP_SEPARATOR,
- PROP_FOLD_POLICY,
PROP_FLAP_POSITION,
PROP_REVEAL_FLAP,
- PROP_LOCKED,
- PROP_FOLDED,
- PROP_FOLD_DURATION,
PROP_REVEAL_DURATION,
PROP_REVEAL_PROGRESS,
+ PROP_FOLD_POLICY,
+ PROP_FOLD_DURATION,
+ PROP_FOLDED,
+ PROP_LOCKED,
PROP_TRANSITION_TYPE,
PROP_CLICK_TO_CLOSE,
PROP_SWIPE_TO_OPEN,
@@ -1246,29 +1246,29 @@ hdy_flap_get_property (GObject *object,
case PROP_SEPARATOR:
g_value_set_object (value, hdy_flap_get_separator (self));
break;
- case PROP_FOLD_POLICY:
- g_value_set_enum (value, hdy_flap_get_fold_policy (self));
- break;
case PROP_FLAP_POSITION:
g_value_set_enum (value, hdy_flap_get_flap_position (self));
break;
case PROP_REVEAL_FLAP:
g_value_set_boolean (value, hdy_flap_get_reveal_flap (self));
break;
- case PROP_LOCKED:
- g_value_set_boolean (value, hdy_flap_get_locked (self));
+ case PROP_REVEAL_DURATION:
+ g_value_set_uint (value, hdy_flap_get_reveal_duration (self));
break;
- case PROP_FOLDED:
- g_value_set_boolean (value, hdy_flap_get_folded (self));
+ case PROP_REVEAL_PROGRESS:
+ g_value_set_double (value, hdy_flap_get_reveal_progress (self));
+ break;
+ case PROP_FOLD_POLICY:
+ g_value_set_enum (value, hdy_flap_get_fold_policy (self));
break;
case PROP_FOLD_DURATION:
g_value_set_uint (value, hdy_flap_get_fold_duration (self));
break;
- case PROP_REVEAL_DURATION:
- g_value_set_uint (value, hdy_flap_get_reveal_duration (self));
+ case PROP_FOLDED:
+ g_value_set_boolean (value, hdy_flap_get_folded (self));
break;
- case PROP_REVEAL_PROGRESS:
- g_value_set_double (value, hdy_flap_get_reveal_progress (self));
+ case PROP_LOCKED:
+ g_value_set_boolean (value, hdy_flap_get_locked (self));
break;
case PROP_TRANSITION_TYPE:
g_value_set_enum (value, hdy_flap_get_transition_type (self));
@@ -1305,23 +1305,23 @@ hdy_flap_set_property (GObject *object,
case PROP_SEPARATOR:
hdy_flap_set_separator (self, g_value_get_object (value));
break;
- case PROP_FOLD_POLICY:
- hdy_flap_set_fold_policy (self, g_value_get_enum (value));
- break;
case PROP_FLAP_POSITION:
hdy_flap_set_flap_position (self, g_value_get_enum (value));
break;
case PROP_REVEAL_FLAP:
hdy_flap_set_reveal_flap (self, g_value_get_boolean (value));
break;
- case PROP_LOCKED:
- hdy_flap_set_locked (self, g_value_get_boolean (value));
+ case PROP_REVEAL_DURATION:
+ hdy_flap_set_reveal_duration (self, g_value_get_uint (value));
+ break;
+ case PROP_FOLD_POLICY:
+ hdy_flap_set_fold_policy (self, g_value_get_enum (value));
break;
case PROP_FOLD_DURATION:
hdy_flap_set_fold_duration (self, g_value_get_uint (value));
break;
- case PROP_REVEAL_DURATION:
- hdy_flap_set_reveal_duration (self, g_value_get_uint (value));
+ case PROP_LOCKED:
+ hdy_flap_set_locked (self, g_value_get_boolean (value));
break;
case PROP_TRANSITION_TYPE:
hdy_flap_set_transition_type (self, g_value_get_enum (value));
@@ -1404,19 +1404,6 @@ hdy_flap_class_init (HdyFlapClass *klass)
GTK_TYPE_WIDGET,
G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
- /**
- * HdyFlap:fold-policy:
- *
- * Since: 1.1
- */
- props[PROP_FOLD_POLICY] =
- g_param_spec_enum ("fold-policy",
- _("Fold Policy"),
- _("Fold Policy"),
- HDY_TYPE_FLAP_FOLD_POLICY,
- HDY_FLAP_FOLD_POLICY_AUTO,
- G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
-
/**
* HdyFlap:flap-position:
*
@@ -1443,29 +1430,43 @@ hdy_flap_class_init (HdyFlapClass *klass)
G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
/**
- * HdyFlap:locked:
+ * HdyFlap:reveal-duration:
*
* Since: 1.1
*/
- props[PROP_LOCKED] =
- g_param_spec_boolean ("locked",
- _("Locked"),
- _("Locked"),
- FALSE,
- G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+ props[PROP_REVEAL_DURATION] =
+ g_param_spec_uint ("reveal-duration",
+ _("Reveal Duration"),
+ _("Reveal Duration"),
+ 0, G_MAXINT,
+ 250,
+ G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
/**
- * HdyFlap:folded:
+ * HdyFlap:reveal-progress:
*
* Since: 1.1
*/
- props[PROP_FOLDED] =
- g_param_spec_boolean ("folded",
- _("Folded"),
- _("Folded"),
- FALSE,
+ props[PROP_REVEAL_PROGRESS] =
+ g_param_spec_double ("reveal-progress",
+ _("Reveal progress"),
+ _("Reveal progress"),
+ 0.0, 1.0, 1.0,
G_PARAM_READABLE);
+ /**
+ * HdyFlap:fold-policy:
+ *
+ * Since: 1.1
+ */
+ props[PROP_FOLD_POLICY] =
+ g_param_spec_enum ("fold-policy",
+ _("Fold Policy"),
+ _("Fold Policy"),
+ HDY_TYPE_FLAP_FOLD_POLICY,
+ HDY_FLAP_FOLD_POLICY_AUTO,
+ G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
/**
* HdyFlap:fold-duration:
*
@@ -1480,29 +1481,28 @@ hdy_flap_class_init (HdyFlapClass *klass)
G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
/**
- * HdyFlap:reveal-duration:
+ * HdyFlap:folded:
*
* Since: 1.1
*/
- props[PROP_REVEAL_DURATION] =
- g_param_spec_uint ("reveal-duration",
- _("Reveal Duration"),
- _("Reveal Duration"),
- 0, G_MAXINT,
- 250,
- G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+ props[PROP_FOLDED] =
+ g_param_spec_boolean ("folded",
+ _("Folded"),
+ _("Folded"),
+ FALSE,
+ G_PARAM_READABLE);
/**
- * HdyFlap:reveal-progress:
+ * HdyFlap:locked:
*
* Since: 1.1
*/
- props[PROP_REVEAL_PROGRESS] =
- g_param_spec_double ("reveal-progress",
- _("Reveal progress"),
- _("Reveal progress"),
- 0.0, 1.0, 1.0,
- G_PARAM_READABLE);
+ props[PROP_LOCKED] =
+ g_param_spec_boolean ("locked",
+ _("Locked"),
+ _("Locked"),
+ FALSE,
+ G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
/**
* HdyFlap:transition-type:
@@ -1903,49 +1903,6 @@ hdy_flap_set_separator (HdyFlap *self,
g_object_notify_by_pspec (G_OBJECT (self), props[PROP_SEPARATOR]);
}
-/**
- * hdy_flap_get_fold_policy:
- * @self: a #HdyFlap
- *
- * Returns: current fold policy.
- *
- * Since: 1.1
- */
-HdyFlapFoldPolicy
-hdy_flap_get_fold_policy (HdyFlap *self)
-{
- g_return_val_if_fail (HDY_IS_FLAP (self), HDY_FLAP_FOLD_POLICY_NEVER);
-
- return self->fold_policy;
-}
-
-/**
- * hdy_flap_set_fold_policy:
- * @self: a #HdyFlap
- * @policy: Flap fold policy
- *
- * Since: 1.1
- */
-void
-hdy_flap_set_fold_policy (HdyFlap *self,
- HdyFlapFoldPolicy policy)
-{
- g_return_if_fail (HDY_IS_FLAP (self));
-
- if (self->fold_policy == policy)
- return;
-
- self->fold_policy = policy;
-
- if (self->fold_policy == HDY_FLAP_FOLD_POLICY_ALWAYS)
- set_folded (self, TRUE);
-
- if (self->fold_policy == HDY_FLAP_FOLD_POLICY_NEVER)
- set_folded (self, FALSE);
-
- g_object_notify_by_pspec (G_OBJECT (self), props[PROP_FOLD_POLICY]);
-}
-
/**
* hdy_flap_get_flap_position:
* @self: a #HdyFlap
@@ -2020,58 +1977,99 @@ hdy_flap_set_reveal_flap (HdyFlap *self,
}
/**
- * hdy_flap_get_locked:
+ * hdy_flap_get_reveal_duration:
* @self: a #HdyFlap
*
- * Returns: %TRUE if flap widget is locked.
+ * Returns: current reveal animation duration.
*
* Since: 1.1
*/
-gboolean
-hdy_flap_get_locked (HdyFlap *self)
+guint
+hdy_flap_get_reveal_duration (HdyFlap *self)
{
- g_return_val_if_fail (HDY_IS_FLAP (self), FALSE);
+ g_return_val_if_fail (HDY_IS_FLAP (self), 0);
- return self->locked;
+ return self->reveal_duration;
}
/**
- * hdy_flap_set_locked:
+ * hdy_flap_set_reveal_duration:
* @self: a #HdyFlap
- * @locked: Reveal flap
+ * @duration: Duration for reveal animation
*
* Since: 1.1
*/
void
-hdy_flap_set_locked (HdyFlap *self,
- gboolean locked)
+hdy_flap_set_reveal_duration (HdyFlap *self,
+ guint duration)
{
g_return_if_fail (HDY_IS_FLAP (self));
- locked = !!locked;
-
- if (self->locked == locked)
+ if (self->reveal_duration == duration)
return;
- self->locked = locked;
+ self->reveal_duration = duration;
- g_object_notify_by_pspec (G_OBJECT (self), props[PROP_LOCKED]);
+ g_object_notify_by_pspec (G_OBJECT (self), props[PROP_REVEAL_DURATION]);
}
/**
- * hdy_flap_get_folded:
+ * hdy_flap_get_reveal_progress:
* @self: a #HdyFlap
*
- * Returns: %TRUE if flap widget is folded.
+ * Returns: %TRUE if flap widget is click to close.
*
* Since: 1.1
*/
-gboolean
-hdy_flap_get_folded (HdyFlap *self)
+gdouble
+hdy_flap_get_reveal_progress (HdyFlap *self)
{
- g_return_val_if_fail (HDY_IS_FLAP (self), FALSE);
+ g_return_val_if_fail (HDY_IS_FLAP (self), 0.0);
- return self->folded;
+ return self->reveal_progress;
+}
+
+/**
+ * hdy_flap_get_fold_policy:
+ * @self: a #HdyFlap
+ *
+ * Returns: current fold policy.
+ *
+ * Since: 1.1
+ */
+HdyFlapFoldPolicy
+hdy_flap_get_fold_policy (HdyFlap *self)
+{
+ g_return_val_if_fail (HDY_IS_FLAP (self), HDY_FLAP_FOLD_POLICY_NEVER);
+
+ return self->fold_policy;
+}
+
+/**
+ * hdy_flap_set_fold_policy:
+ * @self: a #HdyFlap
+ * @policy: Flap fold policy
+ *
+ * Since: 1.1
+ */
+void
+hdy_flap_set_fold_policy (HdyFlap *self,
+ HdyFlapFoldPolicy policy)
+{
+ g_return_if_fail (HDY_IS_FLAP (self));
+
+ if (self->fold_policy == policy)
+ return;
+
+ self->fold_policy = policy;
+
+ if (self->fold_policy == HDY_FLAP_FOLD_POLICY_ALWAYS)
+ set_folded (self, TRUE);
+
+ if (self->fold_policy == HDY_FLAP_FOLD_POLICY_NEVER)
+ set_folded (self, FALSE);
+
+ g_object_notify_by_pspec (G_OBJECT (self), props[PROP_FOLD_POLICY]);
}
/**
@@ -2112,56 +2110,58 @@ hdy_flap_set_fold_duration (HdyFlap *self,
}
/**
- * hdy_flap_get_reveal_duration:
+ * hdy_flap_get_folded:
* @self: a #HdyFlap
*
- * Returns: current reveal animation duration.
+ * Returns: %TRUE if flap widget is folded.
*
* Since: 1.1
*/
-guint
-hdy_flap_get_reveal_duration (HdyFlap *self)
+gboolean
+hdy_flap_get_folded (HdyFlap *self)
{
- g_return_val_if_fail (HDY_IS_FLAP (self), 0);
+ g_return_val_if_fail (HDY_IS_FLAP (self), FALSE);
- return self->reveal_duration;
+ return self->folded;
}
/**
- * hdy_flap_set_reveal_duration:
+ * hdy_flap_get_locked:
* @self: a #HdyFlap
- * @duration: Duration for reveal animation
+ *
+ * Returns: %TRUE if flap widget is locked.
*
* Since: 1.1
*/
-void
-hdy_flap_set_reveal_duration (HdyFlap *self,
- guint duration)
+gboolean
+hdy_flap_get_locked (HdyFlap *self)
{
- g_return_if_fail (HDY_IS_FLAP (self));
-
- if (self->reveal_duration == duration)
- return;
-
- self->reveal_duration = duration;
+ g_return_val_if_fail (HDY_IS_FLAP (self), FALSE);
- g_object_notify_by_pspec (G_OBJECT (self), props[PROP_REVEAL_DURATION]);
+ return self->locked;
}
/**
- * hdy_flap_get_reveal_progress:
+ * hdy_flap_set_locked:
* @self: a #HdyFlap
- *
- * Returns: %TRUE if flap widget is click to close.
+ * @locked: Reveal flap
*
* Since: 1.1
*/
-gdouble
-hdy_flap_get_reveal_progress (HdyFlap *self)
+void
+hdy_flap_set_locked (HdyFlap *self,
+ gboolean locked)
{
- g_return_val_if_fail (HDY_IS_FLAP (self), 0.0);
+ g_return_if_fail (HDY_IS_FLAP (self));
- return self->reveal_progress;
+ locked = !!locked;
+
+ if (self->locked == locked)
+ return;
+
+ self->locked = locked;
+
+ g_object_notify_by_pspec (G_OBJECT (self), props[PROP_LOCKED]);
}
/**
diff --git a/src/hdy-flap.h b/src/hdy-flap.h
index 73e816ba..343fecf4 100644
--- a/src/hdy-flap.h
+++ b/src/hdy-flap.h
@@ -50,12 +50,6 @@ HDY_AVAILABLE_IN_1_1
void hdy_flap_set_separator (HdyFlap *self,
GtkWidget *separator);
-HDY_AVAILABLE_IN_1_1
-HdyFlapFoldPolicy hdy_flap_get_fold_policy (HdyFlap *self);
-HDY_AVAILABLE_IN_1_1
-void hdy_flap_set_fold_policy (HdyFlap *self,
- HdyFlapFoldPolicy policy);
-
HDY_AVAILABLE_IN_1_1
GtkPackType hdy_flap_get_flap_position (HdyFlap *self);
HDY_AVAILABLE_IN_1_1
@@ -69,13 +63,19 @@ void hdy_flap_set_reveal_flap (HdyFlap *self,
gboolean reveal_flap);
HDY_AVAILABLE_IN_1_1
-gboolean hdy_flap_get_locked (HdyFlap *self);
+guint hdy_flap_get_reveal_duration (HdyFlap *self);
HDY_AVAILABLE_IN_1_1
-void hdy_flap_set_locked (HdyFlap *self,
- gboolean locked);
+void hdy_flap_set_reveal_duration (HdyFlap *self,
+ guint duration);
HDY_AVAILABLE_IN_1_1
-gboolean hdy_flap_get_folded (HdyFlap *self);
+gdouble hdy_flap_get_reveal_progress (HdyFlap *self);
+
+HDY_AVAILABLE_IN_1_1
+HdyFlapFoldPolicy hdy_flap_get_fold_policy (HdyFlap *self);
+HDY_AVAILABLE_IN_1_1
+void hdy_flap_set_fold_policy (HdyFlap *self,
+ HdyFlapFoldPolicy policy);
HDY_AVAILABLE_IN_1_1
guint hdy_flap_get_fold_duration (HdyFlap *self);
@@ -84,13 +84,13 @@ void hdy_flap_set_fold_duration (HdyFlap *self,
guint duration);
HDY_AVAILABLE_IN_1_1
-guint hdy_flap_get_reveal_duration (HdyFlap *self);
-HDY_AVAILABLE_IN_1_1
-void hdy_flap_set_reveal_duration (HdyFlap *self,
- guint duration);
+gboolean hdy_flap_get_folded (HdyFlap *self);
HDY_AVAILABLE_IN_1_1
-gdouble hdy_flap_get_reveal_progress (HdyFlap *self);
+gboolean hdy_flap_get_locked (HdyFlap *self);
+HDY_AVAILABLE_IN_1_1
+void hdy_flap_set_locked (HdyFlap *self,
+ gboolean locked);
HDY_AVAILABLE_IN_1_1
HdyFlapTransitionType hdy_flap_get_transition_type (HdyFlap *self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]