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

antidrag: unregister keylistener on login screen (#1088)

Browse Source
This commit is contained in:
Lucwousin
2019-07-23 23:36:56 +02:00
committed by GitHub
parent 2f5a53149e
commit aacb76ab10
1 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
View File

@@ -34,6 +34,7 @@ import lombok.Getter;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.FocusChanged; import net.runelite.api.events.FocusChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.config.Keybind; import net.runelite.client.config.Keybind;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
@@ -130,6 +131,7 @@ public class AntiDragPlugin extends Plugin
{ {
eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged);
eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged); eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged);
eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged);
} }
private void onConfigChanged(ConfigChanged event) private void onConfigChanged(ConfigChanged event)
@@ -160,6 +162,21 @@ public class AntiDragPlugin extends Plugin
} }
} }
private void onGameStateChanged(GameStateChanged event)
{
switch (event.getGameState())
{
case LOGGED_IN:
if (keybind)
{
keyManager.registerKeyListener(hotkeyListener);
}
break;
case LOGIN_SCREEN:
keyManager.unregisterKeyListener(hotkeyListener);
}
}
private void updateConfig() private void updateConfig()
{ {
this.alwaysOn = config.alwaysOn(); this.alwaysOn = config.alwaysOn();
@@ -187,31 +204,33 @@ public class AntiDragPlugin extends Plugin
@Override @Override
public void hotkeyPressed() public void hotkeyPressed()
{ {
if (!alwaysOn) if (alwaysOn)
{ {
toggleDrag = !toggleDrag; return;
if (toggleDrag) }
{
if (configOverlay)
{
overlayManager.add(overlay);
}
if (changeCursor)
{
clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString());
}
client.setInventoryDragDelay(dragDelay); toggleDrag = !toggleDrag;
} if (toggleDrag)
else {
if (configOverlay)
{ {
overlayManager.remove(overlay); overlayManager.add(overlay);
client.setInventoryDragDelay(DEFAULT_DELAY); }
if (changeCursor) if (changeCursor)
{ {
net.runelite.client.plugins.customcursor.CustomCursor selectedCursor = configManager.getConfig(CustomCursorConfig.class).selectedCursor(); clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString());
clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString()); }
}
client.setInventoryDragDelay(dragDelay);
}
else
{
overlayManager.remove(overlay);
client.setInventoryDragDelay(DEFAULT_DELAY);
if (changeCursor)
{
net.runelite.client.plugins.customcursor.CustomCursor selectedCursor = configManager.getConfig(CustomCursorConfig.class).selectedCursor();
clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString());
} }
} }
} }