Fix waveform zooming

Fixes mixxxdj#11626
ywwg · Jun 11, 2023 · c357a82 · c357a82
1 parent 5e06563
commit c357a82
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/widget/wglwidgetqopengl.cpp b/src/widget/wglwidgetqopengl.cpp
@@ -1,3 +1,4 @@
+#include <QApplication>
 #include <QResizeEvent>
 
 #include "widget/openglwindow.h"
@@ -54,6 +55,11 @@ void WGLWidget::resizeEvent(QResizeEvent* event) {
     QWidget::resizeEvent(event);
 }
 
+void WGLWidget::wheelEvent(QWheelEvent* event) {
+    QApplication::sendEvent(parentWidget(), event);
+    event->accept();
+}
+
 bool WGLWidget::isContextValid() const {
     return m_pOpenGLWindow && m_pOpenGLWindow->context() && m_pOpenGLWindow->context()->isValid();
 }

diff --git a/src/widget/wglwidgetqopengl.h b/src/widget/wglwidgetqopengl.h
@@ -41,6 +41,7 @@ class WGLWidget : public QWidget {
   protected:
     void showEvent(QShowEvent* event) override;
     void resizeEvent(QResizeEvent* event) override;
+    void wheelEvent(QWheelEvent* event) override;
 
     QPaintDevice* paintDevice();
 

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);
         }
     }