From 559a9cc1fdd537cc86522cf7e5f62f82cdf80fd2 Mon Sep 17 00:00:00 2001 From: Victor Sergienko Date: Sun, 22 Jul 2018 10:51:52 -0700 Subject: [PATCH] iOS interfering with Mac: Mac touchpad generates touch events too. Ignore them until Macs have a touchscreen: https://forums.libsdl.org/viewtopic.php?p=45758 --- src/gui/core/event/handler.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/core/event/handler.cpp b/src/gui/core/event/handler.cpp index ed4519572305..b429e81d1f02 100644 --- a/src/gui/core/event/handler.cpp +++ b/src/gui/core/event/handler.cpp @@ -380,8 +380,9 @@ void sdl_event_handler::handle_event(const SDL_Event& event) } Uint8 button = event.button.button; +#if defined(__IPHONEOS__) || !defined(__APPLE__) CVideo& video = dynamic_cast(*dispatchers_.back()).video(); - +#endif switch(event.type) { case SDL_MOUSEMOTION: #ifdef MOUSE_TOUCH_EMULATION @@ -477,6 +478,7 @@ void sdl_event_handler::handle_event(const SDL_Event& event) text_editing(event.edit.text, event.edit.start, event.edit.length); break; +#if defined(__IPHONEOS__) || !defined(__APPLE__) case SDL_FINGERMOTION: { SDL_Rect r = video.screen_area(); @@ -506,6 +508,7 @@ void sdl_event_handler::handle_event(const SDL_Event& event) event.mgesture.dTheta, event.mgesture.dDist, event.mgesture.numFingers); } break; +#endif #if(defined(_X11) && !defined(__APPLE__)) || defined(_WIN32) case SDL_SYSWMEVENT: