Fix those rendering issues, probably

Author: GeorgeRNG

src/main/java/io/github/techstreet/dfscript/screen/script/ScriptListScreen.java

@@ -25,9 +25,6 @@ public ScriptListScreen(boolean allowEditAndUpload) {
         CScrollPanel panel = new CScrollPanel(0, 5, 160, 94);
         widgets.add(panel);
 
-        CText test = new CText(0,0,Text.literal("Debug"));
-        widgets.add(test);
-
         int y = 0;
         for (Script s : ScriptManager.getInstance().getScripts()) {
             MutableText text = Text.literal(s.getName());

src/main/java/io/github/techstreet/dfscript/screen/widget/CPlainPanel.java

@@ -26,25 +26,25 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
         stack.push();
         stack.translate(x, y, 0);
 
-        Vector4f begin = new Vector4f(0, 0, 1, 1);
-        Vector4f end = new Vector4f(width, height, 1, 1);
-//        begin.add(stack.peek().getPositionMatrix().transform(new Vector4f(0,0,0,0)));
-//        end.add(stack.peek().getPositionMatrix().transform(new Vector4f(0,0,0,0)));
+        float xpos = stack.peek().getPositionMatrix().m30() + x;
+        float ypos = stack.peek().getPositionMatrix().m31() - y;
+
+        Vector4f begin = new Vector4f(xpos, ypos, 1, 1);
+        Vector4f end = new Vector4f(xpos + (width * 2), ypos + (height * 2), 1, 1);
 
-        // FIXME: this breaks
         int guiScale = (int) DFScript.MC.getWindow().getScaleFactor();
-//        RenderUtil.pushScissor(
-//            (int) begin.x()*guiScale,
-//            (int) begin.y()*guiScale,
-//            (int) (end.x() - begin.x())*guiScale,
-//            (int) (end.y() - begin.y())*guiScale
-//        );
+        RenderUtil.pushScissor(
+                (int) begin.x()*guiScale,
+                (int) begin.y()*guiScale,
+                (int) (end.x() - begin.x())*guiScale,
+                (int) (end.y() - begin.y())*guiScale
+        );
 
         for (CWidget child : children) {
             child.render(stack, mouseX, mouseY, tickDelta);
         }
 
-//        RenderUtil.popScissor();
+        RenderUtil.popScissor();
         stack.pop();
     }
 

src/main/java/io/github/techstreet/dfscript/screen/widget/CScrollPanel.java

@@ -30,19 +30,19 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
         mouseX -= x;
         mouseY -= y;
 
-        Vector4f begin = new Vector4f(0, 0, 1, 1);
-        Vector4f end = new Vector4f(width, height, 1, 1);
-        begin.mul(2);
-        end.mul(2);
+        float xpos = stack.peek().getPositionMatrix().m30() + x;
+        float ypos = stack.peek().getPositionMatrix().m31() - y;
+
+        Vector4f begin = new Vector4f(xpos, ypos, 1, 1);
+        Vector4f end = new Vector4f(xpos + (width * 2), ypos + (height * 2), 1, 1);
 
-        // FIXME: this breaks
         int guiScale = (int) DFScript.MC.getWindow().getScaleFactor();
-//        RenderUtil.pushScissor(
-//            (int) begin.x()*guiScale,
-//            (int) begin.y()*guiScale,
-//            (int) (end.x() - begin.x())*guiScale,
-//            (int) (end.y() - begin.y())*guiScale
-//        );
+        RenderUtil.pushScissor(
+            (int) begin.x()*guiScale,
+            (int) begin.y()*guiScale,
+            (int) (end.x() - begin.x())*guiScale,
+            (int) (end.y() - begin.y())*guiScale
+        );
 
         stack.translate(0, scroll, 0);
         mouseY -= scroll;
@@ -51,7 +51,7 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
             child.render(stack, mouseX, mouseY, tickDelta);
         }
 
-//        RenderUtil.popScissor();
+        RenderUtil.popScissor();
         stack.pop();
     }
 

src/main/java/io/github/techstreet/dfscript/screen/widget/CTextField.java

@@ -54,17 +54,18 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
         DrawableHelper.fill(stack, 0, 0, width, height, 0xFF888888);
         DrawableHelper.fill(stack, 1, 1, width - 1, height - 1, 0xFF000000);
 
-        Vector4f begin = new Vector4f(0, 0, 1, 1);
-        Vector4f end = new Vector4f(width, height, 1, 1);
-//        begin.add((Vector4fc) stack.peek().getPositionMatrix());
-//        end.add((Vector4fc) stack.peek().getPositionMatrix());
+        float xpos = stack.peek().getPositionMatrix().m30() + x;
+        float ypos = stack.peek().getPositionMatrix().m31() - y;
+
+        Vector4f begin = new Vector4f(xpos, ypos, 1, 1);
+        Vector4f end = new Vector4f(xpos + (width * 2), ypos + (height * 2), 1, 1);
 
         int guiScale = (int) DFScript.MC.getWindow().getScaleFactor();
         RenderUtil.pushScissor(
-            (int) begin.x()*guiScale,
-            (int) begin.y()*guiScale,
-            (int) (end.x() - begin.x())*guiScale,
-            (int) (end.y() - begin.y())*guiScale
+                (int) begin.x()*guiScale,
+                (int) begin.y()*guiScale,
+                (int) (end.x() - begin.x())*guiScale,
+                (int) (end.y() - begin.y())*guiScale
         );
 
         stack.translate(2 + xScroll, 2 + scroll, 0);