From eb1bc34123970b66086086615830bf96b47ac455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 3 Sep 2026 09:56:58 -0600 Subject: [PATCH] Map the right analog stick by default on Android pads The generic Android pad map and the Retroid map were the only pad defaults without it, so the right stick did nothing until mapped by hand. Uses the same axes and directions as the desktop pad default. Fixes #21591 Co-Authored-By: Claude Opus 5 (1M context) Claude-Session: https://claude.ai/code/session_01JvJR8oJNSCimCM9KXVLjfq --- Core/KeyMapDefaults.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Core/KeyMapDefaults.cpp b/Core/KeyMapDefaults.cpp index 025d851053..db649c85fc 100644 --- a/Core/KeyMapDefaults.cpp +++ b/Core/KeyMapDefaults.cpp @@ -235,6 +235,10 @@ static const DefMappingStruct defaultRetroidControllerMap[] = { {VIRTKEY_AXIS_X_MAX, JOYSTICK_AXIS_X, +1}, {VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, +1}, {VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, -1}, + {VIRTKEY_AXIS_RIGHT_X_MIN, JOYSTICK_AXIS_Z, -1}, + {VIRTKEY_AXIS_RIGHT_X_MAX, JOYSTICK_AXIS_Z, +1}, + {VIRTKEY_AXIS_RIGHT_Y_MIN, JOYSTICK_AXIS_RZ, +1}, + {VIRTKEY_AXIS_RIGHT_Y_MAX, JOYSTICK_AXIS_RZ, -1}, }; static const DefMappingStruct defaultPadMapAndroid[] = { @@ -266,6 +270,10 @@ static const DefMappingStruct defaultPadMapAndroid[] = { {VIRTKEY_AXIS_X_MAX, JOYSTICK_AXIS_X, +1}, {VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, +1}, {VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, -1}, + {VIRTKEY_AXIS_RIGHT_X_MIN, JOYSTICK_AXIS_Z, -1}, + {VIRTKEY_AXIS_RIGHT_X_MAX, JOYSTICK_AXIS_Z, +1}, + {VIRTKEY_AXIS_RIGHT_Y_MIN, JOYSTICK_AXIS_RZ, +1}, + {VIRTKEY_AXIS_RIGHT_Y_MAX, JOYSTICK_AXIS_RZ, -1}, }; static const DefMappingStruct defaultPadMap[] = {