Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-02 15:47:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed always on top windows on Windows

Browse Source 
Also cleaned up some SetWindowPos() calls and made it explicit when we change the topmost flag
This commit is contained in:
Sam Lantinga
2023-03-17 10:36:43 -07:00
parent 4a6528e3f0
commit 08d5c1386e
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/video/windows/SDL_windowswindow.c
+11 -9
View File
@@ -391,7 +391,7 @@ static int SetupWindowData(_THIS, SDL_Window *window, HWND hwnd, HWND parent, SD
/* Figure out what the window area will be */ /* Figure out what the window area will be */
WIN_AdjustWindowRect(window, &x, &y, &w, &h, SDL_FALSE); WIN_AdjustWindowRect(window, &x, &y, &w, &h, SDL_FALSE);
data->expected_resize = SDL_TRUE; data->expected_resize = SDL_TRUE;
SetWindowPos(hwnd, HWND_NOTOPMOST, x, y, w, h, data->copybits_flag | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE); SetWindowPos(hwnd, NULL, x, y, w, h, data->copybits_flag | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE);
data->expected_resize = SDL_FALSE; data->expected_resize = SDL_FALSE;
} else { } else {
window->w = w; window->w = w;
@@ -458,6 +458,12 @@ static int SetupWindowData(_THIS, SDL_Window *window, HWND hwnd, HWND parent, SD
} }
#endif #endif
if (window->flags & SDL_WINDOW_ALWAYS_ON_TOP) {
WIN_SetWindowAlwaysOnTop(_this, window, SDL_TRUE);
} else {
WIN_SetWindowAlwaysOnTop(_this, window, SDL_FALSE);
}
#if !defined(__XBOXONE__) && !defined(__XBOXSERIES__) #if !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
/* Enable multi-touch */ /* Enable multi-touch */
if (videodata->RegisterTouchWindow) { if (videodata->RegisterTouchWindow) {
@@ -891,7 +897,7 @@ void WIN_ShowWindow(_THIS, SDL_Window *window)
if (window->parent) { if (window->parent) {
/* Update our position in case our parent moved while we were hidden */ /* Update our position in case our parent moved while we were hidden */
WIN_SetWindowPositionInternal(window, window->driverdata->copybits_flag | SWP_NOACTIVATE); WIN_SetWindowPosition(_this, window);
} }
hwnd = window->driverdata->hwnd; hwnd = window->driverdata->hwnd;
@@ -954,8 +960,10 @@ void WIN_RaiseWindow(_THIS, SDL_Window *window)
ShowWindow(hwnd, SW_RESTORE); ShowWindow(hwnd, SW_RESTORE);
AttachThreadInput(dwCurID, dwMyID, TRUE); AttachThreadInput(dwCurID, dwMyID, TRUE);
SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
if (!SDL_ShouldAllowTopmost() || !(window->flags & SDL_WINDOW_ALWAYS_ON_TOP)) {
SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
} }
}
SetForegroundWindow(hwnd); SetForegroundWindow(hwnd);
if (bForce) { if (bForce) {
AttachThreadInput(dwCurID, dwMyID, FALSE); AttachThreadInput(dwCurID, dwMyID, FALSE);
@@ -1011,13 +1019,7 @@ void WIN_SetWindowResizable(_THIS, SDL_Window *window, SDL_bool resizable)
void WIN_SetWindowAlwaysOnTop(_THIS, SDL_Window *window, SDL_bool on_top) void WIN_SetWindowAlwaysOnTop(_THIS, SDL_Window *window, SDL_bool on_top)
{ {
SDL_WindowData *data = window->driverdata; WIN_SetWindowPositionInternal(window, SWP_NOMOVE | SWP_NOSIZE);
HWND hwnd = data->hwnd;
if (on_top) {
SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
} else {
SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
}
} }
void WIN_RestoreWindow(_THIS, SDL_Window *window) void WIN_RestoreWindow(_THIS, SDL_Window *window)