From e06e1bb377146dabe173abe7cd728cc76a3bf0f3 Mon Sep 17 00:00:00 2001 From: luiscuenca Date: Mon, 18 Nov 2019 14:49:35 -0700 Subject: [PATCH] Fix wheel touch interference with mac camera orbit --- .../src/input-plugins/KeyboardMouseDevice.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp index c1e937ac72..5a39781430 100755 --- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp +++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp @@ -128,9 +128,12 @@ void KeyboardMouseDevice::mouseMoveEvent(QMouseEvent* event) { } bool KeyboardMouseDevice::isWheelByTouchPad(QWheelEvent* event) { +#ifdef Q_OS_MAC + return false; +#endif QPoint delta = event->angleDelta(); - int deltaValueX = abs(delta.manhattanLength()); - int deltaValueY = abs(delta.manhattanLength()); + int deltaValueX = abs(delta.x()); + int deltaValueY = abs(delta.y()); const int MAX_WHEEL_DELTA_REPEAT = 20; const int COMMON_WHEEL_DELTA_VALUE = 120; if (deltaValueX != 0) {