gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the size and position of minimized windows on Windows

Browse Source
This commit is contained in:
Sam Lantinga
2024-01-26 22:36:32 -08:00
parent 5ba839e83b
commit a1a4948fda
1 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -387,46 +387,7 @@ static int SetupWindowData(SDL_VideoDevice *_this, SDL_Window *window, HWND hwnd
} }
#endif #endif
/* Fill in the SDL window with the window data */ /* Fill in the SDL window with the window state */
{
RECT rect;
if (GetClientRect(hwnd, &rect)) {
int w = rect.right;
int h = rect.bottom;
if (window->flags & SDL_WINDOW_EXTERNAL) {
window->floating.w = window->windowed.w = window->w = w;
window->floating.h = window->windowed.h = window->h = h;
} else if ((window->windowed.w && window->windowed.w != w) || (window->windowed.h && window->windowed.h != h)) {
/* We tried to create a window larger than the desktop and Windows didn't allow it. Override! */
int x, y;
/* Figure out what the window area will be */
WIN_AdjustWindowRect(window, &x, &y, &w, &h, SDL_WINDOWRECT_FLOATING);
data->expected_resize = SDL_TRUE;
SetWindowPos(hwnd, NULL, x, y, w, h, data->copybits_flag | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE);
data->expected_resize = SDL_FALSE;
} else {
window->w = w;
window->h = h;
}
}
}
#if !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
{
POINT point;
point.x = 0;
point.y = 0;
if (ClientToScreen(hwnd, &point)) {
if (window->flags & SDL_WINDOW_EXTERNAL) {
window->floating.x = window->windowed.x = point.x;
window->floating.y = window->windowed.y = point.y;
}
window->x = point.x;
window->y = point.y;
}
}
WIN_UpdateWindowICCProfile(window, SDL_FALSE);
#endif
{ {
DWORD style = GetWindowLong(hwnd, GWL_STYLE); DWORD style = GetWindowLong(hwnd, GWL_STYLE);
if (style & WS_VISIBLE) { if (style & WS_VISIBLE) {
@@ -461,6 +422,47 @@ static int SetupWindowData(SDL_VideoDevice *_this, SDL_Window *window, HWND hwnd
window->flags &= ~SDL_WINDOW_MINIMIZED; window->flags &= ~SDL_WINDOW_MINIMIZED;
} }
} }
if (!(window->flags & SDL_WINDOW_MINIMIZED)) {
RECT rect;
if (GetClientRect(hwnd, &rect) && !IsRectEmpty(&rect)) {
int w = rect.right;
int h = rect.bottom;
if (window->flags & SDL_WINDOW_EXTERNAL) {
window->floating.w = window->windowed.w = window->w = w;
window->floating.h = window->windowed.h = window->h = h;
} else if ((window->windowed.w && window->windowed.w != w) || (window->windowed.h && window->windowed.h != h)) {
/* We tried to create a window larger than the desktop and Windows didn't allow it. Override! */
int x, y;
/* Figure out what the window area will be */
WIN_AdjustWindowRect(window, &x, &y, &w, &h, SDL_WINDOWRECT_FLOATING);
data->expected_resize = SDL_TRUE;
SetWindowPos(hwnd, NULL, x, y, w, h, data->copybits_flag | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE);
data->expected_resize = SDL_FALSE;
} else {
window->w = w;
window->h = h;
}
}
}
#if !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
if (!(window->flags & SDL_WINDOW_MINIMIZED)) {
POINT point;
point.x = 0;
point.y = 0;
if (ClientToScreen(hwnd, &point)) {
if (window->flags & SDL_WINDOW_EXTERNAL) {
window->floating.x = window->windowed.x = point.x;
window->floating.y = window->windowed.y = point.y;
}
window->x = point.x;
window->y = point.y;
}
}
WIN_UpdateWindowICCProfile(window, SDL_FALSE);
#endif
#if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES) #if defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)
window->flags |= SDL_WINDOW_INPUT_FOCUS; window->flags |= SDL_WINDOW_INPUT_FOCUS;
#else #else
@@ -930,9 +932,13 @@ void WIN_GetWindowSizeInPixels(SDL_VideoDevice *_this, SDL_Window *window, int *
if (GetClientRect(hwnd, &rect) && !WIN_IsRectEmpty(&rect)) { if (GetClientRect(hwnd, &rect) && !WIN_IsRectEmpty(&rect)) {
*w = rect.right; *w = rect.right;
*h = rect.bottom; *h = rect.bottom;
} else { } else if (window->last_pixel_w && window->last_pixel_h) {
*w = window->last_pixel_w; *w = window->last_pixel_w;
*h = window->last_pixel_h; *h = window->last_pixel_h;
} else {
/* Probably created minimized, use the restored size */
*w = window->floating.w;
*h = window->floating.h;
} }
} }