wmii

commit 92814d3fd4f761e91849f9cdff0d25a2b607bf5c
parent 20431e4bc1d94b0a73f2de7d94ec955dcab762d8
Author: Sander van Dijk <sander@wmii.de>
Date:   Thu, 13 Apr 2006 21:28:04 +0000

respect MIN_COLWIDTH in the column rescaling mechanism


Diffstat:
cmd/wm/view.c
 | 
5
+++++

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/cmd/wm/view.c b/cmd/wm/view.c
@@ -279,6 +279,7 @@ arrange_view(View *v, Bool dirty)
 {
 	unsigned int i, xoff = 0;
 	unsigned int dx = 0;
+	int wdiff = 0;
 	float scale = 1.0;
 
 	if(v->area.size == 1)
@@ -296,6 +297,10 @@ arrange_view(View *v, Bool dirty)
 			a->rect.y = 0;
 			a->rect.height = rect.height - brect.height;
 			a->rect.width *= scale;
+			if(a->rect.width < MIN_COLWIDTH)
+				a->rect.width = MIN_COLWIDTH;
+			else if((wdiff = a->rect.x + a->rect.width - rect.width + (v->area.size - 1 - i) * MIN_COLWIDTH) > 0)
+				a->rect.width -= wdiff;
 			xoff += a->rect.width;
 		}
 		arrange_column(a, False);