From ab06a14311a0b45be13bc5d29202ed5bff236fcc Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Sun, 19 Apr 2020 18:33:13 +0200 Subject: [PATCH] Prevent screen marker overlays from being reset Fixes #11318 Signed-off-by: Tomas Slusny --- .../client/plugins/screenmarkers/ScreenMarkerOverlay.java | 1 + .../main/java/net/runelite/client/ui/overlay/Overlay.java | 1 + .../java/net/runelite/client/ui/overlay/OverlayRenderer.java | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) 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 e5f110c0c2..c82ac2aee8 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 @@ -49,6 +49,7 @@ public class ScreenMarkerOverlay extends Overlay setLayer(OverlayLayer.ALWAYS_ON_TOP); setPriority(OverlayPriority.HIGH); setResizable(true); + setResettable(false); } @Override diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java index 57d5164a8d..771278185d 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java @@ -50,6 +50,7 @@ public abstract class Overlay implements LayoutableRenderableEntity private OverlayLayer layer = OverlayLayer.UNDER_WIDGETS; private final List menuEntries = new ArrayList<>(); private boolean resizable; + private boolean resettable = true; protected Overlay() { diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 21d6993871..ddf0a44bd4 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -334,7 +334,10 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener if (SwingUtilities.isRightMouseButton(mouseEvent)) { - overlayManager.resetOverlay(currentManagedOverlay); + if (currentManagedOverlay.isResettable()) + { + overlayManager.resetOverlay(currentManagedOverlay); + } } else if (SwingUtilities.isLeftMouseButton(mouseEvent)) {