commit 28a8042cec63a2868607328ff20cd44211d75122
author rsc <devnull@localhost> Sun Mar 19 06:11:51 2006 +0000
committer rsc <devnull@localhost> Sun Mar 19 06:11:51 2006 +0000
tree ac23fbd749a3f3f76aaa7452c8bcf8e8f5c7387b
parent acf8398fefe0b59da1ad20d06de5b11de3bdbc53

autoresize (erik quanstrom)

src/cmd/jpg/bmp.c

diff --git a/src/cmd/jpg/bmp.c b/src/cmd/jpg/bmp.c
index 4d6ddd9..e9ab20c 100644
--- a/src/cmd/jpg/bmp.c
+++ b/src/cmd/jpg/bmp.c
@@ -36,7 +36,7 @@
 	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);
 }

src/cmd/jpg/gif.c

diff --git a/src/cmd/jpg/gif.c b/src/cmd/jpg/gif.c
index 2967511..d154740 100644
--- a/src/cmd/jpg/gif.c
+++ b/src/cmd/jpg/gif.c
@@ -49,7 +49,7 @@
 	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);

src/cmd/jpg/jpg.c

diff --git a/src/cmd/jpg/jpg.c b/src/cmd/jpg/jpg.c
index fafa9b8..f74da4c 100644
--- a/src/cmd/jpg/jpg.c
+++ b/src/cmd/jpg/jpg.c
@@ -38,7 +38,7 @@
 	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);

src/cmd/jpg/png.c

diff --git a/src/cmd/jpg/png.c b/src/cmd/jpg/png.c
index 06cedc6..115524c 100644
--- a/src/cmd/jpg/png.c
+++ b/src/cmd/jpg/png.c
@@ -36,7 +36,7 @@
 	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);

src/cmd/jpg/ppm.c

diff --git a/src/cmd/jpg/ppm.c b/src/cmd/jpg/ppm.c
index d90344e..c9c8d37 100644
--- a/src/cmd/jpg/ppm.c
+++ b/src/cmd/jpg/ppm.c
@@ -33,10 +33,9 @@
 	}
 	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);
 }