Merge lp:~cimi/overlay-scrollbar/tolerance-pageupdown into lp:overlay-scrollbar

[Andrea Cimitan]

See comment

[lp:~cimi/overlay-scrollbar/tolerance-pageupdown]

270. By Andrea Cimitan on 2011-06-28

Added comment

[Ted Gould (ted)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-06-28 18:23:27 +0000
+++ os/os-scrollbar.c	2011-06-28 21:57:31 +0000
@@ -31,6 +31,7 @@
 #include <X11/Xutil.h>
 #include <X11/extensions/XInput2.h>
 #include "math.h"
+#include <stdlib.h>
 
 /* Size of the pager in pixels. */
 #define PAGER_SIZE 3
@@ -53,6 +54,9 @@
 /* Timeout before hiding in ms, after leaving the toplevel. */
 #define TIMEOUT_TOPLEVEL_HIDE 200
 
+/* Number of tolerance pixels on pageup/down, while intercepting a motion-notify-event. */
+#define TOLERANCE_PIXELS 2
+
 typedef enum
 {
   OS_SIDE_TOP,
@@ -1350,6 +1354,11 @@
       /* reconnect slider and overlay after key press */
       if (priv->value_changed_event)
         {
+          /* return if the mouse movement is small. */
+          if (abs (priv->pointer_x - event->x) <= TOLERANCE_PIXELS &&
+              abs (priv->pointer_y - event->y) <= TOLERANCE_PIXELS)
+            return FALSE;
+
           if (priv->orientation == GTK_ORIENTATION_VERTICAL)
             {
               priv->slide_initial_slider_position = event->y_root - priv->win_y - event->y;
@@ -1361,8 +1370,6 @@
               priv->slide_initial_coordinate = event->x_root;
             }
 
-          /* FIXME(Cimi) seems useless. */
-//          capture_movement (scrollbar, event->x_root, event->y_root);
           priv->value_changed_event = FALSE;
         }
 
 
=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-06-27 17:03:25 +0000
+++ os/os-thumb.c	2011-06-28 21:57:31 +0000
@@ -37,7 +37,7 @@
 /* Timeout before the fade-out. */
 #define TIMEOUT_FADE_OUT 250
 
-/* Number of tolerance pixels. */
+/* Number of tolerance pixels, before hiding the thumb. */
 #define TOLERANCE_PIXELS 3
 
 /* Thumb radius in pixels (higher values are automatically clamped). */