Natural, smooth and zoom-relative scrolling

include/AutomationEditor.h

@@ -180,8 +180,6 @@ protected slots:
 	ComboBoxModel m_zoomingYModel;
 	ComboBoxModel m_quantizeModel;
 
-	static const QVector<float> m_zoomXLevels;
-
 	FloatModel * m_tensionModel;
 
 	AutomationClip * m_clip;

include/PianoView.h

@@ -64,6 +64,7 @@ class PianoView : public QWidget, public ModelView
 	void focusOutEvent( QFocusEvent * _fe ) override;
 	void focusInEvent( QFocusEvent * fe ) override;
 	void resizeEvent( QResizeEvent * _event ) override;
+	void wheelEvent(QWheelEvent* we) override;
 
 
 private:

include/ScrollHelpers.h

@@ -0,0 +1,81 @@
+/*
+ * ScrollHelpers.h - helper functions for wheel events
+ *
+ * Copyright (c) 2023 Alex <allejok96/gmail>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef SCROLL_HELPERS_H
+#define SCROLL_HELPERS_H
+
+#include <Qt>
+
+#include "lmms_export.h"
+
+class QWheelEvent;
+
+
+namespace lmms {
+
+
+/*! \brief Mark event as ignored and return true if it matches the orientation
+ *
+ *  Convenience function that may be used for early return in wheelEvent.
+ *  Events that doesn't match the orientation are marked accepted.
+ */
+bool LMMS_EXPORT ignoreScroll(const Qt::Orientation orientation, QWheelEvent* event);
+
+
+
+/*! \brief Return number of scrolled steps.
+ *
+ *  By default it counts standard scroll wheel steps of 15°.
+ *
+ *  If you intend to round or divide WheelEvent::angleDelta() this function should ALWAYS be used to get proper
+ *  support for smooth scrolling mice and trackpads.
+ *
+ *  Only call this function ONCE per event and orientation. Never call it if the event will be ignored.
+ *
+ *  \param event - QWheelEvent to get delta value from.
+ *  \param orientation - Vertical or horizontal.
+ *  \param factor - Scroll speed/precision. If factor=2 it returns 2 for a complete step and 1 for a halfstep.
+ *  \param allowNatural - Whether macOS-style natural scroll should be allowed or inverted to regular scroll.
+ */
+int LMMS_EXPORT getScroll(const QWheelEvent* event, const Qt::Orientation orientation, const float factor,
+	const bool allowNatural);
+
+
+/*! \brief Overload of getScroll
+ *
+ * Returns a positive value if the top of the wheel is moved to the left
+ */
+int LMMS_EXPORT horizontalScroll(const QWheelEvent* event, const float factor = 1, const bool allowNatural = true);
+
+
+/*! \brief Overload of getScroll
+ *
+ *  Returns a positive value if the top of the wheel is rotating away from the hand operating it
+ */
+int LMMS_EXPORT verticalScroll(const QWheelEvent* event, const float factor = 1, const bool allowNatural = true);
+
+
+} // namespace lmms
+
+#endif

include/SubWindow.h

@@ -37,6 +37,7 @@ class QLabel;
 class QMoveEvent;
 class QPushButton;
 class QResizeEvent;
+class QWheelEvent;
 class QWidget;
 
 namespace lmms::gui
@@ -75,6 +76,7 @@ class LMMS_EXPORT SubWindow : public QMdiSubWindow
 	void resizeEvent( QResizeEvent * event ) override;
 	void paintEvent( QPaintEvent * pe ) override;
 	void changeEvent( QEvent * event ) override;
+	void wheelEvent(QWheelEvent* event) override;
 
 signals:
 	void focusLost();

plugins/AudioFileProcessor/AudioFileProcessor.cpp

@@ -40,6 +40,7 @@
 #include "NotePlayHandle.h"
 #include "PathUtil.h"
 #include "PixmapButton.h"
+#include "ScrollHelpers.h"
 #include "Song.h"
 #include "StringPairDrag.h"
 #include "Clipboard.h"
@@ -864,9 +865,14 @@ void AudioFileProcessorWaveView::mouseMoveEvent( QMouseEvent * _me )
 
 
 
-void AudioFileProcessorWaveView::wheelEvent( QWheelEvent * _we )
+void AudioFileProcessorWaveView::wheelEvent(QWheelEvent* we)
 {
-	zoom( _we->angleDelta().y() > 0 );
+	if (ignoreScroll(Qt::Horizontal, we)) { return; }
+
+	int steps = verticalScroll(we);
+	if (steps == 0) { return; }
+
+	zoom(steps < 0);
 	update();
 }
 

plugins/Compressor/CompressorControlDialog.cpp

@@ -38,6 +38,7 @@
 #include "Knob.h"
 #include "MainWindow.h"
 #include "PixmapButton.h"
+#include "ScrollHelpers.h"
 
 namespace lmms::gui
 {
@@ -646,8 +647,10 @@ void CompressorControlDialog::resizeEvent(QResizeEvent *event)
 
 void CompressorControlDialog::wheelEvent(QWheelEvent * event)
 {
+	if (ignoreScroll(Qt::Horizontal, event)) { return; }
+
 	const float temp = m_dbRange;
-	const float dbRangeNew = m_dbRange - copysignf(COMP_GRID_SPACING, event->angleDelta().y());
+	const float dbRangeNew = m_dbRange - COMP_GRID_SPACING * verticalScroll(event);
 	m_dbRange = round(qBound(COMP_GRID_SPACING, dbRangeNew, COMP_GRID_MAX) / COMP_GRID_SPACING) * COMP_GRID_SPACING;
 
 	// Only reset view if the scolling had an effect
@@ -768,4 +771,4 @@ void CompressorControlDialog::resetCompressorView()
 }
 
 
-} // namespace lmms::gui
+} // namespace lmms::gui

plugins/Eq/EqCurve.cpp

@@ -570,43 +570,19 @@ void EqHandle::mouseReleaseEvent( QGraphicsSceneMouseEvent *event )
 
 void EqHandle::wheelEvent( QGraphicsSceneWheelEvent *wevent )
 {
-	float highestBandwich;
-	if( m_type != para )
-	{
-		highestBandwich = 10;
-	}
-	else
-	{
-		highestBandwich = 4;
-	}
+	wevent->setAccepted(wevent->orientation() == Qt::Vertical);
+	if (!wevent->isAccepted()) { return; }
 
-	int numDegrees = wevent->delta() / 120;
-	float numSteps = 0;
-	if( wevent->modifiers() == Qt::ControlModifier )
-	{
-		numSteps = numDegrees * 0.01;
-	}
-	else
-	{
-		 numSteps = numDegrees * 0.15;
-	}
+	float highestBandwidth = m_type != para ? 10 : 4;
 
-	if( wevent->orientation() == Qt::Vertical )
-	{
-		m_resonance = m_resonance + ( numSteps );
+	// TODO check inverted() for natural scrolling when made available
 
-		if( m_resonance < 0.1 )
-		{
-			m_resonance = 0.1;
-		}
+	float wheelStepDelta = 120; // Qt unit
+	float changePerStep = wevent->modifiers() & Qt::ControlModifier ? 0.01f : 0.15f;
+	float change = wevent->delta() / wheelStepDelta * changePerStep;
 
-		if( m_resonance > highestBandwich )
-		{
-			m_resonance = highestBandwich;
-		}
-		emit positionChanged();
-	}
-	wevent->accept();
+	m_resonance = std::clamp(m_resonance + change, 0.1f, highestBandwidth);
+	emit positionChanged();
 }
 
 

plugins/Vectorscope/VectorView.cpp

@@ -31,6 +31,7 @@
 #include "ColorChooser.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
+#include "ScrollHelpers.h"
 #include "VecControls.h"
 
 namespace lmms::gui
@@ -318,10 +319,12 @@ void VectorView::mouseDoubleClickEvent(QMouseEvent *event)
 // Change zoom level using the mouse wheel
 void VectorView::wheelEvent(QWheelEvent *event)
 {
+	if (ignoreScroll(Qt::Horizontal, event)) { return; }
+
 	// Go through integers to avoid accumulating errors
 	const unsigned short old_zoom = round(100 * m_zoom);
 	// Min-max bounds are 20 and 1000 %, step for 15°-increment mouse wheel is 20 %
-	const unsigned short new_zoom = qBound(20, old_zoom + event->angleDelta().y() / 6, 1000);
+	const unsigned short new_zoom = qBound(20, old_zoom + verticalScroll(event, 20), 1000);
 	m_zoom = new_zoom / 100.f;
 	event->accept();
 	m_zoomTimestamp = std::chrono::duration_cast<std::chrono::milliseconds>
@@ -332,4 +335,4 @@ void VectorView::wheelEvent(QWheelEvent *event)
 }
 
 
-} // namespace lmms::gui
+} // namespace lmms::gui

src/gui/CMakeLists.txt

@@ -34,6 +34,7 @@ SET(LMMS_SRCS
 	gui/ProjectNotes.cpp
 	gui/RowTableView.cpp
 	gui/SampleTrackWindow.cpp
+	gui/ScrollHelpers.cpp
 	gui/SendButtonIndicator.cpp
 	gui/SideBar.cpp
 	gui/SideBarWidget.cpp

src/gui/ScrollHelpers.cpp

@@ -0,0 +1,90 @@
+/*
+ * ScrollHelpers.cpp - helper functions for wheel events
+ *
+ * Copyright (c) 2023 Alex <allejok96/gmail>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include "ScrollHelpers.h"
+
+#include <QWheelEvent>
+
+
+namespace lmms {
+
+
+bool ignoreScroll(const Qt::Orientation orientation, QWheelEvent* event)
+{
+	bool hasOtherOrientation = orientation == Qt::Horizontal ? event->angleDelta().y() : event->angleDelta().x();
+	event->setAccepted(hasOtherOrientation);
+	return !hasOtherOrientation;
+}
+
+
+
+
+// TODO: is there a good way to prevent calling this method multiple times with the same event?
+int getScroll(const QWheelEvent* event, const Qt::Orientation orientation, const float factor, const bool allowNatural)
+{
+	static int xRemainder;
+	static int yRemainder;
+
+	int& remainder = orientation == Qt::Horizontal ? xRemainder : yRemainder;
+
+	int delta = orientation == Qt::Horizontal ? event->angleDelta().x() : event->angleDelta().y();
+	if (event->inverted() && !allowNatural)
+	{
+		delta = -delta;
+	}
+
+	// If the wheel changed direction forget the accumulated value
+	if (delta * remainder < 0) { remainder = 0; }
+
+	// A normal scroll wheel click is 15° and Qt counts angle delta in 1/8 of a degree
+	const float deltaPerWheelTick = 120;
+	// Angle delta needed to scroll one step (never more than 15°)
+	const float deltaPerStep = deltaPerWheelTick / std::max(1.0f, factor);
+
+	// Summarize, return whole steps and keep what's left
+	remainder += delta;
+	int steps = remainder / deltaPerStep;
+	remainder -= steps * deltaPerStep;
+
+	return steps;
+}
+
+
+
+
+int horizontalScroll(const QWheelEvent* event, const float factor, const bool allowNatural)
+{
+	return getScroll(event, Qt::Horizontal, factor, allowNatural);
+}
+
+
+
+
+int verticalScroll(const QWheelEvent* event, const float factor, const bool allowNatural)
+{
+	return getScroll(event, Qt::Vertical, factor, allowNatural);
+}
+
+
+} // namespace lmms

src/gui/SubWindow.cpp

@@ -382,4 +382,18 @@ void SubWindow::resizeEvent( QResizeEvent * event )
 }
 
 
-} // namespace lmms::gui
+
+
+/**
+ * @brief SubWindow::wheelEvent
+ *
+ *  Capture all WheelEvents that we receive directly or from our subwidgets.
+ *  Don't let them propagate up further to the MDI area.
+ */
+void SubWindow::wheelEvent(QWheelEvent* event)
+{
+	event->accept();
+}
+
+
+} // namespace lmms::gui