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

Merge pull request #12300 from jdgleaver/rgui-scaling-menu-fix

Browse Source 
(RGUI) Fix display of 'Video > Scaling' menu when 'Lock Menu Aspect Ratio' is enabled
This commit is contained in:
Autechre 2021-04-22 17:49:13 +02:00 committed by GitHub
commit 93e467913e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
menu/drivers/rgui.c
View File

@ -1052,6 +1052,7 @@ typedef struct
bool bg_modified;
bool force_redraw;
bool force_menu_refresh;
bool show_mouse;
bool show_screensaver;
bool ignore_resize_events;
@ -4477,6 +4478,22 @@ static void rgui_render(void *data,
rgui->aspect_update_pending = false;
}
/* Refresh current menu, if required */
if (rgui->force_menu_refresh)
{
bool refresh = false;
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
/* Menu entries may change as a result of the
* refresh; skip rendering of the 'obsolete'
* menu this frame, and force a redraw of the
* updated menu on the next frame */
rgui->force_redraw = true;
rgui->force_menu_refresh = false;
return;
}
current_display_cb = menu_input_dialog_get_display_kb();
if (!rgui->force_redraw)
@ -6440,6 +6457,14 @@ static void rgui_populate_entries(void *data,
/* Menu viewport has been overridden - must ignore
* resize events until the menu is next toggled off */
rgui->ignore_resize_events = true;
#if !defined(GEKKO)
/* Changing the video config may alter the list
* of entries that should be displayed in the
* video scaling menu. The current menu layout
* was generated using the previous video config;
* we therefore have to force a menu refresh */
rgui->force_menu_refresh = true;
#endif
}
}
}