ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "image component: support setPreferredSize"

Browse Source 
This reverts commit 5e7242388d.
This commit is contained in:
Adam
2021-02-02 23:26:18 -05:00
parent bbfa08f8b7
commit a58b2d3fdf
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ImageComponent.java
View File

@@ -24,37 +24,35 @@
*/ */
package net.runelite.client.ui.overlay.components; package net.runelite.client.ui.overlay.components;
import com.google.common.base.MoreObjects;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Point; import java.awt.Point;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;
import net.runelite.client.util.ImageUtil;
@RequiredArgsConstructor @RequiredArgsConstructor
@Setter
public class ImageComponent implements LayoutableRenderableEntity public class ImageComponent implements LayoutableRenderableEntity
{ {
@NonNull
private final BufferedImage image; private final BufferedImage image;
private BufferedImage scaledImage;
@Getter @Getter
private final Rectangle bounds = new Rectangle(); private final Rectangle bounds = new Rectangle();
@Setter
private Point preferredLocation = new Point(); private Point preferredLocation = new Point();
@Override @Override
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
BufferedImage i = MoreObjects.firstNonNull(scaledImage, image); if (image == null)
graphics.drawImage(i, preferredLocation.x, preferredLocation.y, null); {
return null;
}
graphics.drawImage(image, preferredLocation.x, preferredLocation.y, null);
final Dimension dimension = new Dimension(image.getWidth(), image.getHeight()); final Dimension dimension = new Dimension(image.getWidth(), image.getHeight());
bounds.setLocation(preferredLocation); bounds.setLocation(preferredLocation);
bounds.setSize(dimension); bounds.setSize(dimension);
@@ -62,15 +60,8 @@ public class ImageComponent implements LayoutableRenderableEntity
} }
@Override @Override
public void setPreferredSize(Dimension preferredSize) public void setPreferredSize(Dimension dimension)
{ {
if (preferredSize == null || (preferredSize.width == image.getWidth() && preferredSize.height == image.getHeight())) // Just use image dimensions for now
{
scaledImage = null;
}
else
{
scaledImage = ImageUtil.resizeImage(image, preferredSize.width, preferredSize.height);
}
} }
} }