From dbb095a47c0b7bc70ef7326062200c8f2e302901 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 3 Apr 2020 15:11:24 +0200 Subject: [PATCH] Gui: [skip ci] disable workaround to avoid handling an event twice because it leads to a regression on macOS --- src/Gui/Quarter/QuarterWidget.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Gui/Quarter/QuarterWidget.cpp b/src/Gui/Quarter/QuarterWidget.cpp index 87ab74e4e7..b76266b0b7 100644 --- a/src/Gui/Quarter/QuarterWidget.cpp +++ b/src/Gui/Quarter/QuarterWidget.cpp @@ -1002,10 +1002,17 @@ bool QuarterWidget::viewportEvent(QEvent* event) bool ok = QGraphicsView::viewportEvent(event); // Avoid that wheel events are handled twice // https://forum.freecadweb.org/viewtopic.php?f=3&t=44822 + // However, this workaround seems to cause a regression on macOS + // so it's disabled for this platform. + // https://forum.freecadweb.org/viewtopic.php?f=4&t=44855 +#if defined(Q_OS_MAC) + Q_UNUSED(ok) +#else if (event->type() == QEvent::Wheel) { event->setAccepted(ok); return ok; } +#endif return false; } }