Merge lp:~cimi/overlay-scrollbar/deal-with-small-heights into lp:overlay-scrollbar

[Andrea Cimitan]

See the commit

[Ted Gould (ted)]

review: Approve

=== modified file 'os/os-private.h'
--- os/os-private.h	2011-06-15 12:07:47 +0000
+++ os/os-private.h	2011-06-27 17:07:42 +0000
@@ -175,6 +175,10 @@
 
 GtkWidget* os_thumb_new          (GtkOrientation orientation);
 
+void       os_thumb_resize       (OsThumb *thumb,
+                                  gint     width,
+                                  gint     height);
+
 void       os_thumb_set_detached (OsThumb *thumb,
                                   gboolean detached);
 

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-06-27 13:37:17 +0000
+++ os/os-scrollbar.c	2011-06-27 17:07:42 +0000
@@ -2310,7 +2310,11 @@
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     *minimal_width = *natural_width = 0;
   else
-    GTK_WIDGET_CLASS (os_scrollbar_parent_class)->get_preferred_width (widget, minimal_width, natural_width);
+    {
+      /* smaller than 35 pixels the thumb looks weird. */
+      *minimal_width = 35;
+      *natural_width = THUMB_HEIGHT;
+    }
 }
 
 static void
@@ -2327,7 +2331,11 @@
   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
     *minimal_height = *natural_height = 0;
   else
-    GTK_WIDGET_CLASS (os_scrollbar_parent_class)->get_preferred_height (widget, minimal_height, natural_height);
+    {
+      /* smaller than 35 pixels the thumb looks weird. */
+      *minimal_height = 35;
+      *natural_height = THUMB_HEIGHT;
+    }
 }
 #endif
 
@@ -2461,7 +2469,11 @@
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
       priv->slider.width = THUMB_WIDTH;
-      priv->slider.height = THUMB_HEIGHT;
+      if (priv->slider.height != MIN (THUMB_HEIGHT, allocation->height))
+        {
+          priv->slider.height = MIN (THUMB_HEIGHT, allocation->height);
+          os_thumb_resize (OS_THUMB (priv->thumb), priv->slider.width, priv->slider.height);
+        }
 
       priv->pager_all.x = allocation->x - PAGER_SIZE;
       priv->pager_all.width = PAGER_SIZE;
@@ -2473,8 +2485,12 @@
     }
   else
     {
-      priv->slider.width = THUMB_HEIGHT;
       priv->slider.height = THUMB_WIDTH;
+      if (priv->slider.width != MIN (THUMB_HEIGHT, allocation->width))
+        {
+          priv->slider.width = MIN (THUMB_HEIGHT, allocation->width);
+          os_thumb_resize (OS_THUMB (priv->thumb), priv->slider.width, priv->slider.height);
+        }
 
       priv->pager_all.y = allocation->y - PAGER_SIZE;
       priv->pager_all.height = PAGER_SIZE;

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-06-27 16:02:50 +0000
+++ os/os-thumb.c	2011-06-27 17:07:42 +0000
@@ -855,6 +855,24 @@
 }
 
 /**
+ * os_thumb_resize:
+ * @thumb: a #OsThumb
+ * @width: width in pixels
+ * @height: height in pixels
+ *
+ * Resize the thumb.
+ **/
+void
+os_thumb_resize (OsThumb *thumb,
+                 gint     width,
+                 gint     height)
+{
+  g_return_if_fail (OS_THUMB (thumb));
+
+  gtk_window_resize (GTK_WINDOW (thumb), width, height);
+}
+
+/**
  * os_thumb_set_detached:
  * @thumb: a #OsThumb
  * @detached: a gboolean