[Xfce4-commits] <xfce4-panel:andrzejr/deskbar-github> itembar: fixed layout errors (calculation of panel size and expansion area)

[Andrzej]

Updating branch refs/heads/andrzejr/deskbar-github
         to 94c8124cf50a79b688d33ccc324e9ab0aef6bc37 (commit)
       from 15c8029c835781d5ec7e592c283226b1e6057a67 (commit)

commit 94c8124cf50a79b688d33ccc324e9ab0aef6bc37
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sun Nov 20 00:01:32 2011 +0900

    itembar: fixed layout errors (calculation of panel size and expansion area)

 panel/panel-itembar.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index 29f5efe..9ea21aa 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -332,7 +332,7 @@ panel_itembar_column_next (PanelItembar      *itembar,
                            gint              *y)
 {
   (*column_row)++;
-  if (*column_row < itembar->nrows) {
+  if (*column_row < (gint) itembar->nrows) {
     if (itembar->horizontal)
       *y += itembar->size / itembar->nrows;
     else
@@ -384,7 +384,7 @@ panel_itembar_size_request (GtkWidget      *widget,
                   column_row ++;
                   row_length += (itembar->size / itembar->nrows);
                 }
-              else if (column_row < itembar->nrows)
+              else if (column_row < (gint) itembar->nrows - 1)
                 column_row ++;
               else
                 column_row = 0;
@@ -498,7 +498,7 @@ panel_itembar_size_allocate (GtkWidget     *widget,
                       column_row ++;
                       expand_length_avail -= (itembar->size / itembar->nrows);
                     }
-                  else if (column_row < itembar->nrows)
+                  else if (column_row < (gint) itembar->nrows - 1)
                     column_row ++;
                   else
                     column_row = 0;