Merge lp:~malaperle/overlay-scrollbar/default into lp:overlay-scrollbar

[Marc-Andre Laperle]

Fix scrollbar not visible when it's the only child in a container.

[Adolfo Jayme Barrientos (fitojb)]

Please rebase your branch and resolve conflicts :-)

review: Needs Fixing

[Adolfo Jayme Barrientos (fitojb)]

Thank you very much for sending this fix, and for keeping up with trunk! Looks sensible to me, but someone from the team must review this :-)

review: Abstain

[Marc-Andre Laperle (malaperle)]

Is there any way I can improve my fix or help with the review process? Should I add more comments to explain the issue?

Thanks!

Unmerged revisions

379. By Marc-Andre Laperle on 2013-07-19

Scrollbar not visible when it's the only child in a container (LP: #1188831)

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2013-02-05 22:44:35 +0000
+++ os/os-scrollbar.c	2013-07-19 15:43:30 +0000
@@ -3712,6 +3712,8 @@
           if (priv->side == OS_SIDE_RIGHT)
             priv->bar_all.x = allocation->x - BAR_SIZE;
 
+          priv->bar_all.x = MAX(priv->bar_all.x, 0);
+
           priv->bar_all.width = BAR_SIZE;
 
           priv->thumb_all.width = THUMB_WIDTH;
@@ -3721,6 +3723,8 @@
           else
             priv->thumb_all.x = allocation->x + priv->bar_all.width - priv->thumb_all.width;
 
+          priv->thumb_all.x = MAX(priv->thumb_all.x, 0);
+
           allocation->width = 0;
         }
       else
@@ -3735,6 +3739,8 @@
           if (priv->side == OS_SIDE_BOTTOM)
             priv->bar_all.y = allocation->y - BAR_SIZE;
 
+          priv->bar_all.y = MAX(priv->bar_all.y, 0);
+
           priv->bar_all.height = BAR_SIZE;
 
           priv->thumb_all.height = THUMB_WIDTH;
@@ -3744,6 +3750,8 @@
           else
             priv->thumb_all.y = allocation->y + priv->bar_all.height - priv->thumb_all.height;
 
+          priv->thumb_all.y = MAX(priv->thumb_all.y, 0);
+
           allocation->height = 0;
         }
 
@@ -3930,10 +3938,23 @@
 
       priv = get_private (widget);
 
+      int requested_bar_size = 0;
+
+      /* If the scrollbar is alone in a container, make sure it requests
+       *  some size so that it gets drawn */
+      GtkWidget* parent = gtk_widget_get_parent (widget);
+      if (!GTK_IS_SCROLLED_WINDOW (parent))
+        {
+          GList* list = gtk_container_get_children(GTK_CONTAINER(parent));
+          if (!list->next)
+            requested_bar_size = BAR_SIZE;
+          g_list_free (list);
+        }
+
       if (priv->orientation == GTK_ORIENTATION_VERTICAL)
-        requisition->width = 0;
+        requisition->width = requested_bar_size;
       else
-        requisition->height = 0;
+        requisition->height = requested_bar_size;
 
       widget->requisition = *requisition;