[Xfce4-commits] <xfce4-panel:master> Fix the previous commit with hidden icons.

[Nick Schermer]

Updating branch refs/heads/master
         to d665fa2e7187b47e3c056dfd99aece9cf0dce20e (commit)
       from 021bb3d5a31fefeb69f180ff479a2001cdf30412 (commit)

commit d665fa2e7187b47e3c056dfd99aece9cf0dce20e
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Nov 16 17:33:45 2010 +0100

    Fix the previous commit with hidden icons.

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

diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 810e10c..f8f478a 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -467,7 +467,9 @@ systray_box_size_allocate (GtkWidget     *widget,
   if (box->rows == 1)
     {
       child_size = IS_HORIZONTAL (box) ? width : height;
-      n = g_slist_length (box->childeren) - box->n_hidden_childeren;
+      if (box->n_hidden_childeren > 0)
+         child_size -= BUTTON_SIZE + SPACING;
+      n = g_slist_length (box->childeren) - (box->show_hidden ? 0 : box->n_hidden_childeren);
       child_size -= SPACING * MAX (n - 1, 0);
       child_size /= n;