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

Fix passing of child window focus in WIN_ShowWindow/WIN_RaiseWindow

Browse Source 
Keyboard focus was being passed to the child window being shown if SDL_HINT_WINDOW_ACTIVATE_WHEN_SHOWN is false and keyboard focus was not being passed to the child window being activated in WIN_RaiseWindow.
This commit is contained in:
Sam Lantinga
2023-07-06 18:14:34 -07:00
parent 565e95ac4e
commit c5bd2cba98
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -859,10 +859,11 @@ void WIN_ShowWindow(SDL_VideoDevice *_this, SDL_Window *window)
style = GetWindowLong(hwnd, GWL_EXSTYLE); style = GetWindowLong(hwnd, GWL_EXSTYLE);
if (style & WS_EX_NOACTIVATE) { if (style & WS_EX_NOACTIVATE) {
nCmdShow = SW_SHOWNOACTIVATE; nCmdShow = SW_SHOWNOACTIVATE;
bActivate = SDL_FALSE;
} }
ShowWindow(hwnd, nCmdShow); ShowWindow(hwnd, nCmdShow);
if (window->flags & SDL_WINDOW_POPUP_MENU) { if (window->flags & SDL_WINDOW_POPUP_MENU && bActivate) {
if (window->parent == SDL_GetKeyboardFocus()) { if (window->parent == SDL_GetKeyboardFocus()) {
WIN_SetKeyboardFocus(window); WIN_SetKeyboardFocus(window);
} }
@@ -922,6 +923,11 @@ void WIN_RaiseWindow(SDL_VideoDevice *_this, SDL_Window *window)
} }
if (bActivate) { if (bActivate) {
SetForegroundWindow(hwnd); SetForegroundWindow(hwnd);
if (window->flags & SDL_WINDOW_POPUP_MENU) {
if (window->parent == SDL_GetKeyboardFocus()) {
WIN_SetKeyboardFocus(window);
}
}
} else { } else {
SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, data->copybits_flag | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER | SWP_NOACTIVATE); SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, data->copybits_flag | SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER | SWP_NOACTIVATE);
} }