diff options
| author | nextdaydelivery <79922345+nxtdaydelivery@users.noreply.github.com> | 2022-05-30 13:22:05 +0100 |
|---|---|---|
| committer | nextdaydelivery <79922345+nxtdaydelivery@users.noreply.github.com> | 2022-05-30 13:22:05 +0100 |
| commit | c305d7b4b3b446ed85343e5248862fc157a13e5b (patch) | |
| tree | 351fddaa0a6f4c6f9f037820fdd031333922393d /src/main/java/cc/polyfrost/oneconfig/gui/elements/config | |
| parent | d5c493075b9fc50edc7d8a22efeed08310d9ffe2 (diff) | |
| download | OneConfig-c305d7b4b3b446ed85343e5248862fc157a13e5b.tar.gz OneConfig-c305d7b4b3b446ed85343e5248862fc157a13e5b.tar.bz2 OneConfig-c305d7b4b3b446ed85343e5248862fc157a13e5b.zip | |
finish OC-5, OC-10, checkboxes OC-6
Diffstat (limited to 'src/main/java/cc/polyfrost/oneconfig/gui/elements/config')
| -rw-r--r-- | src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigCheckbox.java | 2 | ||||
| -rw-r--r-- | src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigCheckbox.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigCheckbox.java index f7e0f90..0f1a2bb 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigCheckbox.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigCheckbox.java @@ -54,7 +54,7 @@ public class ConfigCheckbox extends BasicOption { RenderManager.drawRoundedRect(vg, x, y + 4, 24, 24, OneConfigConfig.PRIMARY_500, 6f); RenderManager.drawSvg(vg, SVGs.CHECKBOX_TICK, x, y + 4, 24, 24); } - if (percentOn != 0 && hover) + if (toggled && hover) RenderManager.drawHollowRoundRect(vg, x - 1, y + 3, 24, 24, OneConfigConfig.PRIMARY_600, 6f, 2f); RenderManager.setAlpha(vg, 1f); } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java index 0d420e8..d031e6a 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java @@ -18,6 +18,7 @@ public class ConfigColorElement extends BasicOption { private final TextInputField hexField = new TextInputField(104, 32, "", false, false); private final TextInputField alphaField = new TextInputField(72, 32, "", false, false); private final BasicElement element = new BasicElement(64, 32, false); + private boolean open = false; public ConfigColorElement(Field field, Object parent, String name, int size) { super(field, parent, name, size); @@ -72,9 +73,11 @@ public class ConfigColorElement extends BasicOption { RenderManager.drawRoundImage(vg, Images.ALPHA_GRID, x1 + 420, y + 4, 56, 24, 8f); RenderManager.drawRoundedRect(vg, x1 + 420, y + 4, 56, 24, color.getRGB(), 8f); if (element.isClicked() && !element.isToggled()) { + open = !open; OneConfigGui.INSTANCE.initColorSelector(new ColorSelector(color, InputUtils.mouseX(), InputUtils.mouseY())); } - if (OneConfigGui.INSTANCE != null && OneConfigGui.INSTANCE.currentColorSelector != null) { + if(OneConfigGui.INSTANCE.currentColorSelector == null) open = false; + if (OneConfigGui.INSTANCE.currentColorSelector != null && open) { color = (OneConfigGui.INSTANCE.getColor()); } setColor(color); |