From 4df2866fb0b41735259ad0962be553bcfb84694d Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 22 May 2024 19:05:41 -0400 Subject: [PATCH] Fix Mouse Scroll in Gui Script --- .../npcs/client/gui/util/GuiScriptTextArea.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java index 7bc6970ac..fe8f60011 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -63,6 +63,14 @@ public class GuiScriptTextArea extends GuiNpcTextField { container.visibleLines = height / container.lineHeight; + if(listener instanceof GuiNPCInterface){ + int k2 = ((GuiNPCInterface) listener).mouseScroll; + if(k2 != 0) { + this.scrolledLine -= k2/40; + this.scrolledLine = Math.max(Math.min(this.scrolledLine, this.container.linesCount - this.height / this.container.lineHeight), 0); + } + } + if(clicked){ clicked = Mouse.isButtonDown(0); int i = getSelectionPos(xMouse, yMouse); @@ -560,12 +568,6 @@ public class GuiScriptTextArea extends GuiNpcTextField { public void updateCursorCounter() { ++this.cursorCounter; - int k2 = Mouse.getDWheel(); - if(k2 != 0) { - this.scrolledLine += k2 > 0?-1:1; - this.scrolledLine = Math.max(Math.min(this.scrolledLine, this.container.linesCount - this.height / this.container.lineHeight), 0); - } - } public void setText(String text) {