1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-25 08:58:06 +02:00

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.
This commit is contained in:
James Crook 2018-01-01 16:17:37 +00:00
parent 26a18679f2
commit 916db76052
3 changed files with 6 additions and 6 deletions

View File

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

View File

@ -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 (

View File

@ -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 (