encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3453 - First mouse button input after a drag and drop event is ignored 

Olav Sorensen

After a drag and drop event, any following mouse button input (down/up) doesn't generate an event. Clicking any mouse button a *second* time generates an event like it should.

Further investigation shows that the new SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH logic also causes this issue in other cases, like the first time you open the program and click the mouse.
This commit is contained in:
Sam Lantinga 2016-10-14 08:40:21 -07:00
parent 8aab39cb7d
commit d5ddb3cb91
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,20 +401,22 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
minimized = HIWORD(wParam); minimized = HIWORD(wParam);
if (!minimized && (LOWORD(wParam) != WA_INACTIVE)) { if (!minimized && (LOWORD(wParam) != WA_INACTIVE)) {
if (GetAsyncKeyState(VK_LBUTTON)) { if (LOWORD(wParam) == WA_CLICKACTIVE) {
data->focus_click_pending |= SDL_BUTTON_LMASK; if (GetAsyncKeyState(VK_LBUTTON)) {
} data->focus_click_pending |= SDL_BUTTON_LMASK;
if (GetAsyncKeyState(VK_RBUTTON)) { }
data->focus_click_pending |= SDL_BUTTON_RMASK; if (GetAsyncKeyState(VK_RBUTTON)) {
} data->focus_click_pending |= SDL_BUTTON_RMASK;
if (GetAsyncKeyState(VK_MBUTTON)) { }
data->focus_click_pending |= SDL_BUTTON_MMASK; if (GetAsyncKeyState(VK_MBUTTON)) {
} data->focus_click_pending |= SDL_BUTTON_MMASK;
if (GetAsyncKeyState(VK_XBUTTON1)) { }
data->focus_click_pending |= SDL_BUTTON_X1MASK; if (GetAsyncKeyState(VK_XBUTTON1)) {
} data->focus_click_pending |= SDL_BUTTON_X1MASK;
if (GetAsyncKeyState(VK_XBUTTON2)) { }
data->focus_click_pending |= SDL_BUTTON_X2MASK; if (GetAsyncKeyState(VK_XBUTTON2)) {
data->focus_click_pending |= SDL_BUTTON_X2MASK;
}
} }
SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_SHOWN, 0, 0); SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);