Merge lp:~cimi/overlay-scrollbar/fitt-law into lp:overlay-scrollbar

[Andrea Cimitan]

[lp:~cimi/overlay-scrollbar/fitt-law]

231. By Andrea Cimitan on 2011-05-08

Don't check for detached state on drag. Indentation fixes

[Ted Gould (ted)]

Love the video!

  review approve

review: Approve

=== modified file 'os/os-private.h'
--- os/os-private.h	2011-04-05 16:21:15 +0000
+++ os/os-private.h	2011-05-08 14:08:31 +0000
@@ -31,8 +31,8 @@
 #endif /* __GNUC__ */
 
 /* Default size of the thumb in pixels. */
-#define DEFAULT_THUMB_WIDTH  15
-#define DEFAULT_THUMB_HEIGHT 67
+#define DEFAULT_THUMB_WIDTH  17
+#define DEFAULT_THUMB_HEIGHT 69
 
 G_BEGIN_DECLS
 
@@ -167,9 +167,12 @@
   GtkWindowClass parent_class;
 };
 
-GType      os_thumb_get_type (void) G_GNUC_CONST;
-
-GtkWidget* os_thumb_new      (GtkOrientation orientation);
+GType      os_thumb_get_type     (void) G_GNUC_CONST;
+
+GtkWidget* os_thumb_new          (GtkOrientation orientation);
+
+void       os_thumb_set_detached (OsThumb *thumb,
+                                  gboolean detached);
 
 /* os-pager.c */
 
 
=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-04-26 22:33:59 +0000
+++ os/os-scrollbar.c	2011-05-08 14:08:31 +0000
@@ -32,6 +32,9 @@
 /* Default size of the pager in pixels. */
 #define DEFAULT_PAGER_WIDTH 3
 
+/* Default thumb allocation shift in pixels. */
+#define THUMB_ALLOCATION_SHIFT -3
+
 /* Width of the proximity effect in pixels. */
 #define PROXIMITY_WIDTH 30
 
@@ -539,7 +542,7 @@
        (x - 1 + priv->slider.width) >= screen_width))
     {
       priv->internal = TRUE;
-      return x - DEFAULT_PAGER_WIDTH - priv->slider.width;
+      return MAX (x - priv->slider.width, screen_width - priv->slider.width);
     }
 
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
@@ -573,7 +576,7 @@
        (y - 1 + priv->slider.height) >= screen_height))
     {
       priv->internal = TRUE;
-      return y - DEFAULT_PAGER_WIDTH - priv->slider.height;
+      return MAX (y - priv->slider.height, screen_height - priv->slider.height);
     }
 
   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -1162,6 +1165,35 @@
   if (!priv->motion_notify_event && !priv->enter_notify_event)
     gtk_widget_hide (GTK_WIDGET (priv->thumb));
 
+  if (gtk_widget_get_mapped (GTK_WIDGET (priv->thumb)))
+    {
+      /* if we're dragging the thumb, it can't be detached. */
+      if (priv->motion_notify_event)
+        os_thumb_set_detached (OS_THUMB (priv->thumb), FALSE);
+      else
+        {
+          gint x_pos, y_pos;
+          gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (priv->thumb)), &x_pos, &y_pos);
+
+          if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+            {
+              if ((priv->win_y + priv->overlay.y > y_pos + priv->slider.height) ||
+                  (priv->win_y + priv->overlay.y + priv->overlay.height < y_pos))
+                os_thumb_set_detached (OS_THUMB (priv->thumb), TRUE);
+              else
+                os_thumb_set_detached (OS_THUMB (priv->thumb), FALSE);
+            }
+          else
+            {
+              if ((priv->win_x + priv->overlay.x > x_pos + priv->slider.width) ||
+                  (priv->win_x + priv->overlay.x + priv->overlay.width < x_pos))
+                os_thumb_set_detached (OS_THUMB (priv->thumb), TRUE);
+              else
+                os_thumb_set_detached (OS_THUMB (priv->thumb), FALSE);
+            }
+        }
+    }
+
   pager_move (scrollbar);
 }
 
@@ -1399,6 +1431,7 @@
                       os_scrollbar_move_thumb (scrollbar, priv->win_x, priv->win_y + priv->slider.y);
                     }
 
+                  os_thumb_set_detached (OS_THUMB (priv->thumb), FALSE);
                   gtk_widget_show (GTK_WIDGET (priv->thumb));
                 }
               else
@@ -1438,6 +1471,7 @@
                       os_scrollbar_move_thumb (scrollbar, priv->win_x + priv->slider.x, priv->win_y);
                     }
 
+                  os_thumb_set_detached (OS_THUMB (priv->thumb), FALSE);
                   gtk_widget_show (GTK_WIDGET (priv->thumb));
                 }
               else
@@ -1771,7 +1805,7 @@
       priv->slider.width = DEFAULT_THUMB_WIDTH;
       priv->slider.height = DEFAULT_THUMB_HEIGHT;
       priv->overlay_all.x = allocation->x - DEFAULT_PAGER_WIDTH;
-      priv->thumb_all.x = allocation->x;
+      priv->thumb_all.x = allocation->x + THUMB_ALLOCATION_SHIFT;
 
       rect.x = priv->overlay_all.x;
       rect.y = priv->overlay_all.y;
@@ -1785,7 +1819,7 @@
       priv->slider.width = DEFAULT_THUMB_HEIGHT;
       priv->slider.height = DEFAULT_THUMB_WIDTH;
       priv->overlay_all.y = allocation->y - DEFAULT_PAGER_WIDTH ;
-      priv->thumb_all.y = allocation->y;
+      priv->thumb_all.y = allocation->y + THUMB_ALLOCATION_SHIFT;
 
       rect.x = priv->overlay_all.x;
       rect.y = priv->overlay_all.y;
 
=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-04-20 14:51:48 +0000
+++ os/os-thumb.c	2011-05-08 14:08:31 +0000
@@ -40,6 +40,9 @@
 /* Number of tolerance pixels. */
 #define TOLERANCE_PIXELS 3
 
+/* Thumb radius in pixels (higher values are automatically clamped). */
+#define THUMB_RADIUS 9
+
 struct _OsThumbPrivate {
   GtkOrientation orientation;
   GtkWidget *grabbed_widget;
@@ -48,6 +51,7 @@
   gboolean motion_notify_event;
   gboolean can_rgba;
   gboolean use_tolerance;
+  gboolean detached;
   gint pointer_x;
   gint pointer_y;
   guint32 source_id;
@@ -79,6 +83,31 @@
 
 /* Private functions. */
 
+/* Draw an arror. */
+static void
+os_cairo_draw_arrow (cairo_t *cr,
+                     gdouble  x,
+                     gdouble  y,
+                     gdouble  width,
+                     gdouble  height)
+{
+  cairo_save (cr);
+
+  cairo_translate (cr, x, y);
+  cairo_move_to (cr, -width / 2, -height / 2);
+  cairo_line_to (cr, 0, height / 2);
+  cairo_line_to (cr, width / 2, -height / 2);
+  cairo_close_path (cr);
+
+  cairo_set_source_rgba (cr, 0.3, 0.3, 0.3, 0.75);
+  cairo_fill_preserve (cr);
+
+  cairo_set_source_rgba (cr, 0.3, 0.3, 0.3, 1.0);
+  cairo_stroke (cr);
+
+  cairo_restore (cr);
+}
+
 /* Draw a rounded rectangle. */
 static void
 os_cairo_draw_rounded_rect (cairo_t *cr,
@@ -189,6 +218,7 @@
   priv = thumb->priv;
 
   priv->can_rgba = FALSE;
+  priv->detached = FALSE;
 
   priv->source_id = 0;
   priv->animation = os_animation_new (RATE_FADE_OUT, DURATION_FADE_OUT,
@@ -350,6 +380,7 @@
 {
   GtkAllocation allocation;
   GtkStateType state_type_down, state_type_up;
+  GtkStyle *style;
   OsThumb *thumb;
   OsThumbPrivate *priv;
   cairo_pattern_t *pat;
@@ -357,6 +388,8 @@
   gint x, y, width, height;
   gint radius;
 
+  style = gtk_widget_get_style (widget);
+
   thumb = OS_THUMB (widget);
   priv = thumb->priv;
 
@@ -369,10 +402,12 @@
   y = 0;
   width = allocation.width;
   height = allocation.height;
-  radius = priv->can_rgba ? 18 : 0;
+  radius = priv->can_rgba ? THUMB_RADIUS : 0;
 
   cr = gdk_cairo_create (gtk_widget_get_window (widget));
 
+  cairo_save (cr);
+
   cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_source_rgba (cr, 0, 0, 0, 0);
   cairo_paint (cr);
@@ -434,117 +469,101 @@
     }
   cairo_set_source (cr, pat);
   cairo_pattern_destroy (pat);
-  cairo_fill_preserve (cr);
 
-  cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, 1.0);
 
   if (priv->motion_notify_event)
     {
+      cairo_fill_preserve (cr);
       cairo_set_source_rgba (cr, 0.5, 0.5, 0.5, 0.2);
-      cairo_fill_preserve (cr);
-      cairo_set_source_rgba (cr, 0.5, 0.5, 0.5, 1.0);
-      cairo_stroke (cr);
-
-      os_cairo_draw_rounded_rect (cr, x + 1, y + 1, width - 2, height - 2, radius + 1);
-      cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
-      cairo_stroke (cr);
-    }
-  else
-    {
-      cairo_stroke (cr);
-
-      os_cairo_draw_rounded_rect (cr, x + 1, y + 1, width - 2, height - 2, radius + 1);
-      cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
-      cairo_stroke (cr);
-    }
-
-  if (priv->orientation == GTK_ORIENTATION_VERTICAL)
-    {
-      cairo_move_to (cr, x + 0.5, y - 1 + height / 2);
-      cairo_line_to (cr, width - 0.5, y - 1 + height / 2);
-      cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, 0.4);
-      cairo_stroke (cr);
-
-      cairo_move_to (cr, x + 0.5, y + height / 2);
-      cairo_line_to (cr, width - 0.5, y + height / 2);
-      cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
-      cairo_stroke (cr);
-    }
-  else
-    {
-      cairo_move_to (cr, x - 1 + width / 2, y + 0.5);
-      cairo_line_to (cr, x - 1 + width / 2, height - 0.5);
-      cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, 0.4);
-      cairo_stroke (cr);
-
-      cairo_move_to (cr, x + width / 2, y + 0.5);
-      cairo_line_to (cr, x + width / 2, height - 0.5);
-      cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
-      cairo_stroke (cr);
-    }
-
-  cairo_restore (cr);
-
-  if (priv->orientation == GTK_ORIENTATION_VERTICAL)
-    {
-      gtk_paint_arrow (gtk_widget_get_style (widget),
-                       gtk_widget_get_window (widget),
-                       state_type_up,
-                       GTK_SHADOW_IN,
-                       NULL,
-                       widget,
-                       "arrow",
-                       GTK_ARROW_UP,
-                       FALSE,
-                       4,
-                       4,
-                       width - 8,
-                       width - 8);
-
-      gtk_paint_arrow (gtk_widget_get_style (widget),
-                       gtk_widget_get_window (widget),
-                       state_type_down,
-                       GTK_SHADOW_NONE,
-                       NULL,
-                       widget,
-                       "arrow",
-                       GTK_ARROW_DOWN,
-                       FALSE,
-                       4,
-                       height - (width - 8) - 4,
-                       width - 8,
-                       width - 8);
-    }
-  else
-    {
-      gtk_paint_arrow (gtk_widget_get_style (widget),
-                       gtk_widget_get_window (widget),
-                       state_type_up,
-                       GTK_SHADOW_IN,
-                       NULL,
-                       widget,
-                       "arrow",
-                       GTK_ARROW_LEFT,
-                       FALSE,
-                       4,
-                       4,
-                       height - 8,
-                       height - 8);
-
-      gtk_paint_arrow (gtk_widget_get_style (widget),
-                       gtk_widget_get_window (widget),
-                       state_type_down,
-                       GTK_SHADOW_NONE,
-                       NULL,
-                       widget,
-                       "arrow",
-                       GTK_ARROW_RIGHT,
-                       FALSE,
-                       width - (height - 8) - 4,
-                       4,
-                       height - 8,
-                       height - 8);
-    }
+      cairo_fill (cr);
+    }
+  else
+    cairo_fill (cr);
+
+  cairo_set_line_width (cr, 2.0);
+  os_cairo_draw_rounded_rect (cr, x + 0.5, y + 0.5, width - 1, height - 1, radius - 1);
+  if (!priv->detached)
+    cairo_set_source_rgba (cr, style->bg[GTK_STATE_SELECTED].red/65535.0,
+                               style->bg[GTK_STATE_SELECTED].green/65535.0,
+                               style->bg[GTK_STATE_SELECTED].blue/65535.0, 1.0f);
+  else
+    cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, 1.0f);
+  cairo_stroke (cr);
+
+  cairo_set_line_width (cr, 1.0);
+  os_cairo_draw_rounded_rect (cr, x + 1, y + 1, width - 2, height - 2, radius - 1);
+  cairo_set_source_rgba (cr, 0.1, 0.1, 0.1, 0.1);
+  cairo_stroke (cr);
+
+  os_cairo_draw_rounded_rect (cr, x + 2, y + 2, width - 4, height - 4, radius - 3);
+  cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, 0.5);
+  cairo_stroke (cr);
+
+  os_cairo_draw_rounded_rect (cr, x + 3, y + 3, width - 6, height - 6, radius - 4);
+  cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
+  cairo_stroke (cr);
+
+  if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+    {
+      cairo_move_to (cr, x + 2.5, y - 1 + height / 2);
+      cairo_line_to (cr, width - 2.5, y - 1 + height / 2);
+      cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, 0.4);
+      cairo_stroke (cr);
+
+      cairo_move_to (cr, x + 2.5, y + height / 2);
+      cairo_line_to (cr, width - 2.5, y + height / 2);
+      cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
+      cairo_stroke (cr);
+    }
+  else
+    {
+      cairo_move_to (cr, x - 1 + width / 2, y + 2.5);
+      cairo_line_to (cr, x - 1 + width / 2, height - 2.5);
+      cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, 0.4);
+      cairo_stroke (cr);
+
+      cairo_move_to (cr, x + width / 2, y + 2.5);
+      cairo_line_to (cr, x + width / 2, height - 2.5);
+      cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
+      cairo_stroke (cr);
+    }
+
+  if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+    {
+      /* direction UP. */
+      cairo_save (cr);
+      cairo_translate (cr, 8.5, 8.5);
+      cairo_rotate (cr, G_PI);  
+      os_cairo_draw_arrow (cr, 0.5, 0, 4, 3);
+      cairo_restore (cr);
+
+      /* direction DOWN. */
+      cairo_save (cr);
+      cairo_translate (cr, 8.5, height - 8.5);
+      cairo_rotate (cr, 0);
+      os_cairo_draw_arrow (cr, -0.5, 0, 4, 3);
+      cairo_restore (cr);
+    }
+  else
+    {
+      /* direction LEFT. */
+      cairo_save (cr);
+      cairo_translate (cr, 8.5, 8.5);
+      cairo_rotate (cr, G_PI * 0.5);  
+      os_cairo_draw_arrow (cr, -0.5, 0, 4, 3);
+      cairo_restore (cr);
+
+      /* direction RIGHT. */
+      cairo_save (cr);
+      cairo_translate (cr, width - 8.5, 8.5);
+      cairo_rotate (cr, G_PI * 1.5);
+      os_cairo_draw_arrow (cr, 0.5, 0, 4, 3);
+      cairo_restore (cr);
+    }
+
+  cairo_restore (cr);
+
+  cairo_restore (cr);
 
   cairo_destroy (cr);
 
@@ -802,3 +821,27 @@
 {
   return g_object_new (OS_TYPE_THUMB, "orientation", orientation, NULL);
 }
+
+/**
+ * os_thumb_set_detached:
+ * @thumb: a #OsThumb
+ * @detached: a gboolean
+ *
+ * Sets the thumb to be detached.
+ **/
+void
+os_thumb_set_detached (OsThumb *thumb,
+                       gboolean detached)
+{
+  OsThumbPrivate *priv;
+
+  g_return_if_fail (OS_THUMB (thumb));
+
+  priv = thumb->priv;
+
+  if (priv->detached != detached)
+    {
+      priv->detached = detached;
+      gtk_widget_queue_draw (GTK_WIDGET (thumb));
+    }
+}