From 916db76052f21c3446de4f33755c422bc32619d5 Mon Sep 17 00:00:00 2001 From: James Crook Date: Mon, 1 Jan 2018 16:17:37 +0000 Subject: [PATCH] Bug 1813 - Vertical Zooming Beartrap Fixed by making 'More vertical zooming' an opt in (rather than opt out) option. Also changed 'More' to 'Advanced' at the same time. --- src/prefs/TracksBehaviorsPrefs.cpp | 4 ++-- .../playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp | 2 +- .../playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp index 462ccc044..8719fc859 100644 --- a/src/prefs/TracksBehaviorsPrefs.cpp +++ b/src/prefs/TracksBehaviorsPrefs.cpp @@ -85,9 +85,9 @@ void TracksBehaviorsPrefs::PopulateOrExchange(ShuttleGui & S) ScrollingPreferenceKey(), ScrollingPreferenceDefault()); #endif - S.TieCheckBox(_("More &vertical zooming"), + S.TieCheckBox(_("Advanced &vertical zooming"), wxT("/GUI/VerticalZooming"), - CFG_DA(!) true); + false); S.AddSpace(10); diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp index a07f75e8f..52f0627cd 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp @@ -243,7 +243,7 @@ UIHandle::Result NoteTrackVZoomHandle::Release bool bVZoom; - gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, CFG_DA(!) true); + gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, false); // Popup menu... if ( diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp index 8d0b79709..9e169533c 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp @@ -41,7 +41,7 @@ bool IsDragZooming(int zoomStart, int zoomEnd) { const int DragThreshold = 3;// Anything over 3 pixels is a drag, else a click. bool bVZoom; - gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, CFG_DA(!) true); + gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, false); return bVZoom && (abs(zoomEnd - zoomStart) > DragThreshold); } @@ -577,7 +577,7 @@ HitTestPreview WaveTrackVZoomHandle::HitPreview(const wxMouseState &state) ::MakeCursor(wxCURSOR_MAGNIFIER, ZoomOutCursorXpm, 19, 15); static wxCursor arrowCursor{ wxCURSOR_ARROW }; bool bVZoom; - gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, CFG_DA(!) true); + gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, false); bVZoom &= !state.RightIsDown(); const auto message = bVZoom ? _("Click to vertically zoom in. Shift-click to zoom out. Drag to specify a zoom region.") : @@ -638,7 +638,7 @@ UIHandle::Result WaveTrackVZoomHandle::Release bool bVZoom; - gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, CFG_DA(!) true); + gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, false); // Popup menu... if (