mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

swap should affect OSK too

Browse Source
This commit is contained in:
radius 2016-11-22 18:55:52 -05:00
parent 4bfa6f958c
commit 66a766fca1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
menu/menu_event.c
View File

@ -199,6 +199,11 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
size_t new_scroll_accel = 0; size_t new_scroll_accel = 0;
menu_input_t *menu_input = NULL; menu_input_t *menu_input = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_ok_btn = settings->input.menu_swap_ok_cancel_buttons ?
RETRO_DEVICE_ID_JOYPAD_A: RETRO_DEVICE_ID_JOYPAD_B;
menu_cancel_btn = settings->input.menu_swap_ok_cancel_buttons ?
RETRO_DEVICE_ID_JOYPAD_B: RETRO_DEVICE_ID_JOYPAD_A;
if (input) if (input)
{ {
@ -329,7 +334,7 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
osk_idx = (enum osk_type)(OSK_TYPE_UNKNOWN + 1); osk_idx = (enum osk_type)(OSK_TYPE_UNKNOWN + 1);
} }
if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_A)) if (trigger_input & (UINT64_C(1) << menu_cancel_btn))
{ {
if (osk_ptr >= 0) if (osk_ptr >= 0)
{ {
@ -337,7 +342,7 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
} }
} }
if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_B)) if (trigger_input & (UINT64_C(1) << menu_ok_btn))
{ {
input_keyboard_event(true, '\x7f', '\x7f', 0, RETRO_DEVICE_KEYBOARD); input_keyboard_event(true, '\x7f', '\x7f', 0, RETRO_DEVICE_KEYBOARD);
} }
@ -349,11 +354,6 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
trigger_input = 0; trigger_input = 0;
} }
menu_ok_btn = settings->input.menu_swap_ok_cancel_buttons ?
RETRO_DEVICE_ID_JOYPAD_A: RETRO_DEVICE_ID_JOYPAD_B;
menu_cancel_btn = settings->input.menu_swap_ok_cancel_buttons ?
RETRO_DEVICE_ID_JOYPAD_B: RETRO_DEVICE_ID_JOYPAD_A;
if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_UP)) if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_UP))
ret = MENU_ACTION_UP; ret = MENU_ACTION_UP;
else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_DOWN)) else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_DOWN))