Merge lp:~cimi/overlay-scrollbar/better-grab-approach into lp:overlay-scrollbar

[Andrea Cimitan]

only concern I have is that I might need to do more checks instead a plain if priv->grabbed_widget != NULL, maybe I should check if the widget is visible or mapped or so... not sure. Please try and give your suggestions, could be a tricky branch, but here (apart from the concern) works fine in every app with modal dialog

[Andrea Cimitan (cimi)]

requires more work, maybe using grab_notify... doesn't always fix https://bugs.launchpad.net/ayatana-scrollbar/+bug/737518

[lp:~cimi/overlay-scrollbar/better-grab-approach]

170. By Andrea Cimitan on 2011-03-18

Stop events of the thumb when it gets unmapped

171. By Andrea Cimitan on 2011-03-18

remove a return in button_press_event as it should not be required anymore

172. By Andrea Cimitan on 2011-03-18

remove grab_notify in os-thumb.c

173. By Andrea Cimitan on 2011-03-18

remove enter_notify_event in os-thumb.c, useless

174. By Andrea Cimitan on 2011-03-18

removed leave notify

[Javier Jardón (jjardon)]

Looks good now

review: Approve

=== modified file 'os/os-pager.c'
--- os/os-pager.c	2011-03-16 16:42:33 +0000
+++ os/os-pager.c	2011-03-18 16:34:27 +0000
@@ -93,6 +93,10 @@
 
       gdk_window_set_transient_for (priv->pager_window,
                                     gtk_widget_get_window (priv->parent));
+
+      gdk_window_input_shape_combine_region (priv->pager_window,
+                                             gdk_region_new (),
+                                             0, 0);
     }
 }
 

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-03-17 19:50:36 +0000
+++ os/os-scrollbar.c	2011-03-18 16:34:27 +0000
@@ -71,6 +71,7 @@
 };
 
 static gboolean os_scrollbar_expose_event (GtkWidget *widget, GdkEventExpose *event);
+static void os_scrollbar_grab_notify (GtkWidget *widget, gboolean was_grabbed);
 static void os_scrollbar_hide (GtkWidget *widget);
 static void os_scrollbar_map (GtkWidget *widget);
 static void os_scrollbar_parent_set (GtkWidget *widget, GtkWidget *old_parent);
@@ -101,6 +102,7 @@
 static gboolean thumb_enter_notify_event_cb (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data);
 static gboolean thumb_leave_notify_event_cb (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data);
 static gboolean thumb_motion_notify_event_cb (GtkWidget *widget, GdkEventMotion *event, gpointer user_data);
+static void thumb_unmap_cb (GtkWidget *widget, gpointer user_data);
 static void pager_move (OsScrollbar *scrollbar);
 static void pager_set_state (OsScrollbar *scrollbar);
 static void adjustment_changed_cb (GtkAdjustment *adjustment, gpointer user_data);
@@ -598,6 +600,8 @@
                                             thumb_leave_notify_event_cb, scrollbar);
       g_signal_handlers_disconnect_by_func (G_OBJECT (priv->thumb),
                                             thumb_motion_notify_event_cb, scrollbar);
+      g_signal_handlers_disconnect_by_func (G_OBJECT (priv->thumb),
+                                            thumb_unmap_cb, scrollbar);
 
       g_object_unref (priv->thumb);
     }
@@ -618,6 +622,8 @@
                         G_CALLBACK (thumb_leave_notify_event_cb), scrollbar);
       g_signal_connect (G_OBJECT (priv->thumb), "motion-notify-event",
                         G_CALLBACK (thumb_motion_notify_event_cb), scrollbar);
+      g_signal_connect (G_OBJECT (priv->thumb), "unmap",
+                        G_CALLBACK (thumb_unmap_cb), scrollbar);
     }
 }
 
@@ -841,6 +847,21 @@
   return FALSE;
 }
 
+static void
+thumb_unmap_cb (GtkWidget *widget,
+                gpointer   user_data)
+{
+  OsScrollbar *scrollbar;
+  OsScrollbarPrivate *priv;
+
+  scrollbar = OS_SCROLLBAR (user_data);
+  priv = scrollbar->priv;
+
+  priv->button_press_event = FALSE;
+  priv->motion_notify_event = FALSE;
+  priv->enter_notify_event = FALSE;
+}
+
 /* Move the pager to the right position. */
 static void
 pager_move (OsScrollbar *scrollbar)
@@ -1225,6 +1246,7 @@
   widget_class = GTK_WIDGET_CLASS (class);
 
   widget_class->expose_event  = os_scrollbar_expose_event;
+  widget_class->grab_notify   = os_scrollbar_grab_notify;
   widget_class->hide          = os_scrollbar_hide;
   widget_class->map           = os_scrollbar_map;
   widget_class->realize       = os_scrollbar_realize;
@@ -1301,6 +1323,12 @@
 }
 
 static void
+os_scrollbar_grab_notify (GtkWidget *widget,
+                          gboolean   was_grabbed)
+{
+}
+
+static void
 os_scrollbar_hide (GtkWidget *widget)
 {
   GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->hide (widget);

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-03-17 04:00:04 +0000
+++ os/os-thumb.c	2011-03-18 16:34:27 +0000
@@ -32,10 +32,9 @@
 
 struct _OsThumbPrivate {
   GtkOrientation orientation;
+  GtkWidget *grabbed_widget;
   gboolean button_press_event;
-  gboolean enter_notify_event;
   gboolean motion_notify_event;
-  gboolean can_hide;
   gboolean can_rgba;
   gint pointer_x;
   gint pointer_y;
@@ -50,9 +49,7 @@
 static gboolean os_thumb_button_press_event (GtkWidget *widget, GdkEventButton *event);
 static gboolean os_thumb_button_release_event (GtkWidget *widget, GdkEventButton *event);
 static void os_thumb_composited_changed (GtkWidget *widget);
-static gboolean os_thumb_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event);
 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);
@@ -106,9 +103,7 @@
   widget_class->button_press_event   = os_thumb_button_press_event;
   widget_class->button_release_event = os_thumb_button_release_event;
   widget_class->composited_changed   = os_thumb_composited_changed;
-  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;
@@ -141,7 +136,6 @@
                                              OsThumbPrivate);
   priv = thumb->priv;
 
-  priv->can_hide = TRUE;
   priv->can_rgba = FALSE;
 
   gtk_window_set_skip_pager_hint (GTK_WINDOW (thumb), TRUE);
@@ -215,6 +209,8 @@
           thumb = OS_THUMB (widget);
           priv = thumb->priv;
 
+          gtk_grab_remove (widget);
+
           priv->button_press_event = FALSE;
           priv->motion_notify_event = FALSE;
 
@@ -246,22 +242,6 @@
 }
 
 static gboolean
-os_thumb_enter_notify_event (GtkWidget        *widget,
-                             GdkEventCrossing *event)
-{
-  OsThumb *thumb;
-  OsThumbPrivate *priv;
-
-  thumb = OS_THUMB (widget);
-  priv = thumb->priv;
-
-  priv->enter_notify_event = TRUE;
-  priv->can_hide = FALSE;
-
-  return TRUE;
-}
-
-static gboolean
 os_thumb_expose (GtkWidget      *widget,
                  GdkEventExpose *event)
 {
@@ -447,7 +427,7 @@
                        4,
                        height - 8,
                        height - 8);
-   
+
       gtk_paint_arrow (gtk_widget_get_style (widget),
                        gtk_widget_get_window (widget),
                        state_type_down,
@@ -468,28 +448,19 @@
   return FALSE;
 }
 
-static gboolean
-os_thumb_leave_notify_event (GtkWidget        *widget,
-                             GdkEventCrossing *event)
-{
-  OsThumb *thumb;
-  OsThumbPrivate *priv;
-
-  thumb = OS_THUMB (widget);
-  priv = thumb->priv;
-
-  if (!priv->button_press_event)
-    priv->can_hide = TRUE;
-
-/*  g_timeout_add (TIMEOUT_HIDE, os_thumb_hide, widget);*/
-
-  return TRUE;
-}
-
 static void
 os_thumb_map (GtkWidget *widget)
 {
-  gtk_grab_add (widget);
+  OsThumb *thumb;
+  OsThumbPrivate *priv;
+
+  thumb = OS_THUMB (widget);
+  priv = thumb->priv;
+
+  priv->grabbed_widget = gtk_grab_get_current ();
+
+  if (priv->grabbed_widget != NULL)
+    gtk_grab_remove (priv->grabbed_widget);
 
   GTK_WIDGET_CLASS (os_thumb_parent_class)->map (widget);
 }
@@ -512,7 +483,7 @@
       priv->motion_notify_event = TRUE;
     }
 
-  return TRUE;
+  return FALSE;
 }
 
 static void
@@ -532,7 +503,17 @@
 static void
 os_thumb_unmap (GtkWidget *widget)
 {
-  gtk_grab_remove (widget);
+  OsThumb *thumb;
+  OsThumbPrivate *priv;
+
+  thumb = OS_THUMB (widget);
+  priv = thumb->priv;
+
+  priv->button_press_event = FALSE;
+  priv->motion_notify_event = FALSE;
+
+  if (priv->grabbed_widget != NULL)
+    gtk_grab_add (priv->grabbed_widget);
 
   GTK_WIDGET_CLASS (os_thumb_parent_class)->unmap (widget);
 }