[libhandy/wip/haecker-felix/flap-widget] Reorder functions

[Alexander Mikhaylenko <alexm src gnome org>]

commit 026a70b221ab005241b8257a84b992d04347a947
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Nov 17 15:43:55 2020 +0500

    Reorder functions

 src/hdy-flap.c | 434 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 217 insertions(+), 217 deletions(-)
---
diff --git a/src/hdy-flap.c b/src/hdy-flap.c
index 2caf5f3f..616f4ba0 100644
--- a/src/hdy-flap.c
+++ b/src/hdy-flap.c
@@ -102,96 +102,6 @@ set_orientation (HdyFlap        *self,
   g_object_notify (G_OBJECT (self), "orientation");
 }
 
-static void
-hdy_flap_get_property (GObject    *object,
-                       guint       prop_id,
-                       GValue     *value,
-                       GParamSpec *pspec)
-{
-  HdyFlap *self = HDY_FLAP (object);
-
-  switch (prop_id) {
-  case PROP_FLAP:
-    g_value_set_object (value, hdy_flap_get_flap (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));
-    break;
-  case PROP_FOLDED:
-    g_value_set_boolean (value, hdy_flap_get_folded (self));
-    break;
-  case PROP_OVERLAY_DURATION:
-    g_value_set_int (value, hdy_flap_get_overlay_duration(self));
-    break;
-  case PROP_REVEAL_DURATION:
-    g_value_set_int (value, hdy_flap_get_reveal_duration(self));
-    break;
-  case PROP_ORIENTATION:
-    g_value_set_enum (value, self->orientation);
-    break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-  }
-}
-
-static void
-hdy_flap_set_property (GObject      *object,
-                       guint         prop_id,
-                       const GValue *value,
-                       GParamSpec   *pspec)
-{
-  HdyFlap *self = HDY_FLAP (object);
-
-  switch (prop_id) {
-  case PROP_FLAP:
-    hdy_flap_set_flap (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));
-    break;
-  case PROP_OVERLAY_DURATION:
-    hdy_flap_set_overlay_duration (self, g_value_get_int (value));
-    break;
-  case PROP_REVEAL_DURATION:
-    hdy_flap_set_reveal_duration (self, g_value_get_int (value));
-    break;
-  case PROP_ORIENTATION:
-    set_orientation (self, g_value_get_enum (value));
-    break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-  }
-}
-
-static void
-hdy_flap_finalize (GObject *object)
-{
-  HdyFlap *self = HDY_FLAP (object);
-
-  g_clear_object (&self->shadow_helper);
-  g_clear_object (&self->tracker);
-
-  G_OBJECT_CLASS (hdy_flap_parent_class)->finalize (object);
-}
-
 static void
 overlay_animation_value_cb (gdouble  value,
                             HdyFlap *self)
@@ -328,74 +238,6 @@ set_folded (HdyFlap  *self,
   g_object_notify_by_pspec (G_OBJECT (self), props[PROP_FOLDED]);
 }
 
-/* This private method is prefixed by the call name because it will be a virtual
- * method in GTK 4.
- */
-static void
-hdy_flap_measure (GtkWidget      *widget,
-                  GtkOrientation  orientation,
-                  gint            for_size,
-                  gint           *minimum,
-                  gint           *natural,
-                  gint           *minimum_baseline,
-                  gint           *natural_baseline)
-{
-  HdyFlap *self = HDY_FLAP (widget);
-  GtkWidget *content = gtk_bin_get_child (GTK_BIN (self));
-
-  gint content_min = 0, content_nat = 0;
-  gint flap_min = 0, flap_nat = 0;
-
-  if (minimum)
-    *minimum = 0;
-  if (natural)
-    *natural = 0;
-  if (minimum_baseline)
-    *minimum_baseline = -1;
-  if (natural_baseline)
-    *natural_baseline = -1;
-
-  if (orientation == GTK_ORIENTATION_VERTICAL) {
-    if (content)
-      gtk_widget_get_preferred_height (content, &content_min, &content_nat);
-
-    if (self->flap)
-      gtk_widget_get_preferred_height (self->flap, &flap_min, &flap_nat);
-
-    if (self->orientation == GTK_ORIENTATION_VERTICAL &&
-        self->fold_policy != HDY_FLAP_FOLD_POLICY_AUTO) {
-      if (minimum)
-        *minimum = MAX (content_min + adjust_for_overlay (self, flap_min), flap_min);
-
-      if (natural)
-        *natural = MAX (content_nat + adjust_for_overlay (self, flap_nat), flap_nat);
-
-      return;
-    }
-  } else {
-    if (content)
-      gtk_widget_get_preferred_width (content, &content_min, &content_nat);
-
-    if (self->flap)
-      gtk_widget_get_preferred_width (self->flap, &flap_min, &flap_nat);
-
-    if (self->orientation == GTK_ORIENTATION_HORIZONTAL &&
-        self->fold_policy != HDY_FLAP_FOLD_POLICY_AUTO) {
-
-      if (minimum)
-        *minimum = MAX (content_min + adjust_for_overlay (self, flap_min), flap_min);
-
-      if (natural)
-        *natural = MAX (content_nat + adjust_for_overlay (self, flap_nat), flap_nat);
-
-      return;
-    }
-  }
-
-  *minimum = MAX (content_min, flap_min);
-  *natural = MAX (content_nat, flap_nat);
-}
-
 static gint
 get_flap_size (HdyFlap        *self,
                GtkAllocation  *widget_alloc,
@@ -542,6 +384,74 @@ hdy_flap_size_allocate (GtkWidget     *widget,
   gtk_widget_set_clip (widget, alloc);
 }
 
+/* This private method is prefixed by the call name because it will be a virtual
+ * method in GTK 4.
+ */
+static void
+hdy_flap_measure (GtkWidget      *widget,
+                  GtkOrientation  orientation,
+                  gint            for_size,
+                  gint           *minimum,
+                  gint           *natural,
+                  gint           *minimum_baseline,
+                  gint           *natural_baseline)
+{
+  HdyFlap *self = HDY_FLAP (widget);
+  GtkWidget *content = gtk_bin_get_child (GTK_BIN (self));
+
+  gint content_min = 0, content_nat = 0;
+  gint flap_min = 0, flap_nat = 0;
+
+  if (minimum)
+    *minimum = 0;
+  if (natural)
+    *natural = 0;
+  if (minimum_baseline)
+    *minimum_baseline = -1;
+  if (natural_baseline)
+    *natural_baseline = -1;
+
+  if (orientation == GTK_ORIENTATION_VERTICAL) {
+    if (content)
+      gtk_widget_get_preferred_height (content, &content_min, &content_nat);
+
+    if (self->flap)
+      gtk_widget_get_preferred_height (self->flap, &flap_min, &flap_nat);
+
+    if (self->orientation == GTK_ORIENTATION_VERTICAL &&
+        self->fold_policy != HDY_FLAP_FOLD_POLICY_AUTO) {
+      if (minimum)
+        *minimum = MAX (content_min + adjust_for_overlay (self, flap_min), flap_min);
+
+      if (natural)
+        *natural = MAX (content_nat + adjust_for_overlay (self, flap_nat), flap_nat);
+
+      return;
+    }
+  } else {
+    if (content)
+      gtk_widget_get_preferred_width (content, &content_min, &content_nat);
+
+    if (self->flap)
+      gtk_widget_get_preferred_width (self->flap, &flap_min, &flap_nat);
+
+    if (self->orientation == GTK_ORIENTATION_HORIZONTAL &&
+        self->fold_policy != HDY_FLAP_FOLD_POLICY_AUTO) {
+
+      if (minimum)
+        *minimum = MAX (content_min + adjust_for_overlay (self, flap_min), flap_min);
+
+      if (natural)
+        *natural = MAX (content_nat + adjust_for_overlay (self, flap_nat), flap_nat);
+
+      return;
+    }
+  }
+
+  *minimum = MAX (content_min, flap_min);
+  *natural = MAX (content_nat, flap_nat);
+}
+
 static void
 hdy_flap_get_preferred_width_for_height (GtkWidget *widget,
                                          gint       height,
@@ -674,77 +584,94 @@ hdy_flap_remove (GtkContainer *container,
     GTK_CONTAINER_CLASS (hdy_flap_parent_class)->remove (container, widget);
 }
 
-static HdySwipeTracker *
-hdy_flap_get_swipe_tracker (HdySwipeable *swipeable)
-{
-  HdyFlap *self = HDY_FLAP (swipeable);
-
-  return self->tracker;
-}
-
-static gdouble
-hdy_flap_get_distance (HdySwipeable *swipeable)
-{
-  HdyFlap *self = HDY_FLAP (swipeable);
-
-  if (!self->flap)
-    return 0;
-
-  if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
-    return gtk_widget_get_allocated_width (GTK_WIDGET (self->flap));
-  else
-    return gtk_widget_get_allocated_height (GTK_WIDGET (self->flap));
-}
-
-static gdouble *
-hdy_flap_get_snap_points (HdySwipeable *swipeable,
-                          gint         *n_snap_points)
-{
-  gdouble *points = g_new0 (gdouble, 2);
-
-  if (n_snap_points)
-    *n_snap_points = 2;
-
-  points[0] = 0;
-  points[1] = 1;
-
-  return points;
-}
-
-static gdouble
-hdy_flap_get_progress (HdySwipeable *swipeable)
+static void
+hdy_flap_get_property (GObject    *object,
+                       guint       prop_id,
+                       GValue     *value,
+                       GParamSpec *pspec)
 {
-  HdyFlap *self = HDY_FLAP (swipeable);
+  HdyFlap *self = HDY_FLAP (object);
 
-  return self->reveal_progress;
+  switch (prop_id) {
+  case PROP_FLAP:
+    g_value_set_object (value, hdy_flap_get_flap (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));
+    break;
+  case PROP_FOLDED:
+    g_value_set_boolean (value, hdy_flap_get_folded (self));
+    break;
+  case PROP_OVERLAY_DURATION:
+    g_value_set_int (value, hdy_flap_get_overlay_duration(self));
+    break;
+  case PROP_REVEAL_DURATION:
+    g_value_set_int (value, hdy_flap_get_reveal_duration(self));
+    break;
+  case PROP_ORIENTATION:
+    g_value_set_enum (value, self->orientation);
+    break;
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
 }
 
-static gdouble
-hdy_flap_get_cancel_progress (HdySwipeable *swipeable)
+static void
+hdy_flap_set_property (GObject      *object,
+                       guint         prop_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
 {
-  HdyFlap *self = HDY_FLAP (swipeable);
+  HdyFlap *self = HDY_FLAP (object);
 
-  return round (self->reveal_progress);
+  switch (prop_id) {
+  case PROP_FLAP:
+    hdy_flap_set_flap (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));
+    break;
+  case PROP_OVERLAY_DURATION:
+    hdy_flap_set_overlay_duration (self, g_value_get_int (value));
+    break;
+  case PROP_REVEAL_DURATION:
+    hdy_flap_set_reveal_duration (self, g_value_get_int (value));
+    break;
+  case PROP_ORIENTATION:
+    set_orientation (self, g_value_get_enum (value));
+    break;
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+  }
 }
 
 static void
-hdy_flap_get_swipe_area (HdySwipeable           *swipeable,
-                         HdyNavigationDirection  navigation_direction,
-                         gboolean                is_drag,
-                         GdkRectangle           *rect)
+hdy_flap_finalize (GObject *object)
 {
-  HdyFlap *self = HDY_FLAP (swipeable);
-  gint width, height;
+  HdyFlap *self = HDY_FLAP (object);
 
-  if (!self->flap) {
-    rect->x = 0;
-    rect->y = 0;
-    rect->width = 0;
-    rect->height = 0;
-  }
+  g_clear_object (&self->shadow_helper);
+  g_clear_object (&self->tracker);
 
-  width = gtk_widget_get_allocated_width (self->flap);
-  height = gtk_widget_get_allocated_height (self->flap);
+  G_OBJECT_CLASS (hdy_flap_parent_class)->finalize (object);
 }
 
 static void
@@ -903,6 +830,79 @@ hdy_flap_init (HdyFlap *self)
   update_swipe_tracker (self);
 }
 
+static HdySwipeTracker *
+hdy_flap_get_swipe_tracker (HdySwipeable *swipeable)
+{
+  HdyFlap *self = HDY_FLAP (swipeable);
+
+  return self->tracker;
+}
+
+static gdouble
+hdy_flap_get_distance (HdySwipeable *swipeable)
+{
+  HdyFlap *self = HDY_FLAP (swipeable);
+
+  if (!self->flap)
+    return 0;
+
+  if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
+    return gtk_widget_get_allocated_width (GTK_WIDGET (self->flap));
+  else
+    return gtk_widget_get_allocated_height (GTK_WIDGET (self->flap));
+}
+
+static gdouble *
+hdy_flap_get_snap_points (HdySwipeable *swipeable,
+                          gint         *n_snap_points)
+{
+  gdouble *points = g_new0 (gdouble, 2);
+
+  if (n_snap_points)
+    *n_snap_points = 2;
+
+  points[0] = 0;
+  points[1] = 1;
+
+  return points;
+}
+
+static gdouble
+hdy_flap_get_progress (HdySwipeable *swipeable)
+{
+  HdyFlap *self = HDY_FLAP (swipeable);
+
+  return self->reveal_progress;
+}
+
+static gdouble
+hdy_flap_get_cancel_progress (HdySwipeable *swipeable)
+{
+  HdyFlap *self = HDY_FLAP (swipeable);
+
+  return round (self->reveal_progress);
+}
+
+static void
+hdy_flap_get_swipe_area (HdySwipeable           *swipeable,
+                         HdyNavigationDirection  navigation_direction,
+                         gboolean                is_drag,
+                         GdkRectangle           *rect)
+{
+  HdyFlap *self = HDY_FLAP (swipeable);
+  gint width, height;
+
+  if (!self->flap) {
+    rect->x = 0;
+    rect->y = 0;
+    rect->width = 0;
+    rect->height = 0;
+  }
+
+  width = gtk_widget_get_allocated_width (self->flap);
+  height = gtk_widget_get_allocated_height (self->flap);
+}
+
 static void
 hdy_flap_swipeable_init (HdySwipeableInterface *iface)
 {