Don't fixup mappings for Joy-Con controllers

They don't have a D-pad mapping, so look at the paddles instead to see whether we need to fix up the mapping.

Fixes https://github.com/libsdl-org/SDL/issues/12232
This commit is contained in:
Sam Lantinga
2025-02-25 18:59:40 -08:00
parent 34c3734953
commit e012573766

View File

@@ -1394,17 +1394,22 @@ static void SDL_UpdateGamepadFaceStyle(SDL_Gamepad *gamepad)
static void SDL_FixupHIDAPIMapping(SDL_Gamepad *gamepad) static void SDL_FixupHIDAPIMapping(SDL_Gamepad *gamepad)
{ {
// Check to see if we need fixup // Check to see if we need fixup
bool need_fixup = false;
for (int i = 0; i < gamepad->num_bindings; ++i) { for (int i = 0; i < gamepad->num_bindings; ++i) {
SDL_GamepadBinding *binding = &gamepad->bindings[i]; SDL_GamepadBinding *binding = &gamepad->bindings[i];
if (binding->output_type == SDL_GAMEPAD_BINDTYPE_BUTTON && if (binding->output_type == SDL_GAMEPAD_BINDTYPE_BUTTON &&
binding->output.button == SDL_GAMEPAD_BUTTON_DPAD_UP) { binding->output.button >= SDL_GAMEPAD_BUTTON_DPAD_UP) {
if (binding->input_type != SDL_GAMEPAD_BINDTYPE_BUTTON || if (binding->input_type == SDL_GAMEPAD_BINDTYPE_BUTTON &&
binding->input.button != SDL_GAMEPAD_BUTTON_DPAD_UP) { binding->input.button == binding->output.button) {
// New style binding // Old style binding
return; need_fixup = true;
} }
break;
} }
} }
if (!need_fixup) {
return;
}
for (int i = 0; i < gamepad->num_bindings; ++i) { for (int i = 0; i < gamepad->num_bindings; ++i) {
SDL_GamepadBinding *binding = &gamepad->bindings[i]; SDL_GamepadBinding *binding = &gamepad->bindings[i];