geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Emscripten: fix duplicate mousebuttonup/mousebuttondown events when touch events are disabled

Sylvain Beucler 2019-01-29 12:14:44 +00:00
parent 1767d09187
commit 2838abb5b2
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -458,6 +458,7 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo
} }
SDL_SendTouch(deviceId, id, SDL_TRUE, x, y, 1.0f); SDL_SendTouch(deviceId, id, SDL_TRUE, x, y, 1.0f);
/* disable browser scrolling/pinch-to-zoom if app handles touch events */
if (!preventDefault && SDL_GetEventState(SDL_FINGERDOWN) == SDL_ENABLE) { if (!preventDefault && SDL_GetEventState(SDL_FINGERDOWN) == SDL_ENABLE) {
preventDefault = 1; preventDefault = 1;
} }
@ -466,10 +467,6 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo
SDL_SendMouseMotion(window_data->window, SDL_TOUCH_MOUSEID, 0, mx, my); SDL_SendMouseMotion(window_data->window, SDL_TOUCH_MOUSEID, 0, mx, my);
} }
SDL_SendTouchMotion(deviceId, id, x, y, 1.0f); SDL_SendTouchMotion(deviceId, id, x, y, 1.0f);
if (!preventDefault && SDL_GetEventState(SDL_FINGERMOTION) == SDL_ENABLE) {
preventDefault = 1;
}
} else { } else {
if ((window_data->finger_touching) && (window_data->first_finger == id)) { if ((window_data->finger_touching) && (window_data->first_finger == id)) {
SDL_SendMouseButton(window_data->window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT); SDL_SendMouseButton(window_data->window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
@ -477,11 +474,10 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo
} }
SDL_SendTouch(deviceId, id, SDL_FALSE, x, y, 1.0f); SDL_SendTouch(deviceId, id, SDL_FALSE, x, y, 1.0f);
if (!preventDefault && SDL_GetEventState(SDL_FINGERUP) == SDL_ENABLE) { /* block browser's simulated mousedown/mouseup on touchscreen devices */
preventDefault = 1; preventDefault = 1;
} }
} }
}
return preventDefault; return preventDefault;
} }