From bdf3e239a2252f21594821d8936d5c560deb6caa Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 26 May 2024 16:50:11 -0400 Subject: [PATCH] Fix Scrolling over Parent with SubGui --- .../noppes/npcs/client/gui/util/GuiScrollWindow.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 a1185c272..fce10eb16 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScrollWindow.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScrollWindow.java @@ -297,12 +297,14 @@ public class GuiScrollWindow extends GuiScreen implements ITextfieldListener, IC } } - for(GuiCustomScroll guiCustomScroll : scrolls.values()) { - if (guiCustomScroll.isMouseOver(mouseX, (int) (mouseY + scrollY))) { - return; + if(!parent.hasSubGui()){ + for(GuiCustomScroll guiCustomScroll : scrolls.values()) { + if (guiCustomScroll.isMouseOver(mouseX, (int) (mouseY + scrollY))) { + return; + } } } - + if(mouseScroll != 0){ nextScrollY -= (float) mouseScroll/15; if(nextScrollY > maxScrollY)