win32: Use the window coordinates to get the monitor when de-minimizing a maximized window

MonitorFromWindow can fail if called on a window being de-minimized, so fall back to using the monitor from the last window coordinates if initial retrieval fails.
This commit is contained in:
Frank Praznik
2025-01-17 15:23:41 -05:00
parent 656c519cca
commit 1848ce680b

View File

@@ -2022,7 +2022,12 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
WINDOWPLACEMENT placement;
if (GetWindowPlacement(hwnd, &placement) && placement.showCmd == SW_MAXIMIZE) {
// Maximized borderless windows should use the monitor work area.
HMONITOR hMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
HMONITOR hMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONULL);
if (!hMonitor) {
// The returned monitor can be null when restoring from minimized, so use the last coordinates.
const POINT pt = { data->window->windowed.x, data->window->windowed.y };
hMonitor = MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST);
}
if (hMonitor) {
MONITORINFO info;
SDL_zero(info);