ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refine menu info+search disable buttons (#17889)

This commit is contained in:
sonninnos 2025-05-11 22:18:44 +03:00 committed by GitHub
parent 5e03ef57ec
commit 1b61b88274
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_us.h
View File

@ -3762,7 +3762,7 @@ MSG_HASH(
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_DISABLE_INFO_BUTTON, MENU_ENUM_SUBLABEL_INPUT_DISABLE_INFO_BUTTON,
"If enabled Info button presses will be ignored." "If enabled Info function will be disabled."
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_SEARCH_BUTTON, MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_SEARCH_BUTTON,
@ -3770,7 +3770,7 @@ MSG_HASH(
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_DISABLE_SEARCH_BUTTON, MENU_ENUM_SUBLABEL_INPUT_DISABLE_SEARCH_BUTTON,
"If enabled Search button presses will be ignored." "If enabled Search function will be disabled."
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_LEFT_ANALOG_IN_MENU, MENU_ENUM_LABEL_VALUE_INPUT_DISABLE_LEFT_ANALOG_IN_MENU,

3
menu/cbs/menu_cbs_info.c
View File

@ -42,6 +42,9 @@ static int action_info_default(unsigned type, const char *label)
bool audio_enable_menu_notice = settings->bools.audio_enable_menu_notice; bool audio_enable_menu_notice = settings->bools.audio_enable_menu_notice;
#endif #endif
if (settings->bools.menu_disable_info_button)
goto error;
menu_displaylist_info_init(&info); menu_displaylist_info_init(&info);
info.list = menu_stack; info.list = menu_stack;

14
menu/menu_driver.c
View File

@ -5629,19 +5629,13 @@ unsigned menu_event(
else if (BIT256_GET_PTR(p_trigger_input, menu_cancel_btn)) else if (BIT256_GET_PTR(p_trigger_input, menu_cancel_btn))
ret = MENU_ACTION_CANCEL; ret = MENU_ACTION_CANCEL;
else if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_X)) else if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_X))
{ ret = MENU_ACTION_SEARCH;
if (!settings->bools.menu_disable_search_button)
ret = MENU_ACTION_SEARCH;
}
else if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_Y)) else if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_Y))
ret = MENU_ACTION_SCAN; ret = MENU_ACTION_SCAN;
else if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_START)) else if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_START))
ret = MENU_ACTION_START; ret = MENU_ACTION_START;
else if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_SELECT)) else if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_SELECT))
{ ret = MENU_ACTION_INFO;
if (!settings->bools.menu_disable_info_button)
ret = MENU_ACTION_INFO;
}
else if (BIT256_GET_PTR(p_trigger_input, RARCH_MENU_TOGGLE)) else if (BIT256_GET_PTR(p_trigger_input, RARCH_MENU_TOGGLE))
ret = MENU_ACTION_TOGGLE; ret = MENU_ACTION_TOGGLE;
@ -7911,8 +7905,8 @@ bool menu_driver_iterate(
bool menu_input_dialog_start_search(void) bool menu_input_dialog_start_search(void)
{ {
input_driver_state_t *input_st = input_state_get_ptr(); input_driver_state_t *input_st = input_state_get_ptr();
#ifdef HAVE_ACCESSIBILITY
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
#ifdef HAVE_ACCESSIBILITY
bool accessibility_enable = settings->bools.accessibility_enable; bool accessibility_enable = settings->bools.accessibility_enable;
unsigned accessibility_narrator_speech_speed = settings->uints.accessibility_narrator_speech_speed; unsigned accessibility_narrator_speech_speed = settings->uints.accessibility_narrator_speech_speed;
access_state_t *access_st = access_state_get_ptr(); access_state_t *access_st = access_state_get_ptr();
@ -7920,7 +7914,7 @@ bool menu_input_dialog_start_search(void)
struct menu_state *menu_st = &menu_driver_state; struct menu_state *menu_st = &menu_driver_state;
menu_handle_t *menu = menu_st->driver_data; menu_handle_t *menu = menu_st->driver_data;
if (!menu) if (!menu || settings->bools.menu_disable_search_button)
return false; return false;
#ifdef HAVE_MIST #ifdef HAVE_MIST