Skip to content
Permalink
Browse files

Emscripten: fix duplicate mousebuttonup/mousebuttondown events when t…

…ouch events are disabled
  • Loading branch information
Beuc committed Jan 29, 2019
1 parent 1767d09 commit 2838abb5b2d2230a27dd0d216a5a7b62b4a2ff7c
Showing with 3 additions and 7 deletions.
  1. +3 −7 src/video/emscripten/SDL_emscriptenevents.c
@@ -458,6 +458,7 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo
}
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) {
preventDefault = 1;
}
@@ -466,20 +467,15 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo
SDL_SendMouseMotion(window_data->window, SDL_TOUCH_MOUSEID, 0, mx, my);
}
SDL_SendTouchMotion(deviceId, id, x, y, 1.0f);

if (!preventDefault && SDL_GetEventState(SDL_FINGERMOTION) == SDL_ENABLE) {
preventDefault = 1;
}
} else {
if ((window_data->finger_touching) && (window_data->first_finger == id)) {
SDL_SendMouseButton(window_data->window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
window_data->finger_touching = SDL_FALSE;
}
SDL_SendTouch(deviceId, id, SDL_FALSE, x, y, 1.0f);

if (!preventDefault && SDL_GetEventState(SDL_FINGERUP) == SDL_ENABLE) {
preventDefault = 1;
}
/* block browser's simulated mousedown/mouseup on touchscreen devices */
preventDefault = 1;
}
}

0 comments on commit 2838abb

Please sign in to comment.