Merge lp:~cimi/overlay-scrollbar/fix-728664 into lp:overlay-scrollbar

[Andrea Cimitan]

It's not meant to be approved immediately, but I've proposed the merge to start discussing it. I discovered that enter_notify and leave_notify are likely not called in the os-thumb.c class (maybe moving the code in the callbacks inside os-scrollbar.c?). By losing motion-notify and so, we are losing gtk_widget_queue_draw too for those states. Let's start improving it

[Andrea Cimitan (cimi)]

We are losing motion-notify because of the callback in os-scrollbar.c, which is returning TRUE instead FALSE.
That's a separate issue.
Anyway, enter (and I guess leave, didn't try) notify callbacks as well in os-scrollbar.c are not getting any event.
So if you have ideas to improve that, otherwise as long as it works...

[Javier Jardón (jjardon)]

It works in all the user cases here too. Let's merge this until we have a better solution

review: Approve

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-03-17 02:42:00 +0000
+++ os/os-thumb.c	2011-03-17 04:06:24 +0000
@@ -54,7 +54,9 @@
 static gboolean os_thumb_expose (GtkWidget *widget, GdkEventExpose *event);
 static gboolean os_thumb_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event);
 static gboolean os_thumb_motion_notify_event (GtkWidget *widget, GdkEventMotion *event);
+static void os_thumb_map (GtkWidget *widget);
 static void os_thumb_screen_changed (GtkWidget *widget, GdkScreen *old_screen);
+static void os_thumb_unmap (GtkWidget *widget);
 static GObject* os_thumb_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties);
 static void os_thumb_dispose (GObject *object);
 static void os_thumb_finalize (GObject *object);
@@ -107,8 +109,10 @@
   widget_class->enter_notify_event   = os_thumb_enter_notify_event;
   widget_class->expose_event         = os_thumb_expose;
   widget_class->leave_notify_event   = os_thumb_leave_notify_event;
+  widget_class->map                  = os_thumb_map;
   widget_class->motion_notify_event  = os_thumb_motion_notify_event;
   widget_class->screen_changed       = os_thumb_screen_changed;
+  widget_class->unmap                = os_thumb_unmap;
 
   gobject_class->constructor  = os_thumb_constructor;
   gobject_class->get_property = os_thumb_get_property;
@@ -182,6 +186,8 @@
           thumb = OS_THUMB (widget);
           priv = thumb->priv;
 
+          gtk_grab_add (widget);
+
           priv->pointer_x = event->x;
           priv->pointer_y = event->y;
 
@@ -480,6 +486,14 @@
   return TRUE;
 }
 
+static void
+os_thumb_map (GtkWidget *widget)
+{
+  gtk_grab_add (widget);
+
+  GTK_WIDGET_CLASS (os_thumb_parent_class)->map (widget);
+}
+
 static gboolean
 os_thumb_motion_notify_event (GtkWidget      *widget,
                               GdkEventMotion *event)
@@ -515,6 +529,14 @@
     gtk_widget_set_colormap (widget, colormap);
 }
 
+static void
+os_thumb_unmap (GtkWidget *widget)
+{
+  gtk_grab_remove (widget);
+
+  GTK_WIDGET_CLASS (os_thumb_parent_class)->unmap (widget);
+}
+
 static GObject*
 os_thumb_constructor (GType                  type,
                       guint                  n_construct_properties,