From 28ec64e20089aa0b70d6c3880ad3dc43e0871154 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 21 Dec 2019 04:32:56 +0100 Subject: [PATCH] (Menu) Video -> Scaling - Hide Custom Viewport X/Y when Integer Scale is enabled as description indicates --- menu/menu_displaylist.c | 19 +++++++++++-------- menu/menu_setting.c | 2 ++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 2848a28d5a..2a8dd7b3ff 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5750,14 +5750,17 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct count++; break; case ASPECT_RATIO_CUSTOM: - if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_X, - PARSE_ONLY_INT, false) == 0) - count++; - if (menu_displaylist_parse_settings_enum(list, - MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_Y, - PARSE_ONLY_INT, false) == 0) - count++; + if (!settings->bools.video_scale_integer) + { + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_X, + PARSE_ONLY_INT, false) == 0) + count++; + if (menu_displaylist_parse_settings_enum(list, + MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_Y, + PARSE_ONLY_INT, false) == 0) + count++; + } if (menu_displaylist_parse_settings_enum(list, MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH, PARSE_ONLY_UINT, false) == 0) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 3973a0f5ec..05d2b717da 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -9859,6 +9859,8 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_NONE); + (*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,