Commit Diff

Commit:
033c6013b27ae5f3eb33a8af7c18e5c664ac8e8c
From:
rsc <devnull@localhost>
Date:
Message:
fix row dump/load inconsistency - thanks to peter canning
Actions:
Patch | Tree
commit - 7e9e092da8d0c91c8075d9f0a4b1700de8f46753
commit + 033c6013b27ae5f3eb33a8af7c18e5c664ac8e8c
blob - caaab9d45ede7c11b6d6b89d1e015fc8720a543a
blob + 85799f0be39d0a8f6d712f2cd056a81d8ca731a6
--- src/cmd/acme/rows.c
+++ src/cmd/acme/rows.c
@@ -74,7 +74,7 @@ rowadd(Row *row, Column *c, int x)
 			return nil;
 		draw(screen, r, display->white, nil, ZP);
 		r1 = r;
-		r1.max.x = min(x, r.max.x-50);
+		r1.max.x = min(x-Border, r.max.x-50);
 		if(Dx(r1) < 50)
 			r1.max.x = r1.min.x+50;
 		colresize(d, r1);
@@ -551,15 +551,17 @@ rowload(Row *row, char *file, int initing)
 			c2 = row->col[i];
 			r1 = c1->r;
 			r2 = c2->r;
-			r1.max.x = x;
-			r2.min.x = x+Border;
+			if(x<Border)
+				x = Border;
+			r1.max.x = x-Border;
+			r2.min.x = x;
 			if(Dx(r1) < 50 || Dx(r2) < 50)
 				continue;
 			draw(screen, Rpt(r1.min, r2.max), display->white, nil, ZP);
 			colresize(c1, r1);
 			colresize(c2, r2);
-			r2.min.x = x;
-			r2.max.x = x+Border;
+			r2.min.x = x-Border;
+			r2.max.x = x;
 			draw(screen, r2, display->black, nil, ZP);
 		}
 		if(i >= row->ncol)