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

overlay renderer: use isKeyPressed instead of tracking shift key state

Browse Source
This commit is contained in:
Adam
2020-09-23 17:05:10 -04:00
parent 7b4ccffb3a
commit cbf48e7ef2
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ import javax.swing.SwingUtilities;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.KeyCode;
import net.runelite.api.MenuEntry; import net.runelite.api.MenuEntry;
import net.runelite.api.events.BeforeRender; import net.runelite.api.events.BeforeRender;
import net.runelite.api.events.ClientTick; import net.runelite.api.events.ClientTick;
@@ -90,7 +91,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
private boolean inOverlayManagingMode; private boolean inOverlayManagingMode;
private boolean inOverlayResizingMode; private boolean inOverlayResizingMode;
private boolean inOverlayDraggingMode; private boolean inOverlayDraggingMode;
private boolean inMenuEntryMode;
private boolean startedMovingOverlay; private boolean startedMovingOverlay;
private MenuEntry[] menuEntries; private MenuEntry[] menuEntries;
@@ -130,7 +130,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
resetOverlayManagementMode(); resetOverlayManagementMode();
} }
inMenuEntryMode = false;
menuEntries = null; menuEntries = null;
} }
} }
@@ -143,7 +142,8 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
return; return;
} }
if (!inMenuEntryMode && runeLiteConfig.menuEntryShift()) final boolean shift = client.isKeyPressed(KeyCode.KC_SHIFT);
if (!shift && runeLiteConfig.menuEntryShift())
{ {
return; return;
} }
@@ -620,11 +620,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
{ {
inOverlayManagingMode = true; inOverlayManagingMode = true;
} }
if (e.isShiftDown() && runeLiteConfig.menuEntryShift())
{
inMenuEntryMode = true;
}
} }
@Override @Override
@@ -635,11 +630,6 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
inOverlayManagingMode = false; inOverlayManagingMode = false;
resetOverlayManagementMode(); resetOverlayManagementMode();
} }
if (!e.isShiftDown())
{
inMenuEntryMode = false;
}
} }
private void safeRender(Client client, Overlay overlay, OverlayLayer layer, Graphics2D graphics, Point point) private void safeRender(Client client, Overlay overlay, OverlayLayer layer, Graphics2D graphics, Point point)