From a58b2d3fdfd6dcb6c5c98b52a01995da351005f9 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 2 Feb 2021 23:26:18 -0500 Subject: [PATCH] Revert "image component: support setPreferredSize" This reverts commit 5e7242388daedef973ee3504a1831a093d42fc0a. --- .../ui/overlay/components/ImageComponent.java | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ImageComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ImageComponent.java index 46f07f0515..39ec431697 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ImageComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ImageComponent.java @@ -24,37 +24,35 @@ */ package net.runelite.client.ui.overlay.components; -import com.google.common.base.MoreObjects; import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; import java.awt.image.BufferedImage; import lombok.Getter; -import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.Setter; -import net.runelite.client.util.ImageUtil; @RequiredArgsConstructor +@Setter public class ImageComponent implements LayoutableRenderableEntity { - @NonNull private final BufferedImage image; - private BufferedImage scaledImage; - @Getter private final Rectangle bounds = new Rectangle(); - @Setter private Point preferredLocation = new Point(); @Override public Dimension render(Graphics2D graphics) { - BufferedImage i = MoreObjects.firstNonNull(scaledImage, image); - graphics.drawImage(i, preferredLocation.x, preferredLocation.y, null); + if (image == null) + { + return null; + } + + graphics.drawImage(image, preferredLocation.x, preferredLocation.y, null); final Dimension dimension = new Dimension(image.getWidth(), image.getHeight()); bounds.setLocation(preferredLocation); bounds.setSize(dimension); @@ -62,15 +60,8 @@ public class ImageComponent implements LayoutableRenderableEntity } @Override - public void setPreferredSize(Dimension preferredSize) + public void setPreferredSize(Dimension dimension) { - if (preferredSize == null || (preferredSize.width == image.getWidth() && preferredSize.height == image.getHeight())) - { - scaledImage = null; - } - else - { - scaledImage = ImageUtil.resizeImage(image, preferredSize.width, preferredSize.height); - } + // Just use image dimensions for now } -} +} \ No newline at end of file