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

Merge pull request #11323 from deathbeam/11318

Browse Source 
Prevent screen marker overlays from being reset
This commit is contained in:
Tomas Slusny
2020-04-22 10:38:20 +02:00
committed by GitHub
parent 6f0a2c9069 ab06a14311
commit 7d25ed8b42
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java
View File

@@ -49,6 +49,7 @@ public class ScreenMarkerOverlay extends Overlay
setLayer(OverlayLayer.ALWAYS_ON_TOP); setLayer(OverlayLayer.ALWAYS_ON_TOP);
setPriority(OverlayPriority.HIGH); setPriority(OverlayPriority.HIGH);
setResizable(true); setResizable(true);
setResettable(false);
} }
@Override @Override

1
runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
View File

@@ -50,6 +50,7 @@ public abstract class Overlay implements LayoutableRenderableEntity
private OverlayLayer layer = OverlayLayer.UNDER_WIDGETS; private OverlayLayer layer = OverlayLayer.UNDER_WIDGETS;
private final List<OverlayMenuEntry> menuEntries = new ArrayList<>(); private final List<OverlayMenuEntry> menuEntries = new ArrayList<>();
private boolean resizable; private boolean resizable;
private boolean resettable = true;
protected Overlay() protected Overlay()
{ {

5
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
View File

@@ -334,7 +334,10 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
if (SwingUtilities.isRightMouseButton(mouseEvent)) if (SwingUtilities.isRightMouseButton(mouseEvent))
{ {
overlayManager.resetOverlay(currentManagedOverlay); if (currentManagedOverlay.isResettable())
{
overlayManager.resetOverlay(currentManagedOverlay);
}
} }
else if (SwingUtilities.isLeftMouseButton(mouseEvent)) else if (SwingUtilities.isLeftMouseButton(mouseEvent))
{ {