From 5b7eb0adafa385c1098048b769962cac2647f6bc Mon Sep 17 00:00:00 2001 From: Ron Young Date: Thu, 9 Jan 2020 07:39:45 -0600 Subject: [PATCH 1/3] revert banktags: move new tagtab button to the bottom of the list 358703f30719b6785078dc827db42b937dbc7902 --- .../runelite/client/plugins/banktags/tabs/TabInterface.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index 82a19b4f3d..3b1100453a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -981,7 +981,7 @@ public class TabInterface } int proposedIndex = currentTabIndex + direction; - int numTabs = tabManager.size() + 1; + int numTabs = tabManager.size(); if (proposedIndex >= numTabs || proposedIndex < 0) { @@ -1075,7 +1075,7 @@ public class TabInterface { int y = bounds.y + MARGIN + BUTTON_HEIGHT; - if (maxTabs > tabManager.size()) + if (maxTabs >= tabManager.size()) { currentTabIndex = 0; } @@ -1122,8 +1122,6 @@ public class TabInterface } } - updateWidget(newTab, y); - boolean hidden = !(tabManager.size() > 0); upButton.setHidden(hidden); From 8b2f5195468d84bc535436942889888f3ef73494 Mon Sep 17 00:00:00 2001 From: Ron Young Date: Thu, 9 Jan 2020 07:24:03 -0600 Subject: [PATCH 2/3] widgets: add bank item count and equipment button ids --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 4 ++++ .../src/main/java/net/runelite/api/widgets/WidgetInfo.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index b2228e1f96..79a9ee8765 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -251,6 +251,9 @@ public class WidgetID static final int BANK_CONTAINER = 1; static final int INVENTORY_ITEM_CONTAINER = 3; static final int BANK_TITLE_BAR = 3; + static final int ITEM_COUNT_TOP = 4; + static final int ITEM_COUNT_BAR = 5; + static final int ITEM_COUNT_BOTTOM = 6; static final int CONTENT_CONTAINER = 8; static final int TAB_CONTAINER = 9; static final int ITEM_CONTAINER = 11; @@ -260,6 +263,7 @@ public class WidgetID static final int INCINERATOR = 44; static final int INCINERATOR_CONFIRM = 45; static final int EQUIPMENT_CONTENT_CONTAINER = 66; + static final int EQUIPMENT_BUTTON = 107; } static class GrandExchange diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index d2bed8d9ce..b54e93c5e4 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -142,6 +142,10 @@ public enum WidgetInfo BANK_DEPOSIT_INVENTORY(WidgetID.BANK_GROUP_ID, WidgetID.Bank.DEPOSIT_INVENTORY), BANK_TAB_CONTAINER(WidgetID.BANK_GROUP_ID, WidgetID.Bank.TAB_CONTAINER), BANK_EQUIPMENT_CONTAINER(WidgetID.BANK_GROUP_ID, WidgetID.Bank.EQUIPMENT_CONTENT_CONTAINER), + BANK_EQUIPMENT_BUTTON(WidgetID.BANK_GROUP_ID, WidgetID.Bank.EQUIPMENT_BUTTON), + 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), 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), From cac0828253158d89e2049b5d39203811183b52f0 Mon Sep 17 00:00:00 2001 From: Ron Young Date: Thu, 9 Jan 2020 07:25:31 -0600 Subject: [PATCH 3/3] tabinterface: move equipment button into title bar and move title bar widgets --- .../plugins/banktags/tabs/TabInterface.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index 3b1100453a..144a17cceb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -74,6 +74,7 @@ import net.runelite.api.widgets.ItemQuantityMode; import net.runelite.api.widgets.JavaScriptCallback; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetConfig; +import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetSizeMode; import net.runelite.api.widgets.WidgetType; @@ -234,6 +235,35 @@ public class TabInterface client.setVarbit(Varbits.CURRENT_BANK_TAB, 0); openTag(config.tab()); } + + Widget equipmentButton = client.getWidget(WidgetInfo.BANK_EQUIPMENT_BUTTON); + Widget titleBar = client.getWidget(WidgetInfo.BANK_TITLE_BAR); + if (equipmentButton == null || titleBar == null || titleBar.getOriginalX() > 0) + { + // don't keep moving widgets if they have already been moved + return; + } + + equipmentButton.setOriginalX(6); + equipmentButton.setOriginalY(4); + equipmentButton.revalidate(); + + // the bank item count is 3 widgets + for (int child = WidgetInfo.BANK_ITEM_COUNT_TOP.getChildId(); child <= WidgetInfo.BANK_ITEM_COUNT_BOTTOM.getChildId(); child++) + { + Widget widget = client.getWidget(WidgetID.BANK_GROUP_ID, child); + if (widget == null) + { + return; + } + + widget.setOriginalX(widget.getOriginalX() + equipmentButton.getWidth()); + widget.revalidate(); + } + + titleBar.setOriginalX(equipmentButton.getWidth() / 2); + titleBar.setOriginalWidth(titleBar.getWidth() - equipmentButton.getWidth()); + titleBar.revalidate(); } private void handleDeposit(MenuOptionClicked event, Boolean inventory)