From 3e5c4cec94aeb2dd0afd3e6c2a53210a4ff54b9e Mon Sep 17 00:00:00 2001 From: Boris Gjenero Date: Tue, 13 Sep 2016 00:03:46 -0700 Subject: [PATCH] Mouse events use CSS coordinates, so don't scale by pixel_ratio --- src/video/emscripten/SDL_emscriptenevents.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/video/emscripten/SDL_emscriptenevents.c b/src/video/emscripten/SDL_emscriptenevents.c index 883b599aec5f6..4bb0efba55429 100644 --- a/src/video/emscripten/SDL_emscriptenevents.c +++ b/src/video/emscripten/SDL_emscriptenevents.c @@ -308,8 +308,8 @@ Emscripten_HandleMouseMove(int eventType, const EmscriptenMouseEvent *mouseEvent /* rescale (in case canvas is being scaled)*/ double client_w, client_h, xscale, yscale; emscripten_get_element_css_size(NULL, &client_w, &client_h); - xscale = window_data->window->w / (client_w * window_data->pixel_ratio); - yscale = window_data->window->h / (client_h * window_data->pixel_ratio); + xscale = window_data->window->w / client_w; + yscale = window_data->window->h / client_h; /* check for pointer lock */ int isPointerLockSupported = emscripten_get_pointerlock_status(&pointerlock_status); @@ -371,8 +371,8 @@ Emscripten_HandleMouseFocus(int eventType, const EmscriptenMouseEvent *mouseEven double client_w, client_h; emscripten_get_element_css_size(NULL, &client_w, &client_h); - mx = mx * (window_data->window->w / (client_w * window_data->pixel_ratio)); - my = my * (window_data->window->h / (client_h * window_data->pixel_ratio)); + mx = mx * (window_data->window->w / client_w); + my = my * (window_data->window->h / client_h); SDL_SendMouseMotion(window_data->window, 0, isPointerLocked, mx, my); }