[Xfce4-commits] <xfce4-panel:master> Panel: Fixed minimum size of expandable items.

[Nick Schermer]

Updating branch refs/heads/master
         to f81977772cf34abcfc3fb2e78238e83ebdf60923 (commit)
       from c84590a2bfb8c2b6752785ee5d47c176e85a7a94 (commit)

commit f81977772cf34abcfc3fb2e78238e83ebdf60923
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Tue Dec 27 07:22:32 2011 +0900

    Panel: Fixed minimum size of expandable items.
    
    (cherry picked from commit 4c86ea04a09c2c6770059f3a3f4ac720673ca7d8)

 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 15ef62b..99ecf9f 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -502,13 +502,13 @@ panel_itembar_size_allocate (GtkWidget     *widget,
    * not the length set by the user) */
   expand_children_fit = expand_len_req == expand_len_avail;
 
-  if (expand_len_avail < 0)
+  if (expand_len_avail < expand_len_req)
     {
       /* check if there are plugins on the panel we can shrink */
       if (shrink_len_avail > 0)
-        shrink_len_req = ABS (expand_len_avail);
+        shrink_len_req = expand_len_req - expand_len_avail;
 
-      expand_len_avail = 0;
+      expand_len_avail = expand_len_req;
     }
 
   /* init coordinates for first child */