[Xfce4-commits] <xfce4-panel:andrzejr/deskbar-panel> panel-itembar: syncing with nick/desktop-mode branch.

[Andrzej]

Updating branch refs/heads/andrzejr/deskbar-panel
         to 8d7d8e0df157017e5faa344cacd521d79b29129e (commit)
       from 89a539aea924c4d2d9ccf3096363029c73e092d3 (commit)

commit 8d7d8e0df157017e5faa344cacd521d79b29129e
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Tue Dec 13 14:03:26 2011 +0900

    panel-itembar: syncing with nick/desktop-mode branch.

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

diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index eb8d2d7..fbd42bc 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -601,7 +601,7 @@ panel_itembar_size_allocate (GtkWidget     *widget,
 
           if (IS_HORIZONTAL (itembar))
             {
-              child_alloc.height = MIN (itembar->size, child_req.height);
+              child_alloc.height = itembar->size;
               child_alloc.width = child_len;
 
               /* pack next small item below this one */
@@ -609,7 +609,7 @@ panel_itembar_size_allocate (GtkWidget     *widget,
             }
           else
             {
-              child_alloc.width = MIN (itembar->size, child_req.width);
+              child_alloc.width = itembar->size;
               child_alloc.height = child_len;
 
               /* pack next time right of this one */
@@ -651,7 +651,6 @@ panel_itembar_size_allocate (GtkWidget     *widget,
 
           if (IS_HORIZONTAL (itembar))
             {
-              /* child_alloc.height = MIN (rows_size, child_req.height); */
               child_alloc.height = rows_size;
               child_alloc.width = child_len;
 
@@ -659,7 +658,6 @@ panel_itembar_size_allocate (GtkWidget     *widget,
             }
           else
             {
-              /* child_alloc.width = MIN (rows_size, child_req.width); */
               child_alloc.width = rows_size;
               child_alloc.height = child_len;