From 9b0eae675a168d4e9049620a14f0c881ada8b4a1 Mon Sep 17 00:00:00 2001 From: sonninnos Date: Mon, 26 Feb 2024 07:44:57 +0200 Subject: [PATCH] Reorder User Interface menu --- menu/menu_displaylist.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index c1f376fab30..17af944f5fd 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -9047,14 +9047,13 @@ unsigned menu_displaylist_build_list( menu_displaylist_build_info_selective_t build_list[] = { {MENU_ENUM_LABEL_APPICON_SETTINGS, PARSE_ONLY_STRING_OPTIONS, false}, - {MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS, PARSE_ACTION, true}, - {MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, PARSE_ACTION, true}, - {MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS, PARSE_ACTION, true}, {MENU_ENUM_LABEL_MENU_SETTINGS, PARSE_ACTION, true}, - {MENU_ENUM_LABEL_MENU_DRIVER, PARSE_ONLY_STRING_OPTIONS, true}, - {MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_MENU_ENABLE_KIOSK_MODE, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_MENU_KIOSK_MODE_PASSWORD, PARSE_ONLY_STRING, false}, + {MENU_ENUM_LABEL_MENU_VIEWS_SETTINGS, PARSE_ACTION, true}, + {MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS, PARSE_ACTION, true}, +#if defined(HAVE_OVERLAY) + {MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS, PARSE_ACTION, true}, +#endif + {MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, PARSE_ACTION, true}, {MENU_ENUM_LABEL_PAUSE_LIBRETRO, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_PAUSE_NONACTIVE, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_PAUSE_ON_DISCONNECT, PARSE_ONLY_BOOL, true}, @@ -9063,6 +9062,9 @@ unsigned menu_displaylist_build_list( {MENU_ENUM_LABEL_MENU_INSERT_DISK_RESUME, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_MENU_REMEMBER_SELECTION, PARSE_ONLY_UINT, false}, + {MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_MENU_ENABLE_KIOSK_MODE, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_MENU_KIOSK_MODE_PASSWORD, PARSE_ONLY_STRING, false}, {MENU_ENUM_LABEL_MOUSE_ENABLE, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_POINTER_ENABLE, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_THREADED_DATA_RUNLOOP_ENABLE, PARSE_ONLY_BOOL, true}, @@ -9082,6 +9084,7 @@ unsigned menu_displaylist_build_list( {MENU_ENUM_LABEL_VIDEO_3DS_DISPLAY_MODE, PARSE_ONLY_UINT, true}, {MENU_ENUM_LABEL_MENU_BOTTOM_SETTINGS, PARSE_ACTION, true}, #endif + {MENU_ENUM_LABEL_MENU_DRIVER, PARSE_ONLY_STRING_OPTIONS, true}, }; for (i = 0; i < ARRAY_SIZE(build_list); i++) @@ -9095,7 +9098,8 @@ unsigned menu_displaylist_build_list( build_list[i].checked = icons && icons->size > 1; } break; - case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS: + case MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS: + case MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS: build_list[i].checked = settings->bools.settings_show_onscreen_display; break; case MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS: @@ -10558,6 +10562,7 @@ unsigned menu_displaylist_build_list( break; case DISPLAYLIST_ONSCREEN_DISPLAY_SETTINGS_LIST: { + /* Not used */ menu_displaylist_build_info_t build_list[] = { {MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS, PARSE_ACTION}, #if defined(HAVE_OVERLAY)