From a183b82c9ee063a6377554ea8c797953b1ded994 Mon Sep 17 00:00:00 2001
From: nextdaydelivery <79922345+nxtdaydelivery@users.noreply.github.com>
Date: Wed, 25 May 2022 18:45:34 +0100
Subject: OC-38 almost finish basic button rewrite

---
 .../cc/polyfrost/oneconfig/gui/elements/config/ConfigButton.java    | 6 ++++--
 .../cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java   | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main/java/cc/polyfrost/oneconfig/gui/elements/config')

diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigButton.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigButton.java
index afedef4..3caa51f 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigButton.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigButton.java
@@ -13,12 +13,14 @@ public class ConfigButton extends BasicOption {
 
     public ConfigButton(Runnable runnable, Object parent, String name, int size, String text) {
         super(null, parent, name, size);
-        this.button = new BasicButton(size == 1 ? 128 : 256, 32, text, null, null, 1, BasicButton.ALIGNMENT_CENTER, runnable);
+        this.button = new BasicButton(size == 1 ? 128 : 256, 32, text, BasicButton.ALIGNMENT_CENTER, 1);
+        this.button.setClickAction(runnable);
     }
 
     public ConfigButton(Field field, Object parent, String name, int size, String text) {
         super(field, parent, name, size);
-        this.button = new BasicButton(size == 1 ? 128 : 256, 32, text, null, null, 1, BasicButton.ALIGNMENT_CENTER, getRunnableFromField(field, parent));
+        this.button = new BasicButton(size == 1 ? 128 : 256, 32, text, BasicButton.ALIGNMENT_CENTER, 1);
+        this.button.setClickAction(getRunnableFromField(field, parent));
     }
 
     @Override
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java
index 4ea65f9..898d6d7 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java
@@ -18,8 +18,8 @@ public class ConfigKeyBind extends BasicOption {
 
     public ConfigKeyBind(Field field, Object parent, String name, int size) {
         super(field, parent, name, size);
-        button = new BasicButton(256, 32, "", SVGs.KEYSTROKE, null, 0, BasicButton.ALIGNMENT_CENTER, true);
-        button.alignIconLeft(true);
+        button = new BasicButton(256, 32, "", SVGs.KEYSTROKE, null, BasicButton.ALIGNMENT_LEFT, 0);
+        button.setToggleable(true);
     }
 
     @Override
-- 
cgit