eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

win32: Use the pending size during NCCALCSIZE

Browse source 
Non-resizable windows still need to apply the pending size, as they can be resized programmatically.

Fixes programmatically resizing windows without the WS_THICKFRAME style.
This commit is contained in:
Frank Praznik 2025-01-09 11:48:51 -05:00
parent e8916b2608
commit 037cd25a22
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2020,10 +2020,15 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
params->rgrc[0] = info.rcWork; params->rgrc[0] = info.rcWork;
} }
} }
} else if (!(window_flags & SDL_WINDOW_RESIZABLE)) { } else if (!(window_flags & SDL_WINDOW_RESIZABLE) && !data->force_resizable) {
int w, h; int w, h;
if (data->window->last_size_pending) {
w = data->window->pending.w;
h = data->window->pending.h;
} else {
w = data->window->floating.w; w = data->window->floating.w;
h = data->window->floating.h; h = data->window->floating.h;
}
params->rgrc[0].right = params->rgrc[0].left + w; params->rgrc[0].right = params->rgrc[0].left + w;
params->rgrc[0].bottom = params->rgrc[0].top + h; params->rgrc[0].bottom = params->rgrc[0].top + h;
} }

2
src/video/windows/SDL_windowswindow.c
View file

@ -162,7 +162,7 @@ static DWORD GetWindowStyle(SDL_Window *window)
DWORD style = 0; DWORD style = 0;
if (SDL_WINDOW_IS_POPUP(window)) { if (SDL_WINDOW_IS_POPUP(window)) {
style |= WS_POPUP | WS_THICKFRAME; style |= WS_POPUP;
} else if (window->flags & SDL_WINDOW_FULLSCREEN) { } else if (window->flags & SDL_WINDOW_FULLSCREEN) {
style |= STYLE_FULLSCREEN; style |= STYLE_FULLSCREEN;
} else { } else {