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

Emscripten: Fixed handling of deactivated mouse events. 

SDL_GetEventState() was called with a button state instead of an event type.
This commit is contained in:
Philipp Wiesemann 2016-11-18 00:05:28 +01:00
parent 32cb34945e
commit c345126266
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/video/emscripten/SDL_emscriptenevents.c
View File

@ -336,7 +336,10 @@ EM_BOOL
Emscripten_HandleMouseButton(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData)
{
SDL_WindowData *window_data = userData;
uint32_t sdl_button;
Uint8 sdl_button;
Uint8 sdl_button_state;
SDL_EventType sdl_event_type;
switch (mouseEvent->button) {
case 0:
sdl_button = SDL_BUTTON_LEFT;
@ -351,8 +354,14 @@ Emscripten_HandleMouseButton(int eventType, const EmscriptenMouseEvent *mouseEve
return 0;
}
SDL_EventType sdl_event_type = (eventType == EMSCRIPTEN_EVENT_MOUSEDOWN ? SDL_PRESSED : SDL_RELEASED);
SDL_SendMouseButton(window_data->window, 0, sdl_event_type, sdl_button);
if (eventType == EMSCRIPTEN_EVENT_MOUSEDOWN) {
sdl_button_state = SDL_PRESSED;
sdl_event_type = SDL_MOUSEBUTTONDOWN;
} else {
sdl_button_state = SDL_RELEASED;
sdl_event_type = SDL_MOUSEBUTTONUP;
}
SDL_SendMouseButton(window_data->window, 0, sdl_button_state, sdl_button);
return SDL_GetEventState(sdl_event_type) == SDL_ENABLE;
}