From fb71aa65cba27f3a9e1c3a984dff8a343f35bd1f Mon Sep 17 00:00:00 2001 From: Shanktank Date: Wed, 30 Jul 2025 20:36:29 -0500 Subject: [PATCH 1/2] align macro keybinds to right of column, add color --- .../meteorclient/gui/tabs/builtin/MacrosTab.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/MacrosTab.java b/src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/MacrosTab.java index 2cd73ed71f..60db3993af 100644 --- a/src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/MacrosTab.java +++ b/src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/MacrosTab.java @@ -17,7 +17,9 @@ import meteordevelopment.meteorclient.settings.Settings; import meteordevelopment.meteorclient.systems.macros.Macro; import meteordevelopment.meteorclient.systems.macros.Macros; +import meteordevelopment.meteorclient.utils.misc.Keybind; import meteordevelopment.meteorclient.utils.misc.NbtUtils; +import meteordevelopment.meteorclient.utils.render.color.Color; import net.minecraft.client.gui.screen.Screen; import static meteordevelopment.meteorclient.MeteorClient.mc; @@ -58,9 +60,15 @@ private void initTable(WTable table) { if (Macros.get().isEmpty()) return; for (Macro macro : Macros.get()) { - table.add(theme.label(macro.name.get() + " (" + macro.keybind.get() + ")")); + table.add(theme.label(macro.name.get())); - WButton edit = table.add(theme.button(GuiRenderer.EDIT)).expandCellX().right().widget(); + Keybind keybind = macro.keybind.get(); + Color keybindColor = keybind.isSet() ? Color.GREEN : Color.LIGHT_GRAY; + table.add(theme.label("(")).expandCellX().right(); + table.add(theme.label(keybind.toString()).color(keybindColor)).center(); + table.add(theme.label(")")).right(); + + WButton edit = table.add(theme.button(GuiRenderer.EDIT)).widget(); edit.action = () -> mc.setScreen(new EditMacroScreen(theme, macro, this::reload)); WMinus remove = table.add(theme.minus()).widget(); From d2de0b2a0af0b96f8e8cd662988d0b74c190d228 Mon Sep 17 00:00:00 2001 From: Shanktank Date: Wed, 30 Jul 2025 20:53:31 -0500 Subject: [PATCH 2/2] readd preceding space for long macro names --- .../meteorclient/gui/tabs/builtin/MacrosTab.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/MacrosTab.java b/src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/MacrosTab.java index 60db3993af..5bd14e233f 100644 --- a/src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/MacrosTab.java +++ b/src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/MacrosTab.java @@ -64,7 +64,7 @@ private void initTable(WTable table) { Keybind keybind = macro.keybind.get(); Color keybindColor = keybind.isSet() ? Color.GREEN : Color.LIGHT_GRAY; - table.add(theme.label("(")).expandCellX().right(); + table.add(theme.label(" (")).expandCellX().right(); table.add(theme.label(keybind.toString()).color(keybindColor)).center(); table.add(theme.label(")")).right();