From 2217d1646e8726d9ac62999edeff378cd6443fff Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Thu, 27 Aug 2015 11:56:02 -0400 Subject: [PATCH] reassign modifier keys for vruler mousewheel --- src/TrackPanel.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 80c199a74..5a2c2ab9e 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -6267,8 +6267,10 @@ void TrackPanel::HandleWheelRotationInVRuler { if (pTrack->GetKind() == Track::Wave) { WaveTrack *const wt = static_cast(pTrack); - if (event.CmdDown() && - wt->GetWaveformSettings().scaleType == WaveformSettings::stLogarithmic) { + const bool isDB = + wt->GetDisplay() == WaveTrack::Waveform && + wt->GetWaveformSettings().scaleType == WaveformSettings::stLogarithmic; + if (isDB && event.ShiftDown()) { // Vary the bottom of the dB scale, but only if the midline is visible float min, max; wt->GetDisplayBounds(&min, &max); @@ -6293,12 +6295,15 @@ void TrackPanel::HandleWheelRotationInVRuler else return; } - else { + else if (event.CmdDown()) { HandleWaveTrackVZoom( mTracks, rect, event.m_y, event.m_y, wt, false, (event.m_wheelRotation < 0), true); } + else + return; + UpdateVRuler(pTrack); Refresh(false); MakeParentModifyState(true);