[feat] Prevent misclicks on delete buttons (#5636)

Author: chri-k

src/main/java/meteordevelopment/meteorclient/gui/GuiTheme.java

@@ -88,7 +88,16 @@ public WButton button(GuiTexture texture) {
         return button(null, texture);
     }
 
+    protected abstract WConfirmedButton confirmedButton(String text, String confirmText, GuiTexture texture);
+    public WConfirmedButton confirmedButton(String text, String confirmText) {
+        return confirmedButton(text, confirmText, null);
+    }
+    public WConfirmedButton confirmedButton(GuiTexture texture) {
+        return confirmedButton(null, null, texture);
+    }
+
     public abstract WMinus minus();
+    public abstract WConfirmedMinus confirmedMinus();
     public abstract WPlus plus();
 
     public abstract WCheckbox checkbox(boolean checked);

src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/MacrosTab.java

@@ -13,7 +13,7 @@
 import meteordevelopment.meteorclient.gui.tabs.WindowTabScreen;
 import meteordevelopment.meteorclient.gui.widgets.containers.WTable;
 import meteordevelopment.meteorclient.gui.widgets.pressable.WButton;
-import meteordevelopment.meteorclient.gui.widgets.pressable.WMinus;
+import meteordevelopment.meteorclient.gui.widgets.pressable.WConfirmedMinus;
 import meteordevelopment.meteorclient.settings.Settings;
 import meteordevelopment.meteorclient.systems.macros.Macro;
 import meteordevelopment.meteorclient.systems.macros.Macros;
@@ -63,7 +63,7 @@ private void initTable(WTable table) {
                 WButton edit = table.add(theme.button(GuiRenderer.EDIT)).expandCellX().right().widget();
                 edit.action = () -> mc.setScreen(new EditMacroScreen(theme, macro, this::reload));
 
-                WMinus remove = table.add(theme.minus()).widget();
+                WConfirmedMinus remove = table.add(theme.confirmedMinus()).widget();
                 remove.action = () -> {
                     Macros.get().remove(macro);
                     reload();

src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/ProfilesTab.java

@@ -14,6 +14,8 @@
 import meteordevelopment.meteorclient.gui.widgets.containers.WContainer;
 import meteordevelopment.meteorclient.gui.widgets.containers.WTable;
 import meteordevelopment.meteorclient.gui.widgets.pressable.WButton;
+import meteordevelopment.meteorclient.gui.widgets.pressable.WConfirmedButton;
+import meteordevelopment.meteorclient.gui.widgets.pressable.WConfirmedMinus;
 import meteordevelopment.meteorclient.gui.widgets.pressable.WMinus;
 import meteordevelopment.meteorclient.systems.profiles.Profile;
 import meteordevelopment.meteorclient.systems.profiles.Profiles;
@@ -65,16 +67,17 @@ private void initTable(WTable table) {
             for (Profile profile : Profiles.get()) {
                 table.add(theme.label(profile.name.get())).expandCellX();
 
-                WButton save = table.add(theme.button("Save")).widget();
+                WConfirmedButton save = theme.confirmedButton("Save", "Confirm");;
                 save.action = profile::save;
+                table.add(save).right();
 
                 WButton load = table.add(theme.button("Load")).widget();
                 load.action = profile::load;
 
                 WButton edit = table.add(theme.button(GuiRenderer.EDIT)).widget();
                 edit.action = () -> mc.setScreen(new EditProfileScreen(theme, profile, this::reload));
 
-                WMinus remove = table.add(theme.minus()).widget();
+                WConfirmedMinus remove = table.add(theme.confirmedMinus()).widget();
                 remove.action = () -> {
                     Profiles.get().remove(profile);
                     reload();

src/main/java/meteordevelopment/meteorclient/gui/themes/meteor/MeteorGuiTheme.java

@@ -210,11 +210,21 @@ protected WButton button(String text, GuiTexture texture) {
         return w(new WMeteorButton(text, texture));
     }
 
+    @Override
+    protected WConfirmedButton confirmedButton(String text, String confirmText, GuiTexture texture) {
+        return w(new WMeteorConfirmedButton(text, confirmText, texture));
+    }
+
     @Override
     public WMinus minus() {
         return w(new WMeteorMinus());
     }
 
+    @Override
+    public WConfirmedMinus confirmedMinus() {
+        return w(new WMeteorConfirmedMinus());
+    }
+
     @Override
     public WPlus plus() {
         return w(new WMeteorPlus());

src/main/java/meteordevelopment/meteorclient/gui/themes/meteor/MeteorWidget.java

@@ -15,16 +15,20 @@ default MeteorGuiTheme theme() {
         return (MeteorGuiTheme) getTheme();
     }
 
-    default void renderBackground(GuiRenderer renderer, WWidget widget, boolean pressed, boolean mouseOver) {
+    default void renderBackground(GuiRenderer renderer, WWidget widget, Color outlineColor, Color backgroundColor) {
         MeteorGuiTheme theme = theme();
         double s = theme.scale(2);
 
-        renderer.quad(widget.x + s, widget.y + s, widget.width - s * 2, widget.height - s * 2, theme.backgroundColor.get(pressed, mouseOver));
+        renderer.quad(widget.x + s, widget.y + s, widget.width - s * 2, widget.height - s * 2, backgroundColor);
 
-        Color outlineColor = theme.outlineColor.get(pressed, mouseOver);
         renderer.quad(widget.x, widget.y, widget.width, s, outlineColor);
         renderer.quad(widget.x, widget.y + widget.height - s, widget.width, s, outlineColor);
         renderer.quad(widget.x, widget.y + s, s, widget.height - s * 2, outlineColor);
         renderer.quad(widget.x + widget.width - s, widget.y + s, s, widget.height - s * 2, outlineColor);
     }
+
+    default void renderBackground(GuiRenderer renderer, WWidget widget, boolean pressed, boolean mouseOver) {
+        MeteorGuiTheme theme = theme();
+        renderBackground(renderer, widget, theme.outlineColor.get(pressed, mouseOver), theme.backgroundColor.get(pressed, mouseOver));
+    }
 }

src/main/java/meteordevelopment/meteorclient/gui/themes/meteor/widgets/pressable/WMeteorConfirmedButton.java

@@ -0,0 +1,42 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.gui.themes.meteor.widgets.pressable;
+
+import meteordevelopment.meteorclient.gui.renderer.GuiRenderer;
+import meteordevelopment.meteorclient.gui.renderer.packer.GuiTexture;
+import meteordevelopment.meteorclient.gui.themes.meteor.MeteorGuiTheme;
+import meteordevelopment.meteorclient.gui.themes.meteor.MeteorWidget;
+import meteordevelopment.meteorclient.gui.widgets.pressable.WButton;
+import meteordevelopment.meteorclient.gui.widgets.pressable.WConfirmedButton;
+import meteordevelopment.meteorclient.utils.render.color.Color;
+
+public class WMeteorConfirmedButton extends WConfirmedButton implements MeteorWidget {
+    public WMeteorConfirmedButton(String text, String confirmText, GuiTexture texture) {
+        super(text, confirmText, texture);
+    }
+
+    @Override
+    protected void onRender(GuiRenderer renderer, double mouseX, double mouseY, double delta) {
+        MeteorGuiTheme theme = theme();
+        double pad = pad();
+
+        Color outline = theme.outlineColor.get(pressed, mouseOver);
+        Color fg = pressedOnce ? theme.backgroundColor.get(pressed, mouseOver) : theme.textColor.get();
+        Color bg = pressedOnce ? theme.textColor.get() : theme.backgroundColor.get(pressed, mouseOver);
+
+        renderBackground(renderer, this, outline, bg);
+
+        String text = getText();
+
+        if (text != null) {
+            renderer.text(text, x + width / 2 - textWidth / 2, y + pad, fg, false);
+        }
+        else {
+            double ts = theme.textHeight();
+            renderer.quad(x + width / 2 - ts / 2, y + pad, ts, ts, texture, fg);
+        }
+    }
+}

src/main/java/meteordevelopment/meteorclient/gui/themes/meteor/widgets/pressable/WMeteorConfirmedMinus.java

@@ -0,0 +1,28 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.gui.themes.meteor.widgets.pressable;
+
+import meteordevelopment.meteorclient.gui.renderer.GuiRenderer;
+import meteordevelopment.meteorclient.gui.themes.meteor.MeteorGuiTheme;
+import meteordevelopment.meteorclient.gui.themes.meteor.MeteorWidget;
+import meteordevelopment.meteorclient.gui.widgets.pressable.WConfirmedMinus;
+import meteordevelopment.meteorclient.utils.render.color.Color;
+
+public class WMeteorConfirmedMinus extends WConfirmedMinus implements MeteorWidget {
+    @Override
+    protected void onRender(GuiRenderer renderer, double mouseX, double mouseY, double delta) {
+        MeteorGuiTheme theme = theme();
+        double pad = pad();
+        double s = theme.scale(3);
+
+        Color outline = theme.outlineColor.get(pressed, mouseOver);
+        Color fg = pressedOnce ? theme.backgroundColor.get(pressed, mouseOver) : theme().minusColor.get();
+        Color bg = pressedOnce ? theme().minusColor.get() : theme.backgroundColor.get(pressed, mouseOver);
+
+        renderBackground(renderer, this, outline, bg);
+        renderer.quad(x + pad, y + height / 2 - s / 2, width - pad * 2, s, fg);
+    }
+}

src/main/java/meteordevelopment/meteorclient/gui/widgets/WAccount.java

@@ -9,7 +9,7 @@
 import meteordevelopment.meteorclient.gui.screens.accounts.AccountInfoScreen;
 import meteordevelopment.meteorclient.gui.widgets.containers.WHorizontalList;
 import meteordevelopment.meteorclient.gui.widgets.pressable.WButton;
-import meteordevelopment.meteorclient.gui.widgets.pressable.WMinus;
+import meteordevelopment.meteorclient.gui.widgets.pressable.WConfirmedMinus;
 import meteordevelopment.meteorclient.systems.accounts.Account;
 import meteordevelopment.meteorclient.systems.accounts.Accounts;
 import meteordevelopment.meteorclient.systems.accounts.TokenAccount;
@@ -73,7 +73,7 @@ public void init() {
         };
 
         // Remove
-        WMinus remove = add(theme.minus()).widget();
+        WConfirmedMinus remove = add(theme.confirmedMinus()).widget();
         remove.action = () -> {
             Accounts.get().remove(account);
             if (refreshScreenAction != null) refreshScreenAction.run();

src/main/java/meteordevelopment/meteorclient/gui/widgets/pressable/WButton.java

@@ -22,6 +22,8 @@ public WButton(String text, GuiTexture texture) {
     protected void onCalculateSize() {
         double pad = pad();
 
+        String text = getText();
+
         if (text != null) {
             textWidth = theme.textWidth(text);
 

src/main/java/meteordevelopment/meteorclient/gui/widgets/pressable/WConfirmedButton.java

@@ -0,0 +1,42 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.gui.widgets.pressable;
+
+import meteordevelopment.meteorclient.gui.renderer.packer.GuiTexture;
+
+public abstract class WConfirmedButton extends WButton {
+
+    protected boolean pressedOnce = false;
+    protected String confirmText;
+
+    public WConfirmedButton(String text, String confirmText, GuiTexture texture) {
+        super(text, texture);
+        this.confirmText = confirmText;
+    }
+
+    @Override
+    public boolean onMouseClicked(double mouseX, double mouseY, int button, boolean used) {
+        boolean pressed = super.onMouseClicked(mouseX, mouseY, button, used);
+        if (!pressed) {
+            pressedOnce = false;
+            invalidate();
+        }
+        return pressed;
+    }
+
+    @Override
+    public boolean onMouseReleased(double mouseX, double mouseY, int button) {
+        if (pressed && pressedOnce) super.onMouseReleased(mouseX, mouseY, button);
+        pressedOnce = pressed;
+        invalidate();
+        return pressed = false;
+    }
+
+    @Override
+    public String getText() {
+        return pressedOnce ? confirmText : text;
+    }
+}