Merge lp:~cimi/overlay-scrollbar/move-leave-notify into lp:overlay-scrollbar

[Andrea Cimitan]

just move the leave notify event for the toplevel in the filter func, because the callback applied to the toplevel is called also when moving the mouse in a textview, and that could potentially expose issues

[Ted Gould (ted)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-04-13 13:34:44 +0000
+++ os/os-scrollbar.c	2011-04-20 17:14:30 +0000
@@ -127,7 +127,6 @@
 static void root_gfunc (gpointer data, gpointer user_data);
 static gboolean toplevel_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data);
 static GdkFilterReturn toplevel_filter_func (GdkXEvent *gdkxevent, GdkEvent *event, gpointer user_data);
-static gboolean toplevel_leave_notify_event_cb (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data);
 
 /* Private functions. */
 
@@ -1354,6 +1353,38 @@
       if (!priv->active_window && xevent->type == EnterNotify)
         pager_set_state_from_pointer (scrollbar, xevent->xcrossing.x, xevent->xcrossing.y);
 
+      if (xevent->type == LeaveNotify)
+        {
+          /* never deactivate the pager in an active window. */
+          if (!priv->active_window)
+            {
+              priv->can_deactivate_pager = TRUE;
+
+              if (priv->source_deactivate_pager_id != 0)
+                g_source_remove (priv->source_deactivate_pager_id);
+
+              priv->source_deactivate_pager_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
+                                                                os_scrollbar_deactivate_pager_cb,
+                                                                scrollbar);
+            }
+
+          priv->can_hide = TRUE;
+
+          if (priv->source_hide_thumb_id != 0)
+            g_source_remove (priv->source_hide_thumb_id);
+
+          priv->source_hide_thumb_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
+                                                      os_scrollbar_hide_thumb_cb,
+                                                      scrollbar);
+
+          if (priv->source_unlock_thumb_id != 0)
+            g_source_remove (priv->source_unlock_thumb_id);
+
+          priv->source_unlock_thumb_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
+                                                        os_scrollbar_unlock_thumb_cb,
+                                                        scrollbar);
+        }
+
       /* get the motion_notify_event trough XEvent */
       if (xevent->type == MotionNotify)
         {
@@ -1447,50 +1478,6 @@
   return GDK_FILTER_CONTINUE;
 }
 
-/* Hide the OsScrollbar, when the pointer leaves the toplevel GtkWindow. */
-static gboolean
-toplevel_leave_notify_event_cb (GtkWidget        *widget,
-                                GdkEventCrossing *event,
-                                gpointer          user_data)
-{
-  OsScrollbar *scrollbar;
-  OsScrollbarPrivate *priv;
-
-  scrollbar = OS_SCROLLBAR (user_data);
-  priv = scrollbar->priv;
-
-  /* never deactivate the pager in an active window. */
-  if (!priv->active_window)
-    {
-      priv->can_deactivate_pager = TRUE;
-
-      if (priv->source_deactivate_pager_id != 0)
-        g_source_remove (priv->source_deactivate_pager_id);
-
-      priv->source_deactivate_pager_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
-                                                        os_scrollbar_deactivate_pager_cb,
-                                                        scrollbar);
-    }
-
-  priv->can_hide = TRUE;
-
-  if (priv->source_hide_thumb_id != 0)
-    g_source_remove (priv->source_hide_thumb_id);
-
-  priv->source_hide_thumb_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
-                                              os_scrollbar_hide_thumb_cb,
-                                              scrollbar);
-
-  if (priv->source_unlock_thumb_id != 0)
-    g_source_remove (priv->source_unlock_thumb_id);
-
-  priv->source_unlock_thumb_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
-                                                os_scrollbar_unlock_thumb_cb,
-                                                scrollbar);
-
-  return FALSE;
-}
-
 /* Type definition. */
 
 G_DEFINE_TYPE (OsScrollbar, os_scrollbar, GTK_TYPE_SCROLLBAR);
@@ -1723,8 +1710,6 @@
 
   g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (widget)), "configure-event",
                     G_CALLBACK (toplevel_configure_event_cb), scrollbar);
-  g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (widget)), "leave-notify-event",
-                    G_CALLBACK (toplevel_leave_notify_event_cb), scrollbar);
 
   os_scrollbar_calc_layout_pager (scrollbar, priv->adjustment->value);
 
@@ -1842,8 +1827,6 @@
 
   g_signal_handlers_disconnect_by_func (G_OBJECT (gtk_widget_get_toplevel (widget)),
                                         G_CALLBACK (toplevel_configure_event_cb), scrollbar);
-  g_signal_handlers_disconnect_by_func (G_OBJECT (gtk_widget_get_toplevel (widget)),
-                                        G_CALLBACK (toplevel_leave_notify_event_cb), scrollbar);
 
   os_pager_set_parent (OS_PAGER (priv->pager), NULL);