From 5f04b6fa69db9f8ee89e95076f3750b32dfaa54e Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Tue, 18 Mar 2025 06:19:03 +0200 Subject: [PATCH] Fixed grid mouse wheel code running outside of grid --- .../java/noppes/npcs/client/gui/util/animation/Grid.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/animation/Grid.java b/src/main/java/noppes/npcs/client/gui/util/animation/Grid.java index d263779d7..4d8f4e783 100644 --- a/src/main/java/noppes/npcs/client/gui/util/animation/Grid.java +++ b/src/main/java/noppes/npcs/client/gui/util/animation/Grid.java @@ -104,7 +104,7 @@ public class Grid { ////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////// // Zoom logic - if (wheel != 0 && !parent.presetOverlay.showOverlay) { + if (wheel != 0 && !parent.presetOverlay.showOverlay&& isMouseOver(mouseX,mouseY)) { float xRate = zoomX < 15 ? 1.1f : 1.25f; float yRate = zoomY < 15 ? 1.1f : 1.25f; @@ -157,6 +157,10 @@ public class Grid { GL11.glDisable(GL11.GL_SCISSOR_TEST); } + public boolean isMouseOver(int mouseX, int mouseY) { + return mouseX >= startX && mouseX <= startX + width && mouseY >= startY && mouseY <= startY + height; + } + public void zoom(int mouseX, int mouseY, int wheel) { /////////////////////////////////////////////////////// ///////////////////////////////////////////////////////