Merge lp:~cimi/overlay-scrollbar/hide-thumb-on-selection into lp:overlay-scrollbar

[Andrea Cimitan]

store a gboolean that is set to TRUE when mouse clicking, and FALSE on mouse release

[lp:~cimi/overlay-scrollbar/hide-thumb-on-selection]

213. By Andrea Cimitan on 2011-04-19

User the filter func for the LeaveNotify, as it is not called when moving in internal gdkwindows

214. By Andrea Cimitan on 2011-04-19

Moved the leave_notify_event in toplevel_filter_func

215. By Andrea Cimitan on 2011-04-19

indent

[Mirco Müller (macslow)]

As a general rule of thumb, I would _always_ initialize variables upon declaration and also always check any pointers (xev, gdkevent) against NULL upon function-entry.

[Mirco Müller (macslow)]

There's a lot of math going on to check for thresholds/limits. I would put those into functions (or macros) to make the condition-checking (if-statements) more readable and make any potential/later changes to them less tedious and error-prone.

[lp:~cimi/overlay-scrollbar/hide-thumb-on-selection]

216. By Andrea Cimitan on 2011-04-20

reverted change in variable name

217. By Andrea Cimitan on 2011-04-20

ops, I suddenly merged a different branch, now ok

[Ted Gould (ted)]

top_level_button_press needs to be initialized to FALSE.

review: Needs Fixing

[lp:~cimi/overlay-scrollbar/hide-thumb-on-selection]

218. By Andrea Cimitan on 2011-05-17

Initialize toplevel_button_press

219. By Andrea Cimitan on 2011-05-17

Merged trunk

220. By Andrea Cimitan on 2011-05-17

should enter leavenotify also when toplevel_button_press is FALSE

[Ted Gould (ted)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-05-17 17:04:30 +0000
+++ os/os-scrollbar.c	2011-05-17 17:23:23 +0000
@@ -65,6 +65,7 @@
   gboolean active_window;
   gboolean can_deactivate_pager;
   gboolean can_hide;
+  gboolean toplevel_button_press;
   gboolean filter;
   gboolean fullsize;
   gboolean internal;
@@ -1433,6 +1434,85 @@
 
   if (!priv->fullsize)
     {
+      if (xevent->type == ButtonPress)
+        {
+          priv->toplevel_button_press = TRUE;
+          gtk_widget_hide (priv->thumb);
+        }
+
+      if (priv->toplevel_button_press && xevent->type == ButtonRelease)
+        {
+          priv->toplevel_button_press = FALSE;
+
+          /* proximity area */
+          if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+            {
+              if ((priv->thumb_all.x - xevent->xbutton.x <= PROXIMITY_WIDTH &&
+                   priv->thumb_all.x - xevent->xbutton.x >= 0) &&
+                  (xevent->xbutton.y >= priv->thumb_all.y + priv->overlay.y &&
+                   xevent->xbutton.y <= priv->thumb_all.y + priv->overlay.y + priv->overlay.height))
+                {
+                  priv->can_hide = FALSE;
+
+                  if (priv->lock_position)
+                    return GDK_FILTER_CONTINUE;
+
+                  if (priv->overlay.height > priv->slider.height)
+                    {
+                      gint x, y, x_pos, y_pos;
+
+                      gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (scrollbar)), &x_pos, &y_pos);
+
+                      x = priv->thumb_all.x;
+                      y = CLAMP (xevent->xbutton.y - priv->slider.height / 2,
+                                 priv->thumb_all.y + priv->overlay.y,
+                                 priv->thumb_all.y + priv->overlay.y + priv->overlay.height - priv->slider.height);
+
+                      os_scrollbar_move_thumb (scrollbar, x_pos + x, y_pos + y);
+                    }
+                  else
+                    {
+                      os_scrollbar_move_thumb (scrollbar, priv->win_x, priv->win_y + priv->slider.y);
+                    }
+
+                  gtk_widget_show (GTK_WIDGET (priv->thumb));
+                }
+            }
+          else
+            {
+              if ((priv->thumb_all.y - xevent->xbutton.y <= PROXIMITY_WIDTH &&
+                   priv->thumb_all.y - xevent->xbutton.y >= 0) &&
+                  (xevent->xbutton.x >= priv->thumb_all.x + priv->overlay.x &&
+                   xevent->xbutton.x <= priv->thumb_all.x + priv->overlay.x + priv->overlay.width))
+                {
+                  priv->can_hide = FALSE;
+
+                  if (priv->lock_position)
+                    return GDK_FILTER_CONTINUE;
+
+                  if (priv->overlay.width > priv->slider.width)
+                    {
+                      gint x, y, x_pos, y_pos;
+
+                      gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (scrollbar)), &x_pos, &y_pos);
+
+                      x = CLAMP (xevent->xbutton.x - priv->slider.width / 2,
+                                 priv->thumb_all.x + priv->overlay.x,
+                                 priv->thumb_all.x + priv->overlay.x + priv->overlay.width - priv->slider.width);
+                      y = priv->thumb_all.y;
+
+                      os_scrollbar_move_thumb (scrollbar, x_pos + x, y_pos + y);
+                    }
+                  else
+                    {
+                      os_scrollbar_move_thumb (scrollbar, priv->win_x, priv->win_y + priv->slider.y);
+                    }
+
+                  gtk_widget_show (GTK_WIDGET (priv->thumb));
+                }
+            }
+        }
+
       /* after a scroll-event, without motion,
        * pager becomes inactive because the timeout in
        * leave-notify-event starts,
@@ -1457,6 +1537,7 @@
                                                                 scrollbar);
             }
 
+          priv->toplevel_button_press = FALSE;
           priv->can_hide = TRUE;
 
           if (priv->source_hide_thumb_id != 0)
@@ -1475,7 +1556,7 @@
         }
 
       /* get the motion_notify_event trough XEvent */
-      if (xevent->type == MotionNotify)
+      if (!priv->toplevel_button_press && xevent->type == MotionNotify)
         {
           /* react to motion_notify_event
            * and set the state accordingly. */
@@ -1642,6 +1723,7 @@
   priv->internal = FALSE;
   priv->lock_position = FALSE;
   priv->proximity = FALSE;
+  priv->toplevel_button_press = FALSE;
   priv->source_deactivate_pager_id = 0;
   priv->source_hide_thumb_id = 0;
   priv->source_unlock_thumb_id = 0;