resize window to fit image (Erik Quanstrom)

4 files changed, 13 insertions, 17 deletions

diff --git a/src/cmd/jpg/bmp.c b/src/cmd/jpg/bmp.c
index ba1b813a..4d6ddd9c 100644
--- a/src/cmd/jpg/bmp.c
+++ b/src/cmd/jpg/bmp.c
@@ -35,11 +35,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);
-	draw(screen, r, image, nil, image->r.min);
+	r = rectaddpt(image->r, subpt(screen->r.min, image->r.min));
+	if(!new)
+		drawresizewindow(r);
 	flushimage(display, 1);
 }
 
diff --git a/src/cmd/jpg/gif.c b/src/cmd/jpg/gif.c
index f8f89de9..29675118 100644
--- a/src/cmd/jpg/gif.c
+++ b/src/cmd/jpg/gif.c
@@ -48,10 +48,10 @@ eresized(int new)
 	}
 	if(allims==nil || allims[which]==nil)
 		return;
-	r = imager();
-	border(screen, r, -Border, nil, ZP);
-	r.min.x += allims[which]->r.min.x - allims[0]->r.min.x;
-	r.min.y += allims[which]->r.min.y - allims[0]->r.min.y;
+	r = rectaddpt(allims[0]->r, subpt(screen->r.min, allims[0]->r.min));
+	if(!new)
+		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);
 	flushimage(display, 1);
 }
diff --git a/src/cmd/jpg/jpg.c b/src/cmd/jpg/jpg.c
index 82dba4d7..fafa9b8c 100644
--- a/src/cmd/jpg/jpg.c
+++ b/src/cmd/jpg/jpg.c
@@ -37,10 +37,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->clipr, subpt(screen->r.min, image->clipr.min));
+	if(!new)
+		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
index a815abfc..06cedc60 100644
--- a/src/cmd/jpg/png.c
+++ b/src/cmd/jpg/png.c
@@ -35,10 +35,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)
+		drawresizewindow(r);
 	draw(screen, r, image, nil, image->r.min);
 	flushimage(display, 1);
 }