From 05771f4337679215a32339c5b6e0015c6fd15463 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 4 Feb 2026 21:34:19 -0500 Subject: [PATCH] Correct key names based on keyboard layout --- core/src/mindustry/ui/dialogs/KeybindDialog.java | 7 +++++-- gradle.properties | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/ui/dialogs/KeybindDialog.java b/core/src/mindustry/ui/dialogs/KeybindDialog.java index e56d2f43cc..d14fd47e8d 100644 --- a/core/src/mindustry/ui/dialogs/KeybindDialog.java +++ b/core/src/mindustry/ui/dialogs/KeybindDialog.java @@ -97,7 +97,7 @@ public class KeybindDialog extends Dialog{ table.labelWrap(() -> { Axis axis = keybind.value; - return axis.key != null ? axis.key.toString() : axis.min + " [red]/[] " + axis.max; + return axis.key != null ? axis.key.getName() : axis.min.getName() + " [red]/[] " + axis.max.getName(); }).color(Pal.accent).left().minWidth(90).fillX().padRight(20); table.button("@settings.rebind", tstyle, () -> { @@ -107,7 +107,10 @@ public class KeybindDialog extends Dialog{ }).size(bw, bh); }else{ table.add(bundle.get("keybind." + keybind.name + ".name", Strings.capitalize(keybind.name)), Color.white).left().padRight(40).padLeft(8); - table.label(() -> keybind.value.key.toString()).color(Pal.accent).left().minWidth(90).padRight(20); + table.add(keybind.value.key.getName()).update(l -> { + l.setText(keybind.value.key.getName()); + l.setColor(keybind.value.key == KeyCode.unset ? Color.darkGray : Pal.accent); + }).color(Pal.accent).left().minWidth(90).padRight(20); table.button("@settings.rebind", tstyle, () -> { rebindAxis = false; diff --git a/gradle.properties b/gradle.properties index 7d83a7e600..613b3d1c37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=b5be655c5c +archash=9026252e4d