Fix key display names in the settings menu (#287)

This commit is contained in:
Raven Szewczyk authored and GitHub committed 2026-01-05 12:02:08 +00:00
1 parent 55807c8f6c
commit 56d58696b2
1 file changed
+7 -2
+7 -2
View File
@@ -11,6 +11,7 @@ import java.util.concurrent.ArrayBlockingQueue;
import org.apache.commons.lang3.StringUtils;
import org.lwjgl.sdl.SDLKeycode;
import org.lwjgl.sdl.SDLScancode;
import org.lwjglx.Sys;
import org.lwjglx.opengl.Display;
@@ -345,8 +346,12 @@ public class Keyboard {
if (cached != null) {
return cached;
}
int sdlKey = KeyCodes.lwjglToSdlKeycode(key);
if (sdlKey == -1 || sdlKey == SDLKeycode.SDLK_UNKNOWN) {
int sdlScan = KeyCodes.lwjglToSdlScancode(key);
if (sdlScan == -1 || sdlScan == SDLScancode.SDL_SCANCODE_UNKNOWN) {
return "Key " + key;
}
int sdlKey = SDL_GetKeyFromScancode(sdlScan, (short) 0, true);
if (sdlKey == SDLKeycode.SDLK_UNKNOWN) {
return "Key " + key;
}
String name = Objects.firstNonNull(MainThreadExec.runOnMainThread(() -> SDL_GetKeyName(sdlKey)), "UNKNOWN")