plan9port

commit 28a8042cec63a2868607328ff20cd44211d75122
parent acf8398fefe0b59da1ad20d06de5b11de3bdbc53
Author: rsc <devnull@localhost>
Date:   Sun, 19 Mar 2006 06:11:51 +0000

autoresize (erik quanstrom)

Diffstat:
M
src/cmd/jpg/bmp.c
 | 
2
+-
M
src/cmd/jpg/gif.c
 | 
2
+-
M
src/cmd/jpg/jpg.c
 | 
2
+-
M
src/cmd/jpg/png.c
 | 
2
+-
M
src/cmd/jpg/ppm.c
 | 
7
+++----

5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/cmd/jpg/bmp.c b/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);
 }
diff --git a/src/cmd/jpg/gif.c b/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);
diff --git a/src/cmd/jpg/jpg.c b/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);
diff --git a/src/cmd/jpg/png.c b/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);
diff --git a/src/cmd/jpg/ppm.c b/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);
 }