diff --git a/src/Experimental.h b/src/Experimental.h index 251c972f3..ad135bd6b 100644 --- a/src/Experimental.h +++ b/src/Experimental.h @@ -57,6 +57,16 @@ // DA: Enables dark audacity theme and customisations. //#define EXPERIMENTAL_DA +// These CFG macros allow easy distinction between Audacity and DA defaults. +#ifdef EXPERIMENTAL_DA +#define CFG_A( x ) +#define CFG_DA( x ) x +#else +#define CFG_A( x ) x +#define CFG_DA( x ) +#endif + + // Define this so that sync-lock tiles shine through spectrogram. // The spectrogram pastes a bitmap over the tiles. // This makes it use alpha blending, most transparent where least intense. diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index fe4dac4b6..3c97027fe 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -3499,7 +3499,7 @@ void TrackPanelCellIterator::UpdateRect() } case CellType::VRuler: { - const int kGuard = 8; // 8 pixels to reduce risk of VZooming accidentally + const int kGuard = 5; // 5 pixels to reduce risk of VZooming accidentally mRect.x = kTrackInfoWidth; // Right edge of the VRuler is inactive. mRect.width = mPanel->GetLeftOffset() - mRect.x -kGuard; diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp index 040473238..3df5c2f79 100644 --- a/src/prefs/TracksBehaviorsPrefs.cpp +++ b/src/prefs/TracksBehaviorsPrefs.cpp @@ -87,7 +87,7 @@ void TracksBehaviorsPrefs::PopulateOrExchange(ShuttleGui & S) #endif S.TieCheckBox(_("Enable Vertical Zooming"), wxT("/GUI/VerticalZooming"), - false); + CFG_DA(!) true); S.AddSpace(10); diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp index 0eefcb0b0..460d3bf19 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, false); + gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, CFG_DA(!) true); return bVZoom && (abs(zoomEnd - zoomStart) > DragThreshold); } @@ -607,7 +607,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, false); + gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, CFG_DA(!) true); bVZoom &= !state.RightIsDown(); const auto message = bVZoom ? _("Click to vertically zoom in. Shift-click to zoom out. Drag to specify a zoom region.") : @@ -682,7 +682,7 @@ UIHandle::Result WaveTrackVZoomHandle::Release std::unique_ptr pMenu(PopupMenuTable::BuildMenu(pParent, pTable, &data)); bool bVZoom; - gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, false); + gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, CFG_DA(!) true); // Accelerators only if zooming enabled. if( !bVZoom ) @@ -705,7 +705,7 @@ UIHandle::Result WaveTrackVZoomHandle::Release } else{ bool bVZoom; - gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, false); + gPrefs->Read(wxT("/GUI/VerticalZooming"), &bVZoom, CFG_DA(!) true); // Ignore Capture Lost event bVZoom &= event.GetId() != kCaptureLostEventId; // shiftDown | rightUp | ZoomKind