Merge lp:~cimi/overlay-scrollbar/stop-func-on-os-animation-stop into lp:overlay-scrollbar

[Andrea Cimitan]

Simply add a stop_func callback to animation_stop

[Ted Gould (ted)]

review: Approve

=== modified file 'os/os-animation.c'
--- os/os-animation.c	2011-05-18 18:25:13 +0000
+++ os/os-animation.c	2011-06-09 11:26:07 +0000
@@ -210,11 +210,15 @@
 /**
  * os_animation_stop:
  * @animation: a #OsAnimation
+ * @stop_func: function to call at the stop
  *
- * Stops the animation
+ * Stops the animation.
+ * Before stopping, calls stop_func (if not NULL),
+ * or end_func (if not NULL).
  **/
 void
-os_animation_stop (OsAnimation* animation)
+os_animation_stop (OsAnimation*        animation,
+                   OsAnimationStopFunc stop_func)
 {
   OsAnimationPrivate* priv;
 
@@ -224,7 +228,9 @@
 
   if (priv->source_id != 0)
     {
-      if (priv->end_func != NULL)
+      if (stop_func != NULL)
+        stop_func (priv->user_data);
+      else if (priv->end_func != NULL)
         priv->end_func (priv->user_data);
 
       g_source_remove (priv->source_id);

=== modified file 'os/os-pager.c'
--- os/os-pager.c	2011-06-08 15:20:18 +0000
+++ os/os-pager.c	2011-06-09 11:26:07 +0000
@@ -142,7 +142,22 @@
   if (priv->parent == NULL)
     return;
 
-  draw_connection (pager);
+  draw_pager (pager);
+}
+
+/* stop_func called by the change-state animation */
+static void
+change_state_stop_cb (gpointer user_data)
+{
+  OsPager *pager;
+  OsPagerPrivate *priv;
+
+  pager = OS_PAGER (user_data);
+
+  priv = pager->priv;
+
+  priv->weight = 1.0f;
+
   draw_pager (pager);
 }
 
@@ -163,7 +178,9 @@
       priv->connection_window == NULL)
     return;
 
-  draw_connection (pager);
+  /* FIXME(Cimi) comment out draw_connection once it'll use gtk+ colors.
+   * Right now, it's using static colors so redrawing is useless. */
+// draw_connection (pager);
   draw_pager (pager);
 }
 
@@ -366,7 +383,7 @@
     return;
 
   /* if there's an animation currently running, stop it. */
-  os_animation_stop (priv->animation);
+  os_animation_stop (priv->animation, change_state_stop_cb);
 
   gdk_window_hide (priv->connection_window);
   gdk_window_hide (priv->pager_window);
@@ -440,7 +457,7 @@
       /* only start the animation if the pager is visible. */
       if (gdk_window_is_visible (priv->pager_window))
         {
-          os_animation_stop (priv->animation);
+          os_animation_stop (priv->animation, NULL);
 
           os_animation_set_duration (priv->animation, priv->active ? DURATION_FADE_IN :
                                                                      DURATION_FADE_OUT);
@@ -606,7 +623,7 @@
 
   /* stop currently running animation. */
   if (priv->animation != NULL)
-    os_animation_stop (priv->animation);
+    os_animation_stop (priv->animation, NULL);
 
   if (priv->parent != NULL)
     {

=== modified file 'os/os-private.h'
--- os/os-private.h	2011-05-12 23:39:33 +0000
+++ os/os-private.h	2011-06-09 11:26:07 +0000
@@ -109,6 +109,7 @@
 
 typedef void (*OsAnimationUpdateFunc) (gfloat weight, gpointer user_data);
 typedef void (*OsAnimationEndFunc)    (gpointer user_data);
+typedef void (*OsAnimationStopFunc)   (gpointer user_data);
 
 typedef struct _OsAnimation OsAnimation;
 typedef struct _OsAnimationPrivate OsAnimationPrivate;
@@ -137,7 +138,8 @@
 
 void         os_animation_start        (OsAnimation* animation);
 
-void         os_animation_stop         (OsAnimation* animation);
+void         os_animation_stop         (OsAnimation*        animation,
+                                        OsAnimationStopFunc stop_func);
 
 /* os-thumb.c */
 

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-06-07 11:35:29 +0000
+++ os/os-thumb.c	2011-06-09 11:26:07 +0000
@@ -100,6 +100,17 @@
     gtk_widget_hide (GTK_WIDGET (thumb));
 }
 
+/* stop_func called by the fade-out animation */
+static void
+fade_out_stop_cb (gpointer user_data)
+{
+  OsThumb *thumb;
+
+  thumb = OS_THUMB (user_data);
+
+  gtk_window_set_opacity (GTK_WINDOW (thumb), 1.0f);
+}
+
 /* timeout before starting the fade-out animation */
 static gboolean
 timeout_fade_out_cb (gpointer user_data)
@@ -214,8 +225,7 @@
 
   /* Stop the animation on user interaction,
    * the button_press_event. */
-  os_animation_stop (priv->animation);
-  gtk_window_set_opacity (GTK_WINDOW (widget), 1.0f);
+  os_animation_stop (priv->animation, fade_out_stop_cb);
 
   if (event->type == GDK_BUTTON_PRESS)
     {
@@ -573,7 +583,7 @@
           priv->source_id = 0;
         }
 
-      os_animation_stop (priv->animation);
+      os_animation_stop (priv->animation, NULL);
     }
 
   priv->use_tolerance = FALSE;
@@ -624,8 +634,7 @@
     }
 
   /* On motion, stop the fade-out. */
-  os_animation_stop (priv->animation);
-  gtk_window_set_opacity (GTK_WINDOW (widget), 1.0f);
+  os_animation_stop (priv->animation, fade_out_stop_cb);
 
   /* If you're not dragging, and you're outside
    * the tolerance pixels, enable the fade-out.
@@ -698,8 +707,7 @@
     }
 
   /* if started, stop the fade-out. */
-  os_animation_stop (priv->animation);
-  gtk_window_set_opacity (GTK_WINDOW (widget), 1.0f);
+  os_animation_stop (priv->animation, fade_out_stop_cb);
 
   priv->source_id = g_timeout_add (TIMEOUT_FADE_OUT,
                                    timeout_fade_out_cb,