Updating branch refs/heads/master
to ca464ed6910764a38c290247eb77c1f681e6f22a (commit)
from 500b5a06c74e37026d656bc6f0f59851a4edebab (commit)
commit ca464ed6910764a38c290247eb77c1f681e6f22a
Author: Nick Schermer <[email protected]>
Date: Mon Dec 12 19:50:53 2011 +0100
Panel: Allocate panel size for all plugins.
panel/panel-itembar.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c
index 351ab01..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,14 +651,14 @@ 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;
x += child_len;
}
else
{
- child_alloc.width = MIN (rows_size, child_req.width);
+ child_alloc.width = rows_size;
child_alloc.height = child_len;
y += child_len;
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
