From cbf48e7ef295e43204ff76c12b17657df1b0b508 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Wed, 23 Sep 2020 17:05:10 -0400
Subject: [PATCH] overlay renderer: use isKeyPressed instead of tracking shift
 key state

---
 .../client/ui/overlay/OverlayRenderer.java       | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

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