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

win32: Use the size in the WINDOWPOS data while handling popup windows in the WM_WINDOWPOSCHANGED message

Browse Source 
GetClientRect() returns old, incorrect size data for popup windows when called while processing the WM_WINDOWPOSCHANGED message, so use the WINDOWPOS data instead.

Popups can't be maximized or fullscreen, so no need to worry about a move event resizing them.
This commit is contained in:
Frank Praznik
2024-12-31 13:00:40 -05:00
parent 18fc13c20d
commit 4f0a056b95
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1506,12 +1506,23 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
SDL_SendWindowEvent(data->window, SDL_EVENT_WINDOW_MOVED, x, y);
}
// Moving the window from one display to another can change the size of the window (in the handling of SDL_EVENT_WINDOW_MOVED), so we need to re-query the bounds
if (GetClientRect(hwnd, &rect) && !WIN_IsRectEmpty(&rect)) {
w = rect.right;
h = rect.bottom;
// GetClientRect() returns the old size for popup windows for some reason.
if (!SDL_WINDOW_IS_POPUP(data->window)) {
// Moving the window from one display to another can change the size of the window (in the handling of SDL_EVENT_WINDOW_MOVED), so we need to re-query the bounds
if (GetClientRect(hwnd, &rect) && !WIN_IsRectEmpty(&rect)) {
w = rect.right;
h = rect.bottom;
SDL_SendWindowEvent(data->window, SDL_EVENT_WINDOW_RESIZED, w, h);
}
} else {
// Cache the data, as a resize event will call GetWindowSizeInPixels().
w = data->last_popup_width = windowpos->cx;
h = data->last_popup_height = windowpos->cy;
data->use_last_popup_size = true;
SDL_SendWindowEvent(data->window, SDL_EVENT_WINDOW_RESIZED, w, h);
data->use_last_popup_size = false;
}
WIN_UpdateClipCursor(data->window);

6
src/video/windows/SDL_windowswindow.c
View File

@@ -1053,7 +1053,11 @@ void WIN_GetWindowSizeInPixels(SDL_VideoDevice *_this, SDL_Window *window, int *
HWND hwnd = data->hwnd;
RECT rect;
if (GetClientRect(hwnd, &rect) && !WIN_IsRectEmpty(&rect)) {
// GetClientRect() returns the wrong size for popup windows if called while handling WM_WINDOWPOSCHANGED.
if (data->use_last_popup_size) {
*w = data->last_popup_width;
*h = data->last_popup_height;
} else if (GetClientRect(hwnd, &rect) && !WIN_IsRectEmpty(&rect)) {
*w = rect.right;
*h = rect.bottom;
} else if (window->last_pixel_w && window->last_pixel_h) {

2
src/video/windows/SDL_windowswindow.h
View File

@@ -82,6 +82,8 @@ struct SDL_WindowData
bool windowed_mode_was_maximized;
bool in_window_deactivation;
bool force_resizable;
bool use_last_popup_size;
int last_popup_width, last_popup_height;
RECT cursor_clipped_rect; // last successfully committed clipping rect for this window
RECT cursor_ctrlock_rect; // this is Windows-specific, but probably does not need to be per-window
UINT windowed_mode_corner_rounding;