Merge lp:~cimi/overlay-scrollbar/different-thumb-source-handling into lp:overlay-scrollbar

[Andrea Cimitan]

changed approach to the source handling

[lp:~cimi/overlay-scrollbar/different-thumb-source-handling]

213. By Andrea Cimitan on 2011-04-20

stop the animation *after* calling g_source_remove

[Mirco Müller (macslow)]

Looking ok, sofar from my side. Approved.

review: Approve

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-04-13 14:59:14 +0000
+++ os/os-thumb.c	2011-04-20 14:54:17 +0000
@@ -118,12 +118,7 @@
   if (weight < 1.0f)
     gtk_window_set_opacity (GTK_WINDOW (thumb), fabs (weight - 1.0f));
   else
-    {
-      /* Animation ended. */
-      priv->source_id = 0;
-
-      gtk_widget_hide (GTK_WIDGET (thumb));
-    }
+    gtk_widget_hide (GTK_WIDGET (thumb));
 }
 
 static gboolean
@@ -137,6 +132,7 @@
   priv = thumb->priv;
 
   os_animation_start (priv->animation);
+  priv->source_id = 0;
 
   return FALSE;
 }
@@ -261,16 +257,16 @@
   thumb = OS_THUMB (widget);
   priv = thumb->priv;
 
+  if (priv->source_id != 0)
+    {
+      g_source_remove (priv->source_id);
+      priv->source_id = 0;
+    }
+
   /* Stop the animation on user interaction,
    * the button_press_event. */
-  if (priv->source_id != 0)
-    {
-      g_source_remove (priv->source_id);
-      priv->source_id = 0;
-
-      os_animation_stop (priv->animation);
-      gtk_window_set_opacity (GTK_WINDOW (widget), 1.0f);
-    }
+  os_animation_stop (priv->animation);
+  gtk_window_set_opacity (GTK_WINDOW (widget), 1.0f);
 
   if (event->type == GDK_BUTTON_PRESS)
     {
@@ -575,9 +571,9 @@
         {
           g_source_remove (priv->source_id);
           priv->source_id = 0;
-
-          os_animation_stop (priv->animation);
         }
+
+      os_animation_stop (priv->animation);
     }
 
   priv->use_tolerance = FALSE;
@@ -621,15 +617,15 @@
   thumb = OS_THUMB (widget);
   priv = thumb->priv;
 
+  if (priv->source_id != 0)
+    {
+      g_source_remove (priv->source_id);
+      priv->source_id = 0;
+    }
+
   /* On motion, stop the fade-out. */
-  if (priv->source_id != 0)
-    {
-      g_source_remove (priv->source_id);
-      priv->source_id = 0;
-
-      os_animation_stop (priv->animation);
-      gtk_window_set_opacity (GTK_WINDOW (widget), 1.0f);
-    }
+  os_animation_stop (priv->animation);
+  gtk_window_set_opacity (GTK_WINDOW (widget), 1.0f);
 
   /* If you're not dragging, and you're outside
    * the tolerance pixels, enable the fade-out.
@@ -683,15 +679,15 @@
   thumb = OS_THUMB (widget);
   priv = thumb->priv;
 
+  if (priv->source_id != 0)
+    {
+      g_source_remove (priv->source_id);
+      priv->source_id = 0;
+    }
+
   /* if started, stop the fade-out. */
-  if (priv->source_id != 0)
-    {
-      g_source_remove (priv->source_id);
-      priv->source_id = 0;
-
-      os_animation_stop (priv->animation);
-      gtk_window_set_opacity (GTK_WINDOW (widget), 1.0f);
-    }
+  os_animation_stop (priv->animation);
+  gtk_window_set_opacity (GTK_WINDOW (widget), 1.0f);
 
   priv->source_id = g_timeout_add (TIMEOUT_FADE_OUT,
                                    os_thumb_timeout_fade_out_cb,