wmii

commit e0c943a09b543d994b800bc76ada0fba72e0dbcd
parent fca197fdb342c4faf1faf553e5745280f88dae5c
Author: Sander van Dijk <sander@wmii.de>
Date:   Wed,  3 May 2006 21:26:21 +0000

small update to previous patch


Diffstat:
cmd/wm/column.c
 | 
4
++++
cmd/wm/view.c
 | 
4
++++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/cmd/wm/column.c b/cmd/wm/column.c
@@ -124,11 +124,15 @@ scale_column(Area *a, float h)
 	for(i = 0; i < a->frame.size; i++) {
 		Frame *f = a->frame.data[i];
 		f->rect.height *= scale;
+		if(i == a->frame.size - 1)
+			f->rect.height = h - yoff;
+		yoff += f->rect.height;
 	}
 
 	/* min_height can only be respected when there is enough space; the caller should guarantee this */
 	if(a->frame.size * min_height > h)
 		return;
+	yoff = 0;
 	for(i = 0; i < a->frame.size; i++) {
 		Frame *f = a->frame.data[i];
 		if(f->rect.height < min_height)
diff --git a/cmd/wm/view.c b/cmd/wm/view.c
@@ -284,11 +284,15 @@ scale_view(View *v, float w)
 	for(i = 1; i < v->area.size; i++) {
 		Area *a = v->area.data[i];
 		a->rect.width *= scale;
+		if(i == v->area.size - 1)
+			a->rect.width = w - xoff;
+		xoff += a->rect.width;
 	}
 
 	/* MIN_COLWIDTH can only be respected when there is enough space; the caller should guarantee this */
 	if((v->area.size - 1) * MIN_COLWIDTH > w)
 		return;
+	xoff = 0;
 	for(i = 1; i < v->area.size; i++) {
 		Area *a = v->area.data[i];
 		if(a->rect.width < MIN_COLWIDTH)