Merge pull request #98 from dyharlan/master

dingusdev · web-flow · commit e2e78c068289 · 2024-07-10T07:04:53.000-07:00
Fix keyboard event bug where mouse grab combination won't work if SDL_GetModState
diff --git a/core/hostevents_sdl.cpp b/core/hostevents_sdl.cpp
@@ -56,7 +56,7 @@ void EventManager::poll_events()
         case SDL_KEYUP: {
                 // Internal shortcuts to trigger mouse grab, intentionally not
                 // sent to the host.
-                if (event.key.keysym.sym == SDLK_g && SDL_GetModState() == KMOD_LCTRL) {
+                if (SDL_GetModState() & KMOD_LCTRL && event.key.keysym.sym == SDLK_g) {
                     if (event.type == SDL_KEYUP) {
                         toggle_mouse_grab(event.key);
                     }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ void EventManager::poll_events()`
`56`	`56`	`case SDL_KEYUP: {`
`57`	`57`	`// Internal shortcuts to trigger mouse grab, intentionally not`
`58`	`58`	`// sent to the host.`
`59`		`- if (event.key.keysym.sym == SDLK_g && SDL_GetModState() == KMOD_LCTRL) {`
	`59`	`+ if (SDL_GetModState() & KMOD_LCTRL && event.key.keysym.sym == SDLK_g) {`
`60`	`60`	`if (event.type == SDL_KEYUP) {`
`61`	`61`	`toggle_mouse_grab(event.key);`
`62`	`62`	`}`