From ad73106428c752fd82121852c7abdf60e3e48d76 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sun, 11 Aug 2024 18:24:11 -0400 Subject: [PATCH] Refactor mouseWheelZoom scroll toggle logic. --- src/app/RackScrollWidget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/RackScrollWidget.cpp b/src/app/RackScrollWidget.cpp index 52cf4179..2f4216dc 100644 --- a/src/app/RackScrollWidget.cpp +++ b/src/app/RackScrollWidget.cpp @@ -155,7 +155,11 @@ void RackScrollWidget::onHoverKey(const HoverKeyEvent& e) { void RackScrollWidget::onHoverScroll(const HoverScrollEvent& e) { int mods = APP->window->getMods(); - if ((mods & RACK_MOD_MASK) == (settings::mouseWheelZoom ? 0 : RACK_MOD_CTRL)) { + bool doZoom = mods & RACK_MOD_CTRL; + if (settings::mouseWheelZoom) + doZoom ^= true; + + if (doZoom) { // Dispatch to children first and zoom only if they don't consume OpaqueWidget::onHoverScroll(e); if (e.isConsumed())