Fix wrong PanelIconGrid arrangement in vertical panel orientation.
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Sat, 13 Dec 2014 18:39:38 +0000 (20:39 +0200)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Sat, 13 Dec 2014 18:39:38 +0000 (20:39 +0200)
The size request missed spacing in width calculation for vertical orientation.

ChangeLog
Makefile.am
src/icon-grid.c

index 1890918..afeeeb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 * Fixed expand setting on plugins with default_expand when more than one
     is available on the same panel.
 * Fixed icon for task button that retrieved using WM_HINTS.
+* Fixed wrong PanelIconGrid arrangement in vertical panel orientation.
 
 0.8.0
 -------------------------------------------------------------------------
index 2d67e5a..586cb09 100644 (file)
@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS= -I m4
 
-SUBDIRS = src plugins data po man
+SUBDIRS = plugins src data po man
 
 EXTRA_DIST = \
         autogen.sh \
index baaf5cc..7868c75 100644 (file)
@@ -292,6 +292,8 @@ static void panel_icon_grid_size_request(GtkWidget *widget,
                     w = 0;
                     ig->rows++;
                 }
+                if (w > 0)
+                    w += ig->spacing;
                 w += child_requisition.width;
                 requisition->width = MAX(requisition->width, w);
             }
@@ -304,6 +306,8 @@ static void panel_icon_grid_size_request(GtkWidget *widget,
         requisition->height = 0;
     else
         requisition->height = (ig->child_height + ig->spacing) * ig->rows - ig->spacing + 2 * border;
+    if (requisition->width > 0)
+        requisition->width += 2 * border;
 
     if (ig->rows != old_rows || ig->columns != old_columns)
         gtk_widget_queue_resize(widget);