From 779b8b32cf98ef789924ea180e180bfc264a8776 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 20 Dec 2019 13:56:31 +0100 Subject: [PATCH] Move 'Press Quit Twice' and 'Menu Toggle Gamepad Combo' to Input -> Hotkey Binds --- menu/menu_displaylist.c | 43 ++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index beb44dd545..ad0f109afb 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3848,6 +3848,24 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct switch (type) { + case DISPLAYLIST_INPUT_HOTKEY_BINDS_LIST: + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_QUIT_PRESS_TWICE, + PARSE_ONLY_BOOL, false) == 0) + count++; + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO, + PARSE_ONLY_UINT, false) == 0) + count++; + for (i = 0; i < RARCH_BIND_LIST_END; i++) + { + if (menu_displaylist_parse_settings_enum(list, + (enum msg_hash_enums)( + MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN + i), + PARSE_ONLY_BIND, false) == 0) + count++; + } + break; case DISPLAYLIST_SHADER_PRESET_REMOVE: { #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) @@ -4524,10 +4542,6 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct PARSE_ONLY_BOOL, false) == 0) count++; - if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_QUIT_PRESS_TWICE, - PARSE_ONLY_BOOL, false) == 0) - count++; if (menu_displaylist_parse_settings_enum(list, MENU_ENUM_LABEL_VIBRATE_ON_KEYPRESS, PARSE_ONLY_BOOL, false) == 0) @@ -4556,10 +4570,6 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH, PARSE_ONLY_BOOL, false) == 0) count++; - if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO, - PARSE_ONLY_UINT, false) == 0) - count++; if (menu_displaylist_parse_settings_enum(list, MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL, PARSE_ONLY_BOOL, false) == 0) @@ -8231,22 +8241,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, info->need_push = true; - break; - case DISPLAYLIST_INPUT_HOTKEY_BINDS_LIST: - menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); - { - unsigned i; - - for (i = 0; i < RARCH_BIND_LIST_END; i++) - { - if (menu_displaylist_parse_settings_enum(info->list, - (enum msg_hash_enums)( - MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN + i), - PARSE_ONLY_BIND, false) == 0) - count++; - } - } - info->need_push = true; break; case DISPLAYLIST_SAVING_SETTINGS_LIST: case DISPLAYLIST_DRIVER_SETTINGS_LIST: @@ -8332,6 +8326,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, case DISPLAYLIST_NETPLAY_ROOM_LIST: case DISPLAYLIST_SHADER_PRESET_SAVE: case DISPLAYLIST_SHADER_PRESET_REMOVE: + case DISPLAYLIST_INPUT_HOTKEY_BINDS_LIST: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_build_list(info->list, type);