diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java index ace5980b42..cc98350ba0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java @@ -29,7 +29,7 @@ import java.awt.event.MouseEvent; import javax.swing.SwingUtilities; import net.runelite.client.input.MouseAdapter; -public class ScreenMarkerMouseListener extends MouseAdapter +class ScreenMarkerMouseListener extends MouseAdapter { private final ScreenMarkerPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java index 7741eaeffd..7a82e9997b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java @@ -78,7 +78,7 @@ public class ScreenMarkerOverlay extends Overlay screenMarkerRenderable.setColor(marker.getColor()); screenMarkerRenderable.setFill(marker.getFill()); screenMarkerRenderable.setStroke(new BasicStroke(marker.getBorderThickness())); - screenMarkerRenderable.setPreferredSize(preferredSize); + screenMarkerRenderable.setSize(preferredSize); return screenMarkerRenderable.render(graphics); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java index 95b2da1207..e374b323cc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java @@ -27,44 +27,28 @@ package net.runelite.client.plugins.screenmarkers; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.Rectangle; import java.awt.Stroke; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; -import net.runelite.client.ui.overlay.components.LayoutableRenderableEntity; +import net.runelite.client.ui.overlay.RenderableEntity; -public class ScreenMarkerRenderable implements LayoutableRenderableEntity +@Getter(AccessLevel.PACKAGE) +@Setter(AccessLevel.PACKAGE) +class ScreenMarkerRenderable implements RenderableEntity { - @Getter(AccessLevel.PACKAGE) - @Setter - private Point preferredLocation; - @Getter(AccessLevel.PACKAGE) - @Setter - private Dimension preferredSize; - @Getter(AccessLevel.PACKAGE) - @Setter(AccessLevel.PACKAGE) + private Dimension size; private int borderThickness; - @Getter(AccessLevel.PACKAGE) - @Setter(AccessLevel.PACKAGE) private Color color; - @Getter(AccessLevel.PACKAGE) - @Setter(AccessLevel.PACKAGE) private Color fill; - @Getter(AccessLevel.PACKAGE) - @Setter(AccessLevel.PACKAGE) private Stroke stroke; - @Getter - private final Rectangle bounds = new Rectangle(); - @Override public Dimension render(Graphics2D graphics) { int thickness = borderThickness; - int width = preferredSize.width; - int height = preferredSize.height; + int width = size.width; + int height = size.height; //draw the fill graphics.setColor(fill); @@ -76,7 +60,6 @@ public class ScreenMarkerRenderable implements LayoutableRenderableEntity graphics.setColor(color); graphics.setStroke(stroke); graphics.drawRect(offset, offset, width - thickness, height - thickness); - bounds.setSize(preferredSize); - return preferredSize; + return size; } }