From 702c256c879fa6926208421f56ea8a549148ce00 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Mon, 16 Apr 2018 11:05:57 +0300
Subject: [PATCH] Fixing issue #831. macOS touchpad gestures glitching.

--HG--
branch : develop
---
 src/libs/vwidgets/vmaingraphicsview.cpp | 43 ++++++++++++++-----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp
index 18f058e0a..12d2d6fc5 100644
--- a/src/libs/vwidgets/vmaingraphicsview.cpp
+++ b/src/libs/vwidgets/vmaingraphicsview.cpp
@@ -220,27 +220,32 @@ bool GraphicsViewZoom::eventFilter(QObject *object, QEvent *event)
     }
     else if (event->type() == QEvent::Wheel)
     {
-        QWheelEvent* wheel_event = static_cast<QWheelEvent*>(event);
-        SCASSERT(wheel_event != nullptr)
-        if (QGuiApplication::keyboardModifiers() == _modifiers)
+        if (QWheelEvent* wheel_event = static_cast<QWheelEvent*>(event))
         {
             if (wheel_event->orientation() == Qt::Vertical)
             {
-                const double angle = wheel_event->angleDelta().y();
-                const double factor = qPow(_zoom_factor_base, angle);
-                gentle_zoom(factor);
-                return true;
-            }
-        }
-        else
-        {
-            if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier)
-            {
-                return StartHorizontalScrollings(wheel_event);
+                if (QGuiApplication::keyboardModifiers() == _modifiers)
+                {
+                    gentle_zoom(qPow(_zoom_factor_base, wheel_event->angleDelta().y()));
+                    return true;
+                }
+                else if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier)
+                {
+                    return StartHorizontalScrollings(wheel_event);
+                }
+                else
+                {
+                    return StartVerticalScrollings(wheel_event);
+                }
             }
             else
             {
-                return StartVerticalScrollings(wheel_event);
+                if (QGuiApplication::keyboardModifiers() == _modifiers)
+                {
+                    return true; //ignore
+                }
+
+                return StartHorizontalScrollings(wheel_event);
             }
         }
     }
@@ -289,11 +294,11 @@ bool GraphicsViewZoom::StartVerticalScrollings(QWheelEvent *wheel_event)
 
     if (not numPixels.isNull())
     {
-        numSteps = numPixels.y();
+        numSteps = wheel_event->orientation() == Qt::Vertical ? numPixels.y() : numPixels.x();
     }
     else if (not numDegrees.isNull())
     {
-        numSteps = numDegrees.y() / 15;
+        numSteps = (wheel_event->orientation() == Qt::Vertical ? numDegrees.y() : numDegrees.x()) / 15;
     }
     else
     {
@@ -324,11 +329,11 @@ bool GraphicsViewZoom::StartHorizontalScrollings(QWheelEvent *wheel_event)
 
     if (not numPixels.isNull())
     {
-        numSteps = numPixels.y();
+        numSteps = wheel_event->orientation() == Qt::Vertical ? numPixels.y() : numPixels.x();
     }
     else if (not numDegrees.isNull())
     {
-        numSteps = numDegrees.y() / 15;
+        numSteps = (wheel_event->orientation() == Qt::Vertical ? numDegrees.y() : numDegrees.x()) / 15;
     }
     else
     {