From 033c6013b27ae5f3eb33a8af7c18e5c664ac8e8c Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Mon, 2 May 2005 04:30:54 +0000
Subject: fix row dump/load inconsistency - thanks to peter canning

---
 src/cmd/acme/rows.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/cmd/acme/rows.c b/src/cmd/acme/rows.c
index caaab9d4..85799f0b 100644
--- a/src/cmd/acme/rows.c
+++ b/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)
-- 
cgit v1.2.3