mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-07 03:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/video/windows/SDL_windowsevents.c
View File

@@ -2022,7 +2022,12 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
WINDOWPLACEMENT placement; WINDOWPLACEMENT placement;
if (GetWindowPlacement(hwnd, &placement) && placement.showCmd == SW_MAXIMIZE) { if (GetWindowPlacement(hwnd, &placement) && placement.showCmd == SW_MAXIMIZE) {
// Maximized borderless windows should use the monitor work area. // 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) { if (hMonitor) {
MONITORINFO info; MONITORINFO info;
SDL_zero(info); SDL_zero(info);