[Xfce4-commits] <xfce4-panel:master> Panel: Fixed a bug in handling shrinkable plugins.

[Nick Schermer]

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

commit a56f1d0b5f2ef79b2aa60c7894274117b2a6cebc
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Tue Dec 27 07:47:35 2011 +0900

    Panel: Fixed a bug in handling shrinkable plugins.
    
    When a shrinkable plugin was shrunk too much it was
    given an allocation area equal to the requested area.
    In such case we'd rather want it to stay at a minimum
    size (child_len=1px, which is set immediately below).
    
    (cherry picked from commit 4f0b035f64a06dbb1f410ca38390c7146df39c99)

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

diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index 99ecf9f..2f3564c 100644
--- a/panel/panel-itembar.c
+++ b/panel/panel-itembar.c
@@ -579,11 +579,7 @@ panel_itembar_size_allocate (GtkWidget     *widget,
           shrink_len_req -= new_len;
           shrink_len_avail -= child_len;
 
-          /* the size we decrease can never be more then the actual length,
-           * if this is the case the size allocation is lacking behind,
-           * which happens on panel startup with a expanding panel */
-          if (new_len < child_len)
-            child_len -= new_len;
+          child_len -= new_len;
         }
 
       if (G_UNLIKELY (child_len < 1))