[Xfce4-commits] <xfce4-panel:andrzejr/deskbar-github> itembar: fixed layout error in single-row panels.

[Andrzej]

Updating branch refs/heads/andrzejr/deskbar-github
         to 76a0b4e0395a81bab6df380b8b748861afcd9655 (commit)
       from 0b236e43216977b6d5f2e09c1aa917ba7707cafd (commit)

commit 76a0b4e0395a81bab6df380b8b748861afcd9655
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Wed Nov 23 18:57:11 2011 +0900

    itembar: fixed layout error in single-row panels.

 panel/panel-itembar.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index 9a6f3e4..b81d7c5 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -381,7 +381,12 @@ panel_itembar_size_request (GtkWidget      *widget,
 
           if (child->small)
             {
-              if (column_row == 0)
+              if (itembar->nrows == 1)
+                {
+                  column_row = 0;
+                  row_length += (itembar->size / itembar->nrows);
+                }
+              else if (column_row == 0)
                 {
                   column_row ++;
                   row_length += (itembar->size / itembar->nrows);
@@ -495,7 +500,12 @@ panel_itembar_size_allocate (GtkWidget     *widget,
 
               if (child->small)
                 {
-                  if (column_row == 0)
+                  if (itembar->nrows == 1)
+                    {
+                      column_row = 0;
+                      expand_length_avail -= (itembar->size / itembar->nrows);
+                    }
+                  else if (column_row == 0)
                     {
                       column_row ++;
                       expand_length_avail -= (itembar->size / itembar->nrows);