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

keyremapping: Don't remap f-keys when the bank pin interface is open

Browse Source
This commit is contained in:
loldudester
2020-05-19 20:51:29 +01:00
committed by GitHub
parent 0615b7b9e6
commit 94482f5aed
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
View File

@@ -154,6 +154,7 @@ public class WidgetID
public static final int ADVENTURE_LOG_ID = 187;
public static final int COUNTERS_LOG_GROUP_ID = 625;
public static final int GAUNTLET_TIMER_GROUP_ID = 637;
public static final int BANK_PIN_GROUP_ID = 213;
static class WorldMap
{
@@ -918,4 +919,9 @@ public class WidgetID
{
static final int CONTAINER = 2;
}
static class BankPin
{
static final int CONTAINER = 0;
}
}

1
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
View File

@@ -146,6 +146,7 @@ public enum WidgetInfo
BANK_ITEM_COUNT_TOP(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_TOP),
BANK_ITEM_COUNT_BAR(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BAR),
BANK_ITEM_COUNT_BOTTOM(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BOTTOM),
BANK_PIN_CONTAINER(WidgetID.BANK_PIN_GROUP_ID, WidgetID.BankPin.CONTAINER),
GRAND_EXCHANGE_WINDOW_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.WINDOW_CONTAINER),
GRAND_EXCHANGE_OFFER_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_CONTAINER),

5
runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java
View File

@@ -138,7 +138,10 @@ public class KeyRemappingPlugin extends Plugin
// Most chat dialogs with numerical input are added without the chatbox or its key listener being removed,
// so chatboxFocused() is true. The chatbox onkey script uses the following logic to ignore key presses,
// so we will use it too to not remap F-keys.
return isHidden(WidgetInfo.CHATBOX_MESSAGES) || isHidden(WidgetInfo.CHATBOX_TRANSPARENT_LINES);
return isHidden(WidgetInfo.CHATBOX_MESSAGES) || isHidden(WidgetInfo.CHATBOX_TRANSPARENT_LINES)
// We want to block F-key remapping in the bank pin interface too, so it does not interfere with the
// Keyboard Bankpin feature of the Bank plugin
|| !isHidden(WidgetInfo.BANK_PIN_CONTAINER);
}
private boolean isHidden(WidgetInfo widgetInfo)