Reformat code and OC-38

1 files changed, 11 insertions, 7 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
index 6d9f88c..a55d931 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
@@ -1,12 +1,12 @@
 package cc.polyfrost.oneconfig.gui.elements;
 
-import cc.polyfrost.oneconfig.config.OneConfigConfig;
 import cc.polyfrost.oneconfig.gui.OneConfigGui;
 import cc.polyfrost.oneconfig.gui.pages.Page;
 import cc.polyfrost.oneconfig.lwjgl.RenderManager;
 import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 import cc.polyfrost.oneconfig.lwjgl.image.SVGs;
 import cc.polyfrost.oneconfig.utils.color.ColorPalette;
+import cc.polyfrost.oneconfig.utils.color.ColorUtils;
 import org.jetbrains.annotations.NotNull;
 
 public class BasicButton extends BasicElement {
@@ -15,6 +15,7 @@ public class BasicButton extends BasicElement {
     protected SVGs icon1, icon2;
     private final int alignment;
     private final float fontSize, cornerRadius;
+    private float alpha;
     private final int xSpacing, xPadding;
     private final int iconSize;
     public int x, y;
@@ -26,8 +27,6 @@ public class BasicButton extends BasicElement {
     public static final int SIZE_36 = 36;
     public static final int SIZE_40 = 40;
     public static final int SIZE_48 = 48;
-
-    public static final int CUSTOM_COLOR = -100;
     private boolean toggleable = false;
     private Page page;
     private Runnable runnable;
@@ -65,11 +64,12 @@ public class BasicButton extends BasicElement {
         if (disabled) RenderManager.setAlpha(vg, 0.5f);
         float contentWidth = 0f;
         int color = -1;
-        if (colorPalette == ColorPalette.TERTIARY || colorPalette == ColorPalette.TERTIARY_DESTRUCTIVE)
+        if (colorPalette == ColorPalette.TERTIARY || colorPalette == ColorPalette.TERTIARY_DESTRUCTIVE) {
             color = currentColor;
-        else
+        } else {
             RenderManager.drawRoundedRect(vg, x, y, this.width, this.height, currentColor, this.cornerRadius);
-
+            color = ColorUtils.getColor(1f, 1f, 1f, alpha);
+        }
         final float middle = x + width / 2f;
         final float middleYIcon = y + height / 2f - iconSize / 2f;
         final float middleYText = y + height / 2f + fontSize / 8f;
@@ -106,7 +106,6 @@ public class BasicButton extends BasicElement {
             }
             if (text != null) {
                 RenderManager.drawText(vg, text, x + contentWidth, middleYText, color, fontSize, Fonts.MEDIUM);
-                contentWidth += RenderManager.getTextWidth(vg, text, fontSize, Fonts.MEDIUM) + xSpacing;
             }
             if (icon2 != null)
                 RenderManager.drawSvg(vg, icon2, x + width - xPadding - iconSize, middleYIcon, iconSize, iconSize, color);
@@ -114,6 +113,11 @@ public class BasicButton extends BasicElement {
         if (disabled) RenderManager.setAlpha(vg, 1f);
     }
 
+    @Override
+    public void update(int x, int y) {
+        super.update(x, y);
+        this.alpha = colorAnimation.getAlpha();
+    }
 
     @Override
     public void onClick() {