[Xfce4-commits] <xfce4-panel:master> Systray: Fix problem in border allocation.

[Nick Schermer]

Updating branch refs/heads/master
         to 70d376e5485c7208012adb2aa2bc1b3f74f274d2 (commit)
       from 6290f09b669067378c0538ed0d43775104225b75 (commit)

commit 70d376e5485c7208012adb2aa2bc1b3f74f274d2
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Sep 11 14:19:42 2011 +0200

    Systray: Fix problem in border allocation.

 plugins/systray/systray-box.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index aca2def..11fe6da 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -399,11 +399,12 @@ systray_box_size_allocate (GtkWidget     *widget,
   border = GTK_CONTAINER (widget)->border_width;
 
   alloc_size = box->horizontal ? allocation->height : allocation->width;
+  alloc_size -= 2 * border;
   systray_box_size_get_max_child_size (box, alloc_size, &rows, &row_size, &offset);
 
-  panel_debug_filtered (PANEL_DEBUG_SYSTRAY, "allocate rows=%d, row_size=%d, w=%d, h=%d, horiz=%s",
+  panel_debug_filtered (PANEL_DEBUG_SYSTRAY, "allocate rows=%d, row_size=%d, w=%d, h=%d, horiz=%s, border=%d",
                         rows, row_size, allocation->width, allocation->height,
-                        PANEL_DEBUG_BOOL (box->horizontal));
+                        PANEL_DEBUG_BOOL (box->horizontal), border);
 
   /* get allocation bounds */
   x_start = allocation->x + border;