From 47edfb57024ed607444dc9102cc4e49a4313043a Mon Sep 17 00:00:00 2001 From: sonninnos Date: Sun, 7 May 2023 13:54:48 +0300 Subject: [PATCH] Video settings menu cleanup --- intl/msg_hash_us.h | 2 +- menu/menu_displaylist.c | 76 +++++++++++++++++++---------------------- menu/menu_setting.c | 3 ++ 3 files changed, 39 insertions(+), 42 deletions(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 68b79e83b9..74744c4f6a 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1948,7 +1948,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CRT_SWITCH_HIRES_MENU, - "Use high resolution menu" + "Use High Resolution Menu" ) MSG_HASH( MENU_ENUM_SUBLABEL_CRT_SWITCH_HIRES_MENU, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index f2079f2e39..de96b58ab6 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -7117,6 +7117,31 @@ unsigned menu_displaylist_build_list( { gfx_ctx_flags_t flags; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_VIDEO_OUTPUT_SETTINGS, + PARSE_ACTION, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_VIDEO_SCALING_SETTINGS, + PARSE_ACTION, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_VIDEO_SYNCHRONIZATION_SETTINGS, + PARSE_ACTION, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_VIDEO_FULLSCREEN_MODE_SETTINGS, + PARSE_ACTION, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_VIDEO_WINDOWED_MODE_SETTINGS, + PARSE_ACTION, false) == 0) + count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_VIDEO_HDR_SETTINGS, + PARSE_ACTION, false) == 0) + count++; + if (video_display_server_get_flags(&flags)) { if (BIT32_GET(flags.flags, DISPSERV_CTX_CRT_SWITCHRES)) @@ -7134,44 +7159,14 @@ unsigned menu_displaylist_build_list( count++; } - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_OUTPUT_SETTINGS, - PARSE_ACTION, false) == 0) - count++; - - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_FULLSCREEN_MODE_SETTINGS, - PARSE_ACTION, false) == 0) - count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_WINDOWED_MODE_SETTINGS, - PARSE_ACTION, false) == 0) - count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_SCALING_SETTINGS, - PARSE_ACTION, false) == 0) - count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_HDR_SETTINGS, - PARSE_ACTION, false) == 0) - count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_SYNCHRONIZATION_SETTINGS, - PARSE_ACTION, false) == 0) - count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE, PARSE_ONLY_BOOL, false) == 0) count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_BRIGHTNESS_CONTROL, PARSE_ONLY_UINT, false) == 0) count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_THREADED, - PARSE_ONLY_BOOL, false) == 0) - count++; #ifdef HAVE_SCREENSHOTS if (video_driver_supports_viewport_read()) if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, @@ -7179,10 +7174,6 @@ unsigned menu_displaylist_build_list( PARSE_ONLY_BOOL, false) == 0) count++; #endif - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_SMOOTH, - PARSE_ONLY_BOOL, false) == 0) - count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_VIDEO_CTX_SCALING, PARSE_ONLY_BOOL, false) == 0) @@ -8970,17 +8961,18 @@ unsigned menu_displaylist_build_list( MENU_ENUM_LABEL_VIDEO_DRIVER, PARSE_ONLY_STRING_OPTIONS, false) == 0) count++; - + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_VIDEO_THREADED, + PARSE_ONLY_BOOL, false) == 0) + count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_VIDEO_GPU_INDEX, PARSE_ONLY_INT, false) == 0) count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX, PARSE_ONLY_UINT, false) == 0) count++; - #if defined(WIIU) if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_VIDEO_WIIU_PREFER_DRC, @@ -9004,7 +8996,6 @@ unsigned menu_displaylist_build_list( MENU_ENUM_LABEL_VIDEO_WINDOW_OFFSET_X, PARSE_ONLY_INT, false) == 0) count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_VIDEO_WINDOW_OFFSET_Y, PARSE_ONLY_INT, false) == 0) @@ -9014,7 +9005,6 @@ unsigned menu_displaylist_build_list( MENU_ENUM_LABEL_PAL60_ENABLE, PARSE_ONLY_BOOL, false) == 0) count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_VIDEO_GAMMA, PARSE_ONLY_UINT, false) == 0) @@ -9050,11 +9040,11 @@ unsigned menu_displaylist_build_list( PARSE_ONLY_FLOAT, false) == 0) count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_AUTO, + MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_POLLED, PARSE_ONLY_FLOAT, false) == 0) count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_POLLED, + MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_AUTO, PARSE_ONLY_FLOAT, false) == 0) count++; } @@ -9251,6 +9241,10 @@ unsigned menu_displaylist_build_list( MENU_ENUM_LABEL_VIDEO_VFILTER, PARSE_ONLY_BOOL, false) == 0) count++; + if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, + MENU_ENUM_LABEL_VIDEO_SMOOTH, + PARSE_ONLY_BOOL, false) == 0) + count++; if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, MENU_ENUM_LABEL_VIDEO_CROP_OVERSCAN, PARSE_ONLY_BOOL, false) == 0) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index d5630c0252..a9e1e6cd0e 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -12669,6 +12669,9 @@ static bool setting_append_list( general_read_handler, SD_FLAG_CMD_APPLY_AUTO ); + (*list)[list_info->index - 1].action_ok = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); #endif