From 18d97e9f7394313aeb8328b5cc916f580fdafd2d Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 2 Oct 2018 20:11:13 -0700 Subject: [PATCH] Fix errant touch events on macOS --- app/streaming/session.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp index 0bd06af7..93eadf6a 100644 --- a/app/streaming/session.cpp +++ b/app/streaming/session.cpp @@ -1113,11 +1113,17 @@ void Session::exec(int displayOriginX, int displayOriginY) case SDL_JOYDEVICEADDED: inputHandler.handleJoystickArrivalEvent(&event.jdevice); break; + + // SDL2 sends touch events from trackpads by default on + // macOS. This totally screws our actual mouse handling, + // so we must explicitly ignore touch events on macOS. +#ifndef Q_OS_DARWIN case SDL_FINGERDOWN: case SDL_FINGERMOTION: case SDL_FINGERUP: inputHandler.handleTouchFingerEvent(&event.tfinger); break; +#endif } }