Updating branch refs/heads/master to 8272c586561c90ff29eedf552099d7b7d701a575 (commit) from 2c3cac4b3aeeb13b5a53e9ac0d5a690060a91ab8 (commit)
commit 8272c586561c90ff29eedf552099d7b7d701a575 Author: Andrzej <ndrwr...@gmail.com> Date: Mon Sep 2 02:35:31 2013 +0100 Force buttons to fit in the panel panel-plugin/indicator-box.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c index 4f0b98f..7dc744c 100644 --- a/panel-plugin/indicator-box.c +++ b/panel-plugin/indicator-box.c @@ -491,9 +491,9 @@ xfce_indicator_box_size_allocate (GtkWidget *widget, border_thickness = MAX (padding.left+padding.right+border.left+border.right, padding.top+padding.bottom+border.top+border.bottom); - size = ICON_SIZE + border_thickness; panel_size = indicator_config_get_panel_size (box->config); - nrows = MAX (1, panel_size / size); + size = MIN (ICON_SIZE + border_thickness, panel_size); + nrows = panel_size / size; //full_size = ((nrows-1)*panel_size + nrows*size) / nrows; // regular pitch, margins full_size = panel_size; // irregular pitch, no margins _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits