From 277b8aab7f749d591010f1ff35212287e3d7f9d6 Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 26 May 2024 17:03:19 -0400 Subject: [PATCH] Disable Record Mouse Scroll for SubGui --- .../java/noppes/npcs/client/gui/util/GuiNPCInterface.java | 7 +++++-- .../java/noppes/npcs/client/gui/util/GuiScrollWindow.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java index c82555b3c..6328b569b 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java @@ -273,8 +273,11 @@ public abstract class GuiNPCInterface extends GuiScreen guiScrollableComponent.drawScreen(i, j, f, guiScrollableComponent.isMouseOver(i,j)?mouseScroll:0); } - if(subgui != null) - subgui.drawScreen(i,j,f); + if(subgui != null){ + recordScroll = false; + subgui.drawScreen(i,j,f); + recordScroll = true; + } } protected void drawBackground() { diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScrollWindow.java b/src/main/java/noppes/npcs/client/gui/util/GuiScrollWindow.java index fce10eb16..fff2d6a78 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScrollWindow.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScrollWindow.java @@ -304,7 +304,7 @@ public class GuiScrollWindow extends GuiScreen implements ITextfieldListener, IC } } } - + if(mouseScroll != 0){ nextScrollY -= (float) mouseScroll/15; if(nextScrollY > maxScrollY)