From 755d097cef87dd97184e3b587bc375a100b7f99c Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 9 Dec 2023 21:30:59 +0200 Subject: [PATCH] Fix GUI position/size after restarting from full-window or fullscreen mode. --- main.cpp | 3 --- od-win32/win32gui.cpp | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/main.cpp b/main.cpp index 4cd1a849..5cb48654 100644 --- a/main.cpp +++ b/main.cpp @@ -852,9 +852,6 @@ void uae_restart(struct uae_prefs *p, int opengui, const TCHAR *cfgfile) if (cfgfile) _tcscpy (restart_config, cfgfile); target_restart (); - p->gfx_apmode[0].gfx_fullscreen = GFX_WINDOW; - p->gfx_apmode[1].gfx_fullscreen = GFX_WINDOW; - } #ifndef DONT_PARSE_CMDLINE diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 541d7681..35ac9d3b 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -22050,7 +22050,7 @@ static HWND updatePanel (int id, UINT action) left = r.left; top = r.top; if (!gui_fullscreen) { - if (isfullscreen () == 0) { + if (full_property_sheet || isfullscreen () == 0) { regsetint (NULL, _T("GUIPosX"), left); regsetint (NULL, _T("GUIPosY"), top); } else if (isfullscreen () < 0) { @@ -22279,7 +22279,7 @@ void getguipos(int *xp, int *yp) x = gui_fullscreen_rect.left; y = gui_fullscreen_rect.top; } else { - if (isfullscreen() == 0) { + if (full_property_sheet || isfullscreen() == 0) { regqueryint(NULL, _T("GUIPosX"), &x); regqueryint(NULL, _T("GUIPosY"), &y); } else if (isfullscreen() < 0) { -- 2.47.3