Fix PanelIconGrid layout on vertical panels with more than 1 column.

diff --git a/ChangeLog b/ChangeLog
index 5b14a5c..0023f08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,7 @@
 * Added a workaround on GtkBox behavior which does not send allocation
     requests to children in some cases, so resizing of launchtaskbar on
     panel height change was broken.
+* Fixed PanelIconGrid layout on vertical panels with more than 1 column.
 
 0.8.2
 -------------------------------------------------------------------------

diff --git a/src/icon-grid.c b/src/icon-grid.c
index a69fcba..22e6703 100644 (file)
--- a/src/icon-grid.c
+++ b/src/icon-grid.c
@@ -214,20 +214,15 @@ static void panel_icon_grid_size_allocate(GtkWidget *widget,
                 x = next_coord;
                 if (direction == GTK_TEXT_DIR_RTL)
                 {
-                    next_coord = x - child_allocation.width;
-                    if (x < allocation->width - x_border)
+                    if (x < allocation->width - x_border && x - child_allocation.width < x_border)
                     {
-                        next_coord -= ig->spacing;
-                        if (next_coord < x_border)
-                        {
-                            next_coord = allocation->width - x_border;
-                            y += child_height + ig->spacing;
-                        }
+                        x = allocation->width - x_border;
+                        y += child_height + ig->spacing;
                     }
+                    next_coord = x - child_allocation.width - ig->spacing;
                 }
                 else
                 {
-                    x = next_coord;
                     if (x + child_allocation.width > allocation->width - x_border && x > x_border)
                     {
                         x = x_border;
@@ -326,13 +321,15 @@ static void panel_icon_grid_size_request(GtkWidget *widget,
             {
                 gtk_widget_size_request(ige->data, &child_requisition);
                 icon_grid_element_check_requisition(ig, &child_requisition);
-                if (w > 0 && w + child_requisition.width > target_dimension)
-                {
-                    w = 0;
-                    ig->rows++;
-                }
                 if (w > 0)
+                {
                     w += ig->spacing;
+                    if (w + child_requisition.width + (int)border > target_dimension)
+                    {
+                        w = 0;
+                        ig->rows++;
+                    }
+                }
                 w += child_requisition.width;
                 requisition->width = MAX(requisition->width, w);
             }