[libhandy/wip/haecker-felix/flap-widget] overlay -> fold

[Alexander Mikhaylenko <alexm src gnome org>]

commit 4a9c3c60b8d462f2cf13352db6040a5cfd18c2fd
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Wed Nov 18 14:50:08 2020 +0500

    overlay -> fold

 debian/libhandy-1-0.symbols |  4 +--
 src/hdy-flap.c              | 76 ++++++++++++++++++++++-----------------------
 src/hdy-flap.h              |  6 ++--
 3 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/debian/libhandy-1-0.symbols b/debian/libhandy-1-0.symbols
index 691adc5c..719ab553 100644
--- a/debian/libhandy-1-0.symbols
+++ b/debian/libhandy-1-0.symbols
@@ -123,19 +123,19 @@ libhandy-1.so.0 libhandy-1-0 #MINVER#
  hdy_flap_fold_policy_get_type@LIBHANDY_1_0 1.1.0
  hdy_flap_get_flap@LIBHANDY_1_0 1.1.0
  hdy_flap_get_flap_position@LIBHANDY_1_0 1.1.0
+ hdy_flap_get_fold_duration@LIBHANDY_1_0 1.1.0
  hdy_flap_get_fold_policy@LIBHANDY_1_0 1.1.0
  hdy_flap_get_folded@LIBHANDY_1_0 1.1.0
  hdy_flap_get_locked@LIBHANDY_1_0 1.1.0
- hdy_flap_get_overlay_duration@LIBHANDY_1_0 1.1.0
  hdy_flap_get_reveal_duration@LIBHANDY_1_0 1.1.0
  hdy_flap_get_reveal_flap@LIBHANDY_1_0 1.1.0
  hdy_flap_get_type@LIBHANDY_1_0 1.1.0
  hdy_flap_new@LIBHANDY_1_0 1.1.0
  hdy_flap_set_flap@LIBHANDY_1_0 1.1.0
  hdy_flap_set_flap_position@LIBHANDY_1_0 1.1.0
+ hdy_flap_set_fold_duration@LIBHANDY_1_0 1.1.0
  hdy_flap_set_fold_policy@LIBHANDY_1_0 1.1.0
  hdy_flap_set_locked@LIBHANDY_1_0 1.1.0
- hdy_flap_set_overlay_duration@LIBHANDY_1_0 1.1.0
  hdy_flap_set_reveal_duration@LIBHANDY_1_0 1.1.0
  hdy_flap_set_reveal_flap@LIBHANDY_1_0 1.1.0
  hdy_get_enable_animations@LIBHANDY_1_0 0.0.11
diff --git a/src/hdy-flap.c b/src/hdy-flap.c
index aba6a02f..3ffc63d0 100644
--- a/src/hdy-flap.c
+++ b/src/hdy-flap.c
@@ -47,9 +47,9 @@ struct _HdyFlap
   gboolean locked;
   gboolean folded;
 
-  guint overlay_duration;
-  gdouble overlay_progress;
-  HdyAnimation *overlay_animation;
+  guint fold_duration;
+  gdouble fold_progress;
+  HdyAnimation *fold_animation;
 
   guint reveal_duration;
   gdouble reveal_progress;
@@ -81,7 +81,7 @@ enum {
   PROP_LOCKED,
   PROP_FOLDED,
 
-  PROP_OVERLAY_DURATION,
+  PROP_FOLD_DURATION,
   PROP_REVEAL_DURATION,
 
   /* Overridden properties */
@@ -131,37 +131,37 @@ set_reveal_progress (HdyFlap *self,
 }
 
 static void
-overlay_animation_value_cb (gdouble  value,
+fold_animation_value_cb (gdouble  value,
                             HdyFlap *self)
 {
-  self->overlay_progress = value;
+  self->fold_progress = value;
 
   gtk_widget_queue_resize (GTK_WIDGET (self));
 }
 
 static void
-overlay_animation_done_cb (HdyFlap *self)
+fold_animation_done_cb (HdyFlap *self)
 {
-  g_clear_pointer (&self->overlay_animation, hdy_animation_unref);
+  g_clear_pointer (&self->fold_animation, hdy_animation_unref);
 }
 
 static void
 animate_overlay (HdyFlap *self)
 {
-  if (self->overlay_animation)
-    hdy_animation_stop (self->overlay_animation);
+  if (self->fold_animation)
+    hdy_animation_stop (self->fold_animation);
 
-  self->overlay_animation =
+  self->fold_animation =
     hdy_animation_new (GTK_WIDGET (self),
-                       self->overlay_progress,
+                       self->fold_progress,
                        self->folded ? 1 : 0,
-                       self->overlay_duration,
+                       self->fold_duration,
                        hdy_ease_out_cubic,
-                       (HdyAnimationValueCallback) overlay_animation_value_cb,
-                       (HdyAnimationDoneCallback) overlay_animation_done_cb,
+                       (HdyAnimationValueCallback) fold_animation_value_cb,
+                       (HdyAnimationDoneCallback) fold_animation_done_cb,
                        self);
 
-  hdy_animation_start (self->overlay_animation);
+  hdy_animation_start (self->fold_animation);
 }
 
 static void
@@ -244,7 +244,7 @@ static gint
 adjust_for_overlay (HdyFlap *self,
                     gint     value)
 {
-  gdouble progress = MIN (1 - self->overlay_progress, self->reveal_progress);
+  gdouble progress = MIN (1 - self->fold_progress, self->reveal_progress);
 
   return (gint) round (value * progress);
 }
@@ -588,7 +588,7 @@ hdy_flap_draw (GtkWidget *widget,
                                 self->flap,
                                 cr);
 
-  progress = 1 - MIN (self->reveal_progress, self->overlay_progress);
+  progress = 1 - MIN (self->reveal_progress, self->fold_progress);
 
   if (progress < 1) {
     cairo_save (cr);
@@ -729,8 +729,8 @@ hdy_flap_get_property (GObject    *object,
   case PROP_FOLDED:
     g_value_set_boolean (value, hdy_flap_get_folded (self));
     break;
-  case PROP_OVERLAY_DURATION:
-    g_value_set_uint (value, hdy_flap_get_overlay_duration (self));
+  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));
@@ -767,8 +767,8 @@ hdy_flap_set_property (GObject      *object,
   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_uint (value));
+  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));
@@ -891,14 +891,14 @@ hdy_flap_class_init (HdyFlapClass *klass)
                           G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY);
 
   /**
-   * HdyFlap:overlay-duration:
+   * HdyFlap:fold-duration:
    *
    * Since: 1.1
    */
-  props[PROP_OVERLAY_DURATION] =
-    g_param_spec_uint ("overlay-duration",
-                       _("Overlay Duration"),
-                       _("Overlay Duration"),
+  props[PROP_FOLD_DURATION] =
+    g_param_spec_uint ("fold-duration",
+                       _("Fold Duration"),
+                       _("Fold Duration"),
                        0, G_MAXINT,
                        250,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
@@ -935,8 +935,8 @@ hdy_flap_init (HdyFlap *self)
   self->locked = FALSE;
   self->reveal_progress = 1;
   self->folded = FALSE;
-  self->overlay_progress = 0;
-  self->overlay_duration = 250;
+  self->fold_progress = 0;
+  self->fold_duration = 250;
   self->reveal_duration = 250;
 
   self->shadow_helper = hdy_shadow_helper_new (GTK_WIDGET (self));
@@ -1335,7 +1335,7 @@ hdy_flap_get_folded (HdyFlap *self)
 }
 
 /**
- * hdy_flap_get_overlay_duration:
+ * hdy_flap_get_fold_duration:
  * @self: a #HdyFlap
  *
  * Returns: current overlay animation duration.
@@ -1343,32 +1343,32 @@ hdy_flap_get_folded (HdyFlap *self)
  * Since: 1.1
  */
 guint
-hdy_flap_get_overlay_duration (HdyFlap *self)
+hdy_flap_get_fold_duration (HdyFlap *self)
 {
   g_return_val_if_fail (HDY_IS_FLAP (self), 0);
 
-  return self->overlay_duration;
+  return self->fold_duration;
 }
 
 /**
- * hdy_flap_set_overlay_duration:
+ * hdy_flap_set_fold_duration:
  * @self: a #HdyFlap
  * @duration: Duration for overlay animation
  *
  * Since: 1.1
  */
 void
-hdy_flap_set_overlay_duration (HdyFlap *self,
-                               guint    duration)
+hdy_flap_set_fold_duration (HdyFlap *self,
+                            guint    duration)
 {
   g_return_if_fail (HDY_IS_FLAP (self));
 
-  if (self->overlay_duration == duration)
+  if (self->fold_duration == duration)
     return;
 
-  self->overlay_duration = duration;
+  self->fold_duration = duration;
 
-  g_object_notify_by_pspec (G_OBJECT (self), props[PROP_OVERLAY_DURATION]);
+  g_object_notify_by_pspec (G_OBJECT (self), props[PROP_FOLD_DURATION]);
 }
 
 /**
diff --git a/src/hdy-flap.h b/src/hdy-flap.h
index 6185630b..f5f3eb7b 100644
--- a/src/hdy-flap.h
+++ b/src/hdy-flap.h
@@ -65,10 +65,10 @@ HDY_AVAILABLE_IN_1_1
 gboolean hdy_flap_get_folded (HdyFlap *self);
 
 HDY_AVAILABLE_IN_1_1
-guint hdy_flap_get_overlay_duration (HdyFlap *self);
+guint hdy_flap_get_fold_duration (HdyFlap *self);
 HDY_AVAILABLE_IN_1_1
-void  hdy_flap_set_overlay_duration (HdyFlap *self,
-                                     guint    duration);
+void  hdy_flap_set_fold_duration (HdyFlap *self,
+                                  guint    duration);
 
 HDY_AVAILABLE_IN_1_1
 guint hdy_flap_get_reveal_duration (HdyFlap *self);