mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Win32) Window size improvements (#15068)

Browse Source
This commit is contained in:
sonninnos 2023-03-07 17:51:08 +02:00 committed by GitHub
parent 01a997345f
commit 17b46b5f93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gfx/common/win32_common.c
View File

@ -881,13 +881,13 @@ static void win32_save_position(void)
} }
} }
/* Get minimum window size for running core */ /* Get minimum window size for running core. */
static void win32_get_av_info_geometry(unsigned *width, unsigned *height) static void win32_get_av_info_geometry(unsigned *width, unsigned *height)
{ {
video_driver_state_t *video_st = video_state_get_ptr(); video_driver_state_t *video_st = video_state_get_ptr();
runloop_state_t *runloop_st = runloop_state_get_ptr(); runloop_state_t *runloop_st = runloop_state_get_ptr();
/* Don't bother while fast-forwarding */ /* Don't bother while fast-forwarding. */
if (!video_st || runloop_st->flags & RUNLOOP_FLAG_FASTMOTION) if (!video_st || runloop_st->flags & RUNLOOP_FLAG_FASTMOTION)
return; return;
@ -999,6 +999,9 @@ static LRESULT CALLBACK wnd_proc_common(
lpMinMaxInfo->ptMinTrackSize.x = min_width; lpMinMaxInfo->ptMinTrackSize.x = min_width;
lpMinMaxInfo->ptMinTrackSize.y = min_height; lpMinMaxInfo->ptMinTrackSize.y = min_height;
lpMinMaxInfo->ptMaxTrackSize.x = min_width * 10;
lpMinMaxInfo->ptMaxTrackSize.y = min_height * 10;
} }
break; break;
case WM_COMMAND: case WM_COMMAND:
@ -2154,25 +2157,42 @@ bool win32_has_focus(void *data)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
/* Ensure window size is big enough for core geometry in 1x scale */ /* Ensure window size is big enough for core geometry. */
if ( settings if ( settings
&& !settings->bools.video_fullscreen && !settings->bools.video_fullscreen
&& !settings->bools.video_window_save_positions) && !settings->bools.video_window_save_positions)
{ {
unsigned menu_bar_height = 0; unsigned video_scale = settings->uints.video_scale;
unsigned extra_width = 0;
unsigned extra_height = 0;
unsigned min_width = 0; unsigned min_width = 0;
unsigned min_height = 0; unsigned min_height = 0;
win32_get_av_info_geometry(&min_width, &min_height); win32_get_av_info_geometry(&min_width, &min_height);
/* Menubar without decorations requires extra bonus height */ min_width *= video_scale;
if ( settings->bools.ui_menubar_enable min_height *= video_scale;
&& !settings->bools.video_window_show_decorations)
menu_bar_height = GetSystemMetrics(SM_CYMENU);
if ( g_win32_resize_width < min_width if (settings->bools.video_window_show_decorations)
|| g_win32_resize_height < min_height) {
SetWindowPos(main_window.hwnd, NULL, 0, 0, min_width, min_height + menu_bar_height, SWP_NOMOVE); int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME);
int title_bar_height = GetSystemMetrics(SM_CYCAPTION);
extra_width += border_thickness * 2;
extra_height += border_thickness * 2 + title_bar_height;
}
if (settings->bools.ui_menubar_enable)
extra_height += GetSystemMetrics(SM_CYMENU);
if ( ( g_win32_resize_width < min_width
|| g_win32_resize_height < min_height)
&& min_width - g_win32_resize_width < MIN_WIDTH / 2
&& min_height - g_win32_resize_height < MIN_HEIGHT / 2)
SetWindowPos(main_window.hwnd, NULL, 0, 0,
min_width + extra_width,
min_height + extra_height,
SWP_NOMOVE);
} }
if (g_win32_flags & WIN32_CMN_FLAG_INITED) if (g_win32_flags & WIN32_CMN_FLAG_INITED)