mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 19:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce two functions to one

Browse Source
This commit is contained in:
twinaphex 2019-08-14 14:46:17 +02:00
parent 890008491c
commit 02eaad8587
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
menu/widgets/menu_input_dialog.c
View File

@ -65,7 +65,7 @@ void menu_input_dialog_end(void)
{ {
menu_input_dialog_keyboard_type = 0; menu_input_dialog_keyboard_type = 0;
menu_input_dialog_keyboard_idx = 0; menu_input_dialog_keyboard_idx = 0;
menu_input_dialog_keyboard_display = false; menu_input_dialog_set_kb(false);
menu_input_dialog_keyboard_label[0] = '\0'; menu_input_dialog_keyboard_label[0] = '\0';
menu_input_dialog_keyboard_label_setting[0] = '\0'; menu_input_dialog_keyboard_label_setting[0] = '\0';
@ -158,14 +158,9 @@ bool menu_input_dialog_get_display_kb(void)
return menu_input_dialog_keyboard_display; return menu_input_dialog_keyboard_display;
} }
void menu_input_dialog_display_kb(void) void menu_input_dialog_set_kb(bool val)
{ {
menu_input_dialog_keyboard_display = true; menu_input_dialog_keyboard_display = val;
}
void menu_input_dialog_hide_kb(void)
{
menu_input_dialog_keyboard_display = false;
} }
bool menu_input_dialog_start_search(void) bool menu_input_dialog_start_search(void)
@ -176,7 +171,7 @@ bool menu_input_dialog_start_search(void)
RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return false; return false;
menu_input_dialog_display_kb(); menu_input_dialog_set_kb(true);
strlcpy(menu_input_dialog_keyboard_label, strlcpy(menu_input_dialog_keyboard_label,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SEARCH), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SEARCH),
sizeof(menu_input_dialog_keyboard_label)); sizeof(menu_input_dialog_keyboard_label));
@ -197,7 +192,7 @@ bool menu_input_dialog_start(menu_input_ctx_line_t *line)
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return false; return false;
menu_input_dialog_display_kb(); menu_input_dialog_set_kb(true);
/* Only copy over the menu label and setting if they exist. */ /* Only copy over the menu label and setting if they exist. */
if (line->label) if (line->label)

4
menu/widgets/menu_input_dialog.h
View File

@ -49,9 +49,7 @@ unsigned menu_input_dialog_get_kb_idx(void);
bool menu_input_dialog_start_search(void); bool menu_input_dialog_start_search(void);
void menu_input_dialog_hide_kb(void); void menu_input_dialog_set_kb(bool val);
void menu_input_dialog_display_kb(void);
bool menu_input_dialog_get_display_kb(void); bool menu_input_dialog_get_display_kb(void);