Merge lp:~cimi/overlay-scrollbar/proximity-area-update into lp:overlay-scrollbar

[Andrea Cimitan]

Updates to the position of the proximity area, now the thumb is shown only if you point at the right/top of the pager, not at its left/bottom

[Loïc Molinari (loic.molinari)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-03-07 17:27:55 +0000
+++ os/os-scrollbar.c	2011-03-07 19:13:04 +0000
@@ -36,7 +36,7 @@
 #define DEFAULT_SCROLLBAR_HEIGHT 80
 
 /* Width of the proximity effect in pixels. */
-#define PROXIMITY_WIDTH 40
+#define PROXIMITY_WIDTH 30
 
 /* Timeout before hiding in milliseconds. */
 #define TIMEOUT_HIDE 1000
@@ -1104,8 +1104,8 @@
           /* proximity area */
           if (priv->orientation == GTK_ORIENTATION_VERTICAL)
             {
-              if ((priv->thumb_all.x - xevent->xmotion.x < PROXIMITY_WIDTH &&
-                   priv->thumb_all.x + priv->slider.width - xevent->xmotion.x > 0) &&
+              if ((priv->thumb_all.x - xevent->xmotion.x <= PROXIMITY_WIDTH &&
+                   priv->thumb_all.x - xevent->xmotion.x >= 0) &&
                   (xevent->xmotion.y >= priv->thumb_all.y + priv->overlay.y &&
                    xevent->xmotion.y <= priv->thumb_all.y + priv->overlay.y + priv->overlay.height))
                 {
@@ -1140,8 +1140,8 @@
             }
           else
             {
-              if ((priv->thumb_all.y - xevent->xmotion.y < PROXIMITY_WIDTH &&
-                   priv->thumb_all.y + priv->slider.height - xevent->xmotion.y > 0) &&
+              if ((priv->thumb_all.y - xevent->xmotion.y <= PROXIMITY_WIDTH &&
+                   priv->thumb_all.y - xevent->xmotion.y >= 0) &&
                   (xevent->xmotion.x >= priv->thumb_all.x + priv->overlay.x &&
                    xevent->xmotion.x <= priv->thumb_all.x + priv->overlay.x + priv->overlay.width))
                 {