commit 28a8042cec63a2868607328ff20cd44211d75122
from: rsc <devnull@localhost>
date: Sun Mar 19 06:11:51 2006 UTC

autoresize (erik quanstrom)

commit - acf8398fefe0b59da1ad20d06de5b11de3bdbc53
commit + 28a8042cec63a2868607328ff20cd44211d75122
blob - 4d6ddd9c3e3b527d01633b7265f4cbc5969c3058
blob + e9ab20c497ac621899b2512b0ca9b380b691fe52
--- src/cmd/jpg/bmp.c
+++ src/cmd/jpg/bmp.c
@@ -36,7 +36,7 @@ eresized(int new)
 	if(image == nil)
 		return;
 	r = rectaddpt(image->r, subpt(screen->r.min, image->r.min));
-	if(!new)
+	if(!new && !winsize)
 		drawresizewindow(r);
 	flushimage(display, 1);
 }
blob - 29675118220e6b311ab98bec58ea4fd7b725bf4a
blob + d154740b1c7f48794646c1eaa06a01a9ad2868a7
--- src/cmd/jpg/gif.c
+++ src/cmd/jpg/gif.c
@@ -49,7 +49,7 @@ eresized(int new)
 	if(allims==nil || allims[which]==nil)
 		return;
 	r = rectaddpt(allims[0]->r, subpt(screen->r.min, allims[0]->r.min));
-	if(!new)
+	if(!new && !winsize)
 		drawresizewindow(r);
 	r = rectaddpt(r, subpt(allims[which]->r.min, allims[0]->r.min));
 	drawop(screen, r, allims[which], allmasks[which], allims[which]->r.min, S);
blob - fafa9b8c3419f94384a225846df1ccc5836a5f7b
blob + f74da4c54b71ff985761e6a02e15a553b10b2e16
--- src/cmd/jpg/jpg.c
+++ src/cmd/jpg/jpg.c
@@ -38,7 +38,7 @@ eresized(int new)
 	if(image == nil)
 		return;
 	r = rectaddpt(image->clipr, subpt(screen->r.min, image->clipr.min));
-	if(!new)
+	if(!new && !winsize)
 		drawresizewindow(r);
 	draw(screen, r, image, nil, image->r.min);
 	flushimage(display, 1);
blob - 06cedc602bdc4961f0334ac793103bb393e92687
blob + 115524cd8a80e454eae0bfdad322ce638ace79d1
--- src/cmd/jpg/png.c
+++ src/cmd/jpg/png.c
@@ -36,7 +36,7 @@ eresized(int new)
 	if(image == nil)
 		return;
 	r = rectaddpt(image->r, subpt(screen->r.min, image->r.min));
-	if(!new)
+	if(!new && !winsize)
 		drawresizewindow(r);
 	draw(screen, r, image, nil, image->r.min);
 	flushimage(display, 1);
blob - d90344ed997f7e46a257c7d1fcf36c65b437367b
blob + c9c8d3778f1950a35d6c00eebe9fed86546f251d
--- src/cmd/jpg/ppm.c
+++ src/cmd/jpg/ppm.c
@@ -33,10 +33,9 @@ eresized(int new)
 	}
 	if(image == nil)
 		return;
-	r = insetrect(screen->clipr, Edge+Border);
-	r.max.x = r.min.x+Dx(image->r);
-	r.max.y = r.min.y+Dy(image->r);
-	border(screen, r, -Border, nil, ZP);
+	r = rectaddpt(image->r, subpt(screen->r.min, image->r.min));
+	if(!new && !winsize)
+		drawresizewindow(r);
 	draw(screen, r, image, nil, image->r.min);
 	flushimage(display, 1);
 }