From c1ee9d235127bc0b3b7fe45f1c8a2b671827991f Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 19 Oct 2018 12:40:26 +0200 Subject: [PATCH] Prevent tag tab scrolling to scroll bank interface Closes #6076 Signed-off-by: Tomas Slusny --- .../net/runelite/client/plugins/banktags/BankTagsPlugin.java | 2 +- .../runelite/client/plugins/banktags/tabs/TabInterface.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java index 40ad38a2e1..e1e40eac59 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java @@ -315,7 +315,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener @Override public MouseWheelEvent mouseWheelMoved(MouseWheelEvent event) { - clientThread.invokeLater(() -> tabInterface.handleWheel(event)); + tabInterface.handleWheel(event); return event; } } 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 f1b4b68546..35c2e42964 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 @@ -319,7 +319,8 @@ public class TabInterface if (canvasBounds.contains(event.getPoint())) { - scrollTab(event.getWheelRotation()); + event.consume(); + clientThread.invoke(() -> scrollTab(event.getWheelRotation())); } } @@ -686,7 +687,7 @@ public class TabInterface private boolean isHidden() { Widget widget = client.getWidget(WidgetInfo.BANK_CONTAINER); - return !config.tabs() || widget == null || widget.isHidden(); + return !config.tabs() || widget == null; } private void loadTab(String tag)