From 1a4f513fb30345aa326d7fa4e7f167a3359e518b Mon Sep 17 00:00:00 2001
From: bigguy345 <monkeybar3200@gmail.com>
Date: Mon, 17 Mar 2025 23:37:38 +0200
Subject: [PATCH] Calculated grid width/height properly

---
 .../gui/global/GuiNPCEditAnimation.java       |  2 +-
 .../npcs/client/gui/util/animation/Grid.java  | 22 ++++++++++++-------
 .../util/animation/ViewportGraphEditor.java   |  1 -
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java
index 372efbaeb..e44d79bb5 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java
@@ -85,7 +85,7 @@ public class GuiNPCEditAnimation extends GuiModelInterface implements ITextfield
         addButton(toggleGraph = new GuiNpcButton(777, guiLeft - 80, guiTop - 2 + 84, 70, 20, "Toggle Graph"));
         if (toggleGraphEditor) {
             yOffset = -80;
-            graphEditor.initGui(guiLeft - 10, guiTop + 135, guiLeft - 10 + xSize, guiTop + 135 + 120);
+            graphEditor.initGui(guiLeft - 10, guiTop + 120, guiLeft - 10 + xSize, guiTop + 135 + 105);
             addGraphEditor(0, graphEditor);
 
         }
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 99382c91b..d263779d7 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
@@ -11,7 +11,7 @@ import static org.lwjgl.opengl.GL11.*;
 
 public class Grid {
     ViewportGraphEditor parent;
-    public int startX, startY; // Positioning
+    public int startX, startY, width, height; // Positioning
     public int endX, endY; // Positioning
     public int yAxisHeight = 12;
 
@@ -42,11 +42,11 @@ public class Grid {
                         targetZoomX = 20;
                         smoothenPanX = true;
                     } else if (yDown()) {
-                        targetPanY = -((parent.height) * subDivisionY / 2);
+                        targetPanY = -((height) * subDivisionY / 2);
                         targetZoomY = 1.0f;
                         smoothenPanY = true;
                     } else {
-                        targetPanY = -((parent.height) * subDivisionY / 2);
+                        targetPanY = -((height) * subDivisionY / 2);
                         targetPanX = 0;
                         targetZoomX = 20;
                         targetZoomY = 1.0f;
@@ -74,7 +74,10 @@ public class Grid {
         this.endX = endX;
         this.endY = endY;
 
-        panY = -(parent.height * subDivisionY / 2);
+        this.width = endX - this.startX;
+        this.height = endY - this.startY;
+
+        panY = -(height * subDivisionY / 2);
     }
 
     public void draw(int mouseX, int mouseY, float partialTicks, int wheel) {
@@ -143,10 +146,11 @@ public class Grid {
 
         //////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////
-        Gui.drawRect(startX, startY - yAxisHeight, endX, startY, 0xFF161616); //background
+        Gui.drawRect(startX, startY - yAxisHeight, endX, startY, 0xFF161616); //header
+        GuiUtil.drawGradientRect(startX, startY, endX, endY, 0xFF303030, 0xFF303030);
 
         GL11.glEnable(GL11.GL_SCISSOR_TEST);
-        GuiUtil.setScissorClip(startX, startY, parent.width, parent.height);
+        GuiUtil.setScissorClip(startX, startY, width, height);
         GL11.glDepthMask(false);
         drawLines(mouseX, mouseY);
         GL11.glDepthMask(true);
@@ -200,17 +204,19 @@ public class Grid {
 
             glPushMatrix();
             glTranslatef(startX, 0, 0);
+
             GuiUtil.drawVerticalLine(screenX, startY, endY, isMajor ? darkGray : lightGray);
+
             glPopMatrix();
         }
 
         //Expand boundaries of scissor clip
-        GuiUtil.setScissorClip(startX, startY - yAxisHeight, parent.width, parent.height + yAxisHeight);
+        GuiUtil.setScissorClip(startX, startY - yAxisHeight, width, height + yAxisHeight);
         for (double x = firstGridX; x <= worldX(endX); x += stepX)
             drawXValue((int) screenX(x), (int) x);
 
         //Reset clip
-        GuiUtil.setScissorClip(startX, startY, parent.width, parent.height);
+        GuiUtil.setScissorClip(startX, startY, width, height);
         ////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////
         // Horizontal
diff --git a/src/main/java/noppes/npcs/client/gui/util/animation/ViewportGraphEditor.java b/src/main/java/noppes/npcs/client/gui/util/animation/ViewportGraphEditor.java
index 252331674..73ee81992 100644
--- a/src/main/java/noppes/npcs/client/gui/util/animation/ViewportGraphEditor.java
+++ b/src/main/java/noppes/npcs/client/gui/util/animation/ViewportGraphEditor.java
@@ -39,7 +39,6 @@ public class ViewportGraphEditor {
     }
 
     public void drawScreen(int mouseX, int mouseY, float partialTicks, int wheel) {
-        GuiUtil.drawGradientRect(startX, startY, endX, endY, 0xFF303030, 0xFF303030);
         grid.draw(mouseX, mouseY, partialTicks, wheel);
         presetOverlay.draw(mouseX, mouseY, wheel);
     }