From 104717c0169c5ea744f01221c182f512d397024e Mon Sep 17 00:00:00 2001 From: nathan Date: Sun, 17 Sep 2017 17:41:37 +0200 Subject: [PATCH] Fixed auto-resizing images --- .../systemTray/util/ImageResizeUtil.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/dorkbox/systemTray/util/ImageResizeUtil.java b/src/dorkbox/systemTray/util/ImageResizeUtil.java index 8746f96..307c849 100644 --- a/src/dorkbox/systemTray/util/ImageResizeUtil.java +++ b/src/dorkbox/systemTray/util/ImageResizeUtil.java @@ -220,11 +220,22 @@ class ImageResizeUtil { // if it's already there, we have to delete it newFile.delete(); - // resize the image, keep aspect ratio Image image = ImageUtil.getImageImmediate(ImageIO.read(inputStream)); - // the smaller dimension have padding, so the larger dimension is the size of this image. - BufferedImage bufferedImage = ImageUtil.getSquareBufferedImage(image); + BufferedImage bufferedImage = ImageUtil.getBufferedImage(image); + + // resize the image, keep aspect ratio + int width = bufferedImage.getWidth(); + int height = bufferedImage.getHeight(); + if (width > height) { + bufferedImage = ImageUtil.resizeImage(bufferedImage, size, -1); + } + else { + bufferedImage = ImageUtil.resizeImage(bufferedImage, -1, size); + } + + // make the image "square" so there is padding on the sides that are smaller + bufferedImage = ImageUtil.getSquareBufferedImage(bufferedImage); // now write out the new one ImageIO.write(bufferedImage, "png", newFile); // made up extension