mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-11-13 13:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

win32: Don't overwrite a programmatically set window size with old data

Browse Source 
While in a modal loop, the size in WM_WINDOWPOSCHANGING/WM_WINDOWPOSCHANGED may only be updated if the window is being resized interactively. Set the SWP_NOSIZE flag if the size hasn't changed from the last move/size event, or a size set programmatically may end up being overwritten by old size data.
This commit is contained in:
Frank Praznik
2025-10-05 14:40:45 -04:00
parent d40b887775
commit ce1175724a
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1708,6 +1708,21 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
case WM_WINDOWPOSCHANGING: case WM_WINDOWPOSCHANGING:
if (data->expected_resize) { if (data->expected_resize) {
returnCode = 0;
} else if (data->in_modal_loop) {
WINDOWPOS *windowpos = (WINDOWPOS *)lParam;
/* While in a modal loop, the size may only be updated if the window is being resized interactively.
* Set the SWP_NOSIZE flag if the reported size hasn't changed from the last WM_WINDOWPOSCHANGING
* event, or a size set programmatically may end up being overwritten by old size data.
*/
if (data->last_modal_width == windowpos->cx && data->last_modal_height == windowpos->cy) {
windowpos->flags |= SWP_NOSIZE;
}
data->last_modal_width = windowpos->cx;
data->last_modal_height = windowpos->cy;
returnCode = 0; returnCode = 0;
} }
break; break;
@@ -1819,6 +1834,12 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
++data->in_modal_loop; ++data->in_modal_loop;
if (data->in_modal_loop == 1) { if (data->in_modal_loop == 1) {
RECT rect;
SDL_zero(rect);
GetWindowRect(data->hwnd, &rect);
data->last_modal_width = rect.right - rect.left;
data->last_modal_height = rect.bottom - rect.top;
data->initial_size_rect.left = data->window->x; data->initial_size_rect.left = data->window->x;
data->initial_size_rect.right = data->window->x + data->window->w; data->initial_size_rect.right = data->window->x + data->window->w;
data->initial_size_rect.top = data->window->y; data->initial_size_rect.top = data->window->y;

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

@@ -86,6 +86,8 @@ struct SDL_WindowData
bool disable_move_size_events; bool disable_move_size_events;
bool showing_window; bool showing_window;
int in_modal_loop; int in_modal_loop;
int last_modal_width;
int last_modal_height;
RECT initial_size_rect; RECT initial_size_rect;
RECT cursor_clipped_rect; // last successfully committed clipping rect for this window 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 RECT cursor_ctrlock_rect; // this is Windows-specific, but probably does not need to be per-window