Selaa lähdekoodia

emscripten: Fix only one mouse button being usable at a time.

Fixes #15056.

(cherry picked from commit c9591c515cc7f8ded69989b27d31dc1e23a6cf8a)
Ryan C. Gordon 2 viikkoa sitten
vanhempi
commit
42abf69434
1 muutettua tiedostoa jossa 7 lisäystä ja 7 poistoa
  1. 7 7
      src/video/emscripten/SDL_emscriptenevents.c

+ 7 - 7
src/video/emscripten/SDL_emscriptenevents.c

@@ -667,14 +667,14 @@ typedef struct Emscripten_PointerEvent
 static void Emscripten_HandleMouseButton(SDL_WindowData *window_data, const Emscripten_PointerEvent *event)
 {
     Uint8 sdl_button;
-    const bool down = (event->down != 0);
+    bool down = false;
     switch (event->button) {
-        #define CHECK_MOUSE_BUTTON(jsbutton, sdlbutton) case jsbutton: sdl_button = SDL_BUTTON_##sdlbutton; break
-        CHECK_MOUSE_BUTTON(0, LEFT);
-        CHECK_MOUSE_BUTTON(1, MIDDLE);
-        CHECK_MOUSE_BUTTON(2, RIGHT);
-        CHECK_MOUSE_BUTTON(3, X1);
-        CHECK_MOUSE_BUTTON(4, X2);
+        #define CHECK_MOUSE_BUTTON(jsbutton, downflag, sdlbutton) case jsbutton: sdl_button = SDL_BUTTON_##sdlbutton; down = (event->down != 0) || ((event->buttons & downflag) != 0); break
+        CHECK_MOUSE_BUTTON(0, 1, LEFT);
+        CHECK_MOUSE_BUTTON(1, 4, MIDDLE);
+        CHECK_MOUSE_BUTTON(2, 2, RIGHT);
+        CHECK_MOUSE_BUTTON(3, 8, X1);
+        CHECK_MOUSE_BUTTON(4, 16, X2);
         #undef CHECK_MOUSE_BUTTON
         default: sdl_button = 0; break;
     }