From afa31e1df88ef7989846a9e8889fd182d483e667 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 25 Nov 2020 17:16:35 +1100 Subject: [PATCH] timeline: don't flip scroll axes on apple trackpads --- app/widget/timelinewidget/view/timelineview.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp index 841a02b0b..cfd4bd7ce 100644 --- a/app/widget/timelinewidget/view/timelineview.cpp +++ b/app/widget/timelinewidget/view/timelineview.cpp @@ -118,7 +118,8 @@ void TimelineView::wheelEvent(QWheelEvent *event) QPoint angle_delta = event->angleDelta(); - if (Config::Current()["InvertTimelineScrollAxes"].toBool()) { + if (Config::Current()["InvertTimelineScrollAxes"].toBool() // Check if config is set to invert timeline axes + && event->source() != Qt::MouseEventSynthesizedBySystem) { // Never flip axes on Apple trackpads though angle_delta = QPoint(angle_delta.y(), angle_delta.x()); }