[9front] [PATCH] winwatch: always reflow when possible

[9front] [PATCH] winwatch: always reflow when possible

[telephil9]

Hi

Currently winwatch does not reflow its content unless there is the need to 
add a new row or column.
This leads to the rectangles not filling the window and leaving unused blank spaces.
The patch below changes this behaviour by reflowing as soon as the number of rows or
columns changes.

--phil


diff -r f020e57da8d6 sys/src/cmd/winwatch.c
--- a/sys/src/cmd/winwatch.c	Thu Dec 17 20:26:38 2020 -0800
+++ b/sys/src/cmd/winwatch.c	Mon Feb 01 20:01:23 2021 +0100
@@ -185,19 +185,21 @@
 int
 geometry(void)
 {
-	int i, ncols, z;
+	int i, nrows, ncols, z;
 	Rectangle r;
 
 	z = 0;
-	rows = (Dy(screen->r)-2*MARGIN+PAD)/(font->height+PAD);
-	if(rows <= 0)
-		rows = 1;
-	if(rows*cols < nwin || rows*cols >= nwin*2){
-		ncols = nwin <= 0 ? 1 : (nwin+rows-1)/rows;
-		if(ncols != cols){
-			cols = ncols;
-			z = 1;
-		}
+	nrows = (Dy(screen->r)-2*MARGIN+PAD)/(font->height+PAD);
+	if(nrows <= 0)
+		nrows = 1;
+	if(nrows != rows){
+		rows = nrows;
+		z = 1;
+	}
+	ncols = nwin <= 0 ? 1 : (nwin+rows-1)/rows;
+	if(ncols != cols){
+		cols = ncols;
+		z = 1;
 	}
 
 	r = Rect(0,0,(Dx(screen->r)-2*MARGIN+PAD)/cols-PAD, font->height);

Re: [9front] [PATCH] winwatch: always reflow when possible

[Sigrid Solveig Haflínudóttir]

Applied, thanks.