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

windows: don't set focus click pending if SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH is set

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/11976
This commit is contained in:
Sam Lantinga
2025-01-15 10:51:12 -08:00
parent 18d21b36fe
commit fc9b2478d8
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,10 +241,8 @@ static void WIN_CheckWParamMouseButton(Uint64 timestamp, bool bwParamMousePresse
data->focus_click_pending &= ~SDL_BUTTON_MASK(button); data->focus_click_pending &= ~SDL_BUTTON_MASK(button);
WIN_UpdateClipCursor(data->window); WIN_UpdateClipCursor(data->window);
} }
if (WIN_ShouldIgnoreFocusClick(data)) {
return; return;
} }
}
if (bwParamMousePressed && !(mouseFlags & SDL_BUTTON_MASK(button))) { if (bwParamMousePressed && !(mouseFlags & SDL_BUTTON_MASK(button))) {
SDL_SendMouseButton(timestamp, data->window, mouseID, button, true); SDL_SendMouseButton(timestamp, data->window, mouseID, button, true);
@@ -323,7 +321,7 @@ static void WIN_UpdateFocus(SDL_Window *window, bool expect_focus)
if (has_focus) { if (has_focus) {
POINT cursorPos; POINT cursorPos;
if (!(window->flags & SDL_WINDOW_MOUSE_CAPTURE)) { if (WIN_ShouldIgnoreFocusClick(data) && !(window->flags & SDL_WINDOW_MOUSE_CAPTURE)) {
bool swapButtons = GetSystemMetrics(SM_SWAPBUTTON) != 0; bool swapButtons = GetSystemMetrics(SM_SWAPBUTTON) != 0;
if (GetAsyncKeyState(VK_LBUTTON)) { if (GetAsyncKeyState(VK_LBUTTON)) {
data->focus_click_pending |= !swapButtons ? SDL_BUTTON_LMASK : SDL_BUTTON_RMASK; data->focus_click_pending |= !swapButtons ? SDL_BUTTON_LMASK : SDL_BUTTON_RMASK;
@@ -676,10 +674,8 @@ static void WIN_HandleRawMouseInput(Uint64 timestamp, SDL_VideoData *data, HANDL
windowdata->focus_click_pending &= ~SDL_BUTTON_MASK(button); windowdata->focus_click_pending &= ~SDL_BUTTON_MASK(button);
WIN_UpdateClipCursor(window); WIN_UpdateClipCursor(window);
} }
if (WIN_ShouldIgnoreFocusClick(windowdata)) {
continue; continue;
} }
}
SDL_SendMouseButton(timestamp, window, mouseID, button, down); SDL_SendMouseButton(timestamp, window, mouseID, button, down);
} }