Fix waveform zooming

Fixes mixxxdj#11626
ywwg · Jun 12, 2023 · 0ee20f8 · 0ee20f8
1 parent 5e06563
commit 0ee20f8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/src/waveform/widgets/allshader/waveformwidget.cpp b/src/waveform/widgets/allshader/waveformwidget.cpp
@@ -1,5 +1,7 @@
 #include "waveform/widgets/allshader/waveformwidget.h"
 
+#include <QApplication>
+
 #include "moc_waveformwidget.cpp"
 #include "waveform/renderers/allshader/waveformrendererabstract.h"
 
@@ -52,3 +54,8 @@ void WaveformWidget::resizeGL(int w, int h) {
         renderer->allshaderWaveformRenderer()->resizeGL(w, h);
     }
 }
+
+void WaveformWidget::wheelEvent(QWheelEvent* event) {
+    QApplication::sendEvent(parentWidget(), event);
+    event->accept();
+}
diff --git a/src/waveform/widgets/allshader/waveformwidget.h b/src/waveform/widgets/allshader/waveformwidget.h
@@ -26,4 +26,5 @@ class allshader::WaveformWidget : public ::WGLWidget,
     }
 
   private:
+    void wheelEvent(QWheelEvent* event) override;
 };
diff --git a/src/waveform/widgets/glwaveformwidgetabstract.cpp b/src/waveform/widgets/glwaveformwidgetabstract.cpp
@@ -1,6 +1,13 @@
 #include "waveform/widgets/glwaveformwidgetabstract.h"
 
+#include <QApplication>
+
 GLWaveformWidgetAbstract::GLWaveformWidgetAbstract(const QString& group, QWidget* parent)
         : WaveformWidgetAbstract(group),
           WGLWidget(parent) {
 }
+
+void GLWaveformWidgetAbstract::wheelEvent(QWheelEvent* event) {
+    QApplication::sendEvent(parentWidget(), event);
+    event->accept();
+}
diff --git a/src/waveform/widgets/glwaveformwidgetabstract.h b/src/waveform/widgets/glwaveformwidgetabstract.h
@@ -41,4 +41,7 @@ class GLWaveformWidgetAbstract : public WaveformWidgetAbstract, public WGLWidget
     }
 
 #endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
+
+  private:
+    void wheelEvent(QWheelEvent* event) override;
 };
diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp
@@ -187,7 +187,7 @@ void WWaveformViewer::wheelEvent(QWheelEvent* event) {
     if (m_waveformWidget) {
         if (event->angleDelta().y() > 0) {
             onZoomChange(m_waveformWidget->getZoomFactor() / 1.05);
-        } else {
+        } else if (event->angleDelta().y() < 0) {
             onZoomChange(m_waveformWidget->getZoomFactor() * 1.05);
         }
     }