aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/cc/polyfrost/oneconfig/gui/elements/config
diff options
context:
space:
mode:
authorDeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>2022-05-08 11:31:50 +0200
committerDeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>2022-05-08 11:31:50 +0200
commite2ae63de1dc738a0c7b7137a29c8b42c3d0a2cdc (patch)
treec0417b6a833d3107134a15562ac20b256a54477f /src/main/java/cc/polyfrost/oneconfig/gui/elements/config
parent7babed2c38d56f2bcd90074deecd9fd555ef5c29 (diff)
downloadOneConfig-e2ae63de1dc738a0c7b7137a29c8b42c3d0a2cdc.tar.gz
OneConfig-e2ae63de1dc738a0c7b7137a29c8b42c3d0a2cdc.tar.bz2
OneConfig-e2ae63de1dc738a0c7b7137a29c8b42c3d0a2cdc.zip
fix color things
Diffstat (limited to 'src/main/java/cc/polyfrost/oneconfig/gui/elements/config')
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java18
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java2
2 files changed, 8 insertions, 12 deletions
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 ce683bf..627c0cc 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
@@ -29,7 +29,7 @@ public class ConfigColorElement extends BasicOption {
alphaField.setCentered(true);
alphaField.onlyAcceptNumbers(true);
String buf = Integer.toHexString(color.getRGB());
- hex = "#"+buf.substring(buf.length()-6);
+ hex = "#" + buf.substring(buf.length() - 6);
}
@Override
@@ -44,7 +44,7 @@ public class ConfigColorElement extends BasicOption {
if (!alphaField.isToggled()) alphaField.setInput(String.format("%.01f", alpha * 100f) + "%");
alphaField.setErrored(false);
- if(alphaField.isToggled()) {
+ if (alphaField.isToggled()) {
try {
float input = Float.parseFloat(alphaField.getInput());
if (input < 0f) {
@@ -62,15 +62,13 @@ public class ConfigColorElement extends BasicOption {
}
alphaField.draw(vg, x + 352, y);
-
-
if (!hexField.isToggled()) hexField.setInput(hex);
hexField.setErrored(false);
- if(hexField.isToggled()) {
+ if (hexField.isToggled()) {
try {
color = HexToColor(hexField.getInput());
String buf = Integer.toHexString(color.getRGB());
- hex = "#"+buf.substring(buf.length()-6);
+ hex = "#" + buf.substring(buf.length() - 6);
} catch (NumberFormatException e) {
hexField.setErrored(true);
}
@@ -80,14 +78,14 @@ public class ConfigColorElement extends BasicOption {
element.update(x + 432, y);
RenderManager.drawRoundedRect(vg, x + 432, y, 64, 32, OneConfigConfig.GRAY_300, 12f);
RenderManager.drawImage(vg, Images.COLOR_BASE, x + 948, y + 4, 56, 24, color.getRGB());
- if(element.isClicked() && !element.isToggled()) {
+ if (element.isClicked() && !element.isToggled()) {
OneConfigGui.INSTANCE.initColorSelector(new ColorSelector(color, InputUtils.mouseX(), InputUtils.mouseY()));
}
- if(element.isToggled() && element.isClicked()) {
+ if (element.isToggled() && element.isClicked()) {
color = OneConfigGui.INSTANCE.closeColorSelector();
alpha = color.getAlpha() / 255f;
String buf = Integer.toHexString(color.getRGB());
- hex = "#"+buf.substring(buf.length()-6);
+ hex = "#" + buf.substring(buf.length() - 6);
}
}
@@ -110,6 +108,4 @@ public class ConfigColorElement extends BasicOption {
}
throw new NumberFormatException("Invalid hex string: " + hex);
}
-
-
}
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java
index 531f18a..d44c33f 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java
@@ -23,7 +23,7 @@ public class ConfigSlider extends BasicOption {
this.min = min;
this.max = max;
this.step = step;
- inputField = new NumberInputField(84, 24, 0, min, max, step == 0 ? 1 : step);
+ inputField = new NumberInputField(84, 32, 0, min, max, step == 0 ? 1 : step);
}
@Override