mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RGUI) Fix saving of config files/overrides when 'Lock Menu Aspect Ratio' is enabled

Browse Source
This commit is contained in:
jdgleaver 2021-05-14 10:50:18 +01:00
parent cc5b491e21
commit 358cafa978
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
menu/drivers/rgui.c
View File

@ -1053,6 +1053,7 @@ typedef struct
bool bg_modified; bool bg_modified;
bool force_redraw; bool force_redraw;
bool force_menu_refresh; bool force_menu_refresh;
bool restore_aspect_lock;
bool show_mouse; bool show_mouse;
bool show_screensaver; bool show_screensaver;
bool ignore_resize_events; bool ignore_resize_events;
@ -6687,7 +6688,8 @@ static void rgui_frame(void *data, video_frame_info_t *video_info)
} }
/* > Check for changes in aspect ratio lock setting */ /* > Check for changes in aspect ratio lock setting */
if (aspect_ratio_lock != rgui->menu_aspect_ratio_lock) if ((aspect_ratio_lock != rgui->menu_aspect_ratio_lock) ||
rgui->restore_aspect_lock)
{ {
rgui->menu_aspect_ratio_lock = aspect_ratio_lock; rgui->menu_aspect_ratio_lock = aspect_ratio_lock;
@ -6703,6 +6705,9 @@ static void rgui_frame(void *data, video_frame_info_t *video_info)
rgui_update_menu_viewport(rgui, p_disp); rgui_update_menu_viewport(rgui, p_disp);
rgui_set_video_config(rgui, &rgui->menu_video_settings, true); rgui_set_video_config(rgui, &rgui->menu_video_settings, true);
} }
/* Clear any pending 'restore aspect lock' flags */
rgui->restore_aspect_lock = false;
} }
/* > Check for changes in window (display) dimensions */ /* > Check for changes in window (display) dimensions */
@ -6883,13 +6888,45 @@ static void rgui_context_destroy(void *data)
} }
static enum menu_action rgui_parse_menu_entry_action( static enum menu_action rgui_parse_menu_entry_action(
rgui_t *rgui, enum menu_action action) rgui_t *rgui, menu_entry_t *entry,
enum menu_action action)
{ {
enum menu_action new_action = action; enum menu_action new_action = action;
/* Scan user inputs */ /* Scan user inputs */
switch (action) switch (action)
{ {
case MENU_ACTION_OK:
/* If aspect ratio lock is enabled, must restore
* content video settings when saving configuration
* files/overrides - otherwise RGUI's custom viewport
* parameters will be included in the generated output */
if ((rgui->menu_aspect_ratio_lock != RGUI_ASPECT_RATIO_LOCK_NONE) &&
((entry->enum_idx == MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE) ||
(entry->enum_idx == MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR) ||
(entry->enum_idx == MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME) ||
(entry->enum_idx == MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG) ||
(entry->enum_idx == MENU_ENUM_LABEL_SAVE_NEW_CONFIG)))
{
rgui_video_settings_t current_video_settings = {{0}};
rgui_get_video_config(&current_video_settings);
if (rgui_is_video_config_equal(&current_video_settings,
&rgui->menu_video_settings))
{
/* This is identical to the temporary 'aspect
* ratio unlock' that is applied when accessing
* the video settings menu. There is, however,
* no need in this case to ignore resize events
* until the menu is next toggled off; this is a
* one-shot 'fix' that should only be active
* during the config save operation */
rgui_set_video_config(rgui, &rgui->content_video_settings, false);
/* Schedule a restoration of the aspect ratio
* lock on the next frame */
rgui->restore_aspect_lock = true;
}
}
break;
case MENU_ACTION_SCAN: case MENU_ACTION_SCAN:
/* If this is a playlist, 'scan' command is /* If this is a playlist, 'scan' command is
* used to toggle fullscreen thumbnail view */ * used to toggle fullscreen thumbnail view */
@ -6916,7 +6953,8 @@ static int rgui_menu_entry_action(
rgui_t *rgui = (rgui_t*)userdata; rgui_t *rgui = (rgui_t*)userdata;
/* Process input action */ /* Process input action */
enum menu_action new_action = rgui_parse_menu_entry_action(rgui, action); enum menu_action new_action = rgui_parse_menu_entry_action(rgui,
entry, action);
/* Call standard generic_menu_entry_action() function */ /* Call standard generic_menu_entry_action() function */
return generic_menu_entry_action(userdata, entry, i, new_action); return generic_menu_entry_action(userdata, entry, i, new_action);