Merge remote-tracking branch 'origin/master'

2 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
index e6cf5d9..d7e29f5 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
@@ -29,6 +29,7 @@ public class NumberInputField extends TextInputField {
     @Override
     public void draw(long vg, int x, int y) {
         super.errored = false;
+        if(disabled) RenderManager.setAlpha(vg, 0.5f);
         RenderManager.drawRoundedRect(vg, x + width + 4, y, 12, 28, Colors.GRAY_500, 6f);
         upArrow.disable(disabled);
         downArrow.disable(disabled);
@@ -71,7 +72,7 @@ public class NumberInputField extends TextInputField {
         }
         RenderManager.drawRoundedRectVaried(vg, x + width + 4, y + 14, 12, 14, colorBottom.getColor(downArrow.isHovered(), downArrow.isPressed()), 0f, 0f, 6f, 6f);
         RenderManager.drawSvg(vg, SVGs.CHEVRON_DOWN, x + width + 5, y + 15, 10, 10);
-        RenderManager.setAlpha(vg, 1f);
+        if(!disabled) RenderManager.setAlpha(vg, 1f);
 
         try {
             super.draw(vg, x, y - 2);
@@ -80,6 +81,7 @@ public class NumberInputField extends TextInputField {
             super.caretPos = 0;
             super.prevCaret = 0;
         }
+        if(disabled) RenderManager.setAlpha(vg, 1f);
     }
 
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
index c33896a..f0f1447 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
@@ -211,7 +211,7 @@ public class TextInputField extends BasicElement {
                 }
             }
 
-
+            if(disabled) RenderManager.setAlpha(vg, 0.5f);
             if (toggled) {
                 if (multiLine) {
                     int lineY = y + 20 + getCaretLine(caretPos) * 24;
@@ -249,9 +249,9 @@ public class TextInputField extends BasicElement {
             } else {
                 RenderManager.drawText(vg, s.toString(), x + 12, y + height / 2f + 1, color, 14f, Fonts.REGULAR);
             }
+            RenderManager.setAlpha(vg, 1f);
             ScissorManager.resetScissor(vg, scissor);
-        } catch (
-                Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }