Pass TrackPanelDrawingContext into TrackPanelDrawable::DrawingArea()

src/CellularPanel.cpp

@@ -1125,7 +1125,8 @@ void CellularPanel::Draw( TrackPanelDrawingContext &context, unsigned nPasses )
       VisitPostorder( [&]( const wxRect &rect, TrackPanelNode &node ) {
 
          // Draw the node
-         const auto newRect = node.DrawingArea( rect, panelRect, iPass );
+         const auto newRect = node.DrawingArea(
+            context, rect, panelRect, iPass );
          if ( newRect.Intersects( panelRect ) )
             node.Draw( context, newRect, iPass );
 
@@ -1134,7 +1135,7 @@ void CellularPanel::Draw( TrackPanelDrawingContext &context, unsigned nPasses )
             auto target = Target();
             if ( target ) {
                const auto targetRect =
-                  target->DrawingArea( rect, panelRect, iPass );
+                  target->DrawingArea( context, rect, panelRect, iPass );
                if ( targetRect.Intersects( panelRect ) )
                   target->Draw( context, targetRect, iPass );
             }

src/TrackPanel.cpp

@@ -1240,6 +1240,7 @@ struct LabeledChannelGroup final : TrackPanelGroup {
    }
 
    wxRect DrawingArea(
+      TrackPanelDrawingContext &,
       const wxRect &rect, const wxRect &, unsigned iPass ) override
    {
       if ( iPass == TrackArtist::PassBorders )
@@ -1393,6 +1394,7 @@ void TrackPanelDrawable::Draw(
 }
 
 wxRect TrackPanelDrawable::DrawingArea(
+   TrackPanelDrawingContext &,
    const wxRect &rect, const wxRect &, unsigned )
 {
    return rect;

src/TrackPanelDrawable.h

@@ -33,7 +33,10 @@ public:
    // hit-test purposes, spilling over into other parts of the partition of the
    // panel area.
    // Default implementation returns rect unchanged.
+   // TrackPanelContext is passed in because sometimes a drawing context is
+   // needed for text extent calculations.
    virtual wxRect DrawingArea(
+      TrackPanelDrawingContext &context,
       const wxRect &rect, const wxRect &panelRect, unsigned iPass );
 
    // Utilities for implementing DrawingArea:

src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp

@@ -372,6 +372,7 @@ void NoteTrackVZoomHandle::Draw(
 }
 
 wxRect NoteTrackVZoomHandle::DrawingArea(
+   TrackPanelDrawingContext &,
    const wxRect &rect, const wxRect &panelRect, unsigned iPass )
 {
    if ( iPass == TrackArtist::PassZooming )

src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h

@@ -61,6 +61,7 @@ private:
       const wxRect &rect, unsigned iPass ) override;
 
    wxRect DrawingArea(
+      TrackPanelDrawingContext &,
       const wxRect &rect, const wxRect &panelRect, unsigned iPass ) override;
 
    std::weak_ptr<NoteTrack> mpTrack;

src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp

@@ -90,6 +90,7 @@ void SpectrumVZoomHandle::Draw(
 }
 
 wxRect SpectrumVZoomHandle::DrawingArea(
+   TrackPanelDrawingContext &,
    const wxRect &rect, const wxRect &panelRect, unsigned iPass )
 {
    return WaveTrackVZoomHandle::DoDrawingArea( rect, panelRect, iPass );

src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h

@@ -62,6 +62,7 @@ private:
       const wxRect &rect, unsigned iPass ) override;
 
    wxRect DrawingArea(
+      TrackPanelDrawingContext &,
       const wxRect &rect, const wxRect &panelRect, unsigned iPass ) override;
 
    std::weak_ptr<WaveTrack> mpTrack;

src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp

@@ -89,6 +89,7 @@ void WaveformVZoomHandle::Draw(
 }
 
 wxRect WaveformVZoomHandle::DrawingArea(
+   TrackPanelDrawingContext &,
    const wxRect &rect, const wxRect &panelRect, unsigned iPass )
 {
    return WaveTrackVZoomHandle::DoDrawingArea( rect, panelRect, iPass );

src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h

@@ -62,6 +62,7 @@ private:
       const wxRect &rect, unsigned iPass ) override;
 
    wxRect DrawingArea(
+      TrackPanelDrawingContext &,
       const wxRect &rect, const wxRect &panelRect, unsigned iPass ) override;
 
    std::weak_ptr<WaveTrack> mpTrack;

src/tracks/ui/BackgroundCell.cpp

@@ -134,6 +134,7 @@ void BackgroundCell::Draw(
 }
 
 wxRect BackgroundCell::DrawingArea(
+   TrackPanelDrawingContext &,
    const wxRect &rect, const wxRect &, unsigned iPass )
 {
    if ( iPass == TrackArtist::PassBackground )

src/tracks/ui/BackgroundCell.h

@@ -51,6 +51,7 @@ private:
       const wxRect &rect, unsigned iPass ) override;
 
    wxRect DrawingArea(
+      TrackPanelDrawingContext &,
       const wxRect &rect, const wxRect &panelRect, unsigned iPass ) override;
    
    AudacityProject *mpProject;

src/tracks/ui/CommonTrackControls.cpp

@@ -401,6 +401,7 @@ void CommonTrackControls::Draw(
 }
 
 wxRect CommonTrackControls::DrawingArea(
+   TrackPanelDrawingContext &,
    const wxRect &rect, const wxRect &, unsigned iPass )
 {
    if ( iPass == TrackArtist::PassControls )

src/tracks/ui/CommonTrackControls.h

@@ -62,6 +62,7 @@ protected:
       const wxRect &rect, unsigned iPass ) override;
 
    wxRect DrawingArea(
+      TrackPanelDrawingContext &,
       const wxRect &rect, const wxRect &panelRect, unsigned iPass ) override;
 
    std::weak_ptr<CloseButtonHandle> mCloseHandle;

src/tracks/ui/SelectHandle.cpp

@@ -1050,6 +1050,7 @@ void SelectHandle::Draw(
 }
 
 wxRect SelectHandle::DrawingArea(
+   TrackPanelDrawingContext &,
    const wxRect &rect, const wxRect &panelRect, unsigned iPass )
 {
    if ( iPass == TrackArtist::PassSnapping )

src/tracks/ui/SelectHandle.h

@@ -121,6 +121,7 @@ private:
       const wxRect &rect, unsigned iPass ) override;
 
    wxRect DrawingArea(
+      TrackPanelDrawingContext &,
       const wxRect &rect, const wxRect &panelRect, unsigned iPass ) override;
 
    //void ResetFreqSelectionPin

src/tracks/ui/TimeShiftHandle.cpp

@@ -863,6 +863,7 @@ void TimeShiftHandle::Draw(
 }
 
 wxRect TimeShiftHandle::DrawingArea(
+   TrackPanelDrawingContext &,
    const wxRect &rect, const wxRect &panelRect, unsigned iPass )
 {
    if ( iPass == TrackArtist::PassSnapping )

src/tracks/ui/TimeShiftHandle.h

@@ -111,6 +111,7 @@ private:
       const wxRect &rect, unsigned iPass ) override;
 
    wxRect DrawingArea(
+      TrackPanelDrawingContext &,
       const wxRect &rect, const wxRect &panelRect, unsigned iPass ) override;
 
    std::shared_ptr<Track> mCapturedTrack;

src/tracks/ui/TrackVRulerControls.cpp

@@ -121,6 +121,7 @@ void TrackVRulerControls::Draw(
 }
 
 wxRect TrackVRulerControls::DrawingArea(
+   TrackPanelDrawingContext &,
    const wxRect &rect, const wxRect &, unsigned iPass )
 {
    // Common area change for all subclasses when drawing the controls

src/tracks/ui/TrackVRulerControls.h

@@ -55,6 +55,7 @@ protected:
       const wxRect &rect, unsigned iPass ) override;
 
    wxRect DrawingArea(
+      TrackPanelDrawingContext &,
       const wxRect &rect, const wxRect &panelRect, unsigned iPass ) override;
 
    Track *GetTrack() const;

src/tracks/ui/ZoomHandle.cpp

@@ -208,6 +208,7 @@ void ZoomHandle::Draw(
 }
 
 wxRect ZoomHandle::DrawingArea(
+   TrackPanelDrawingContext &,
    const wxRect &rect, const wxRect &panelRect, unsigned iPass )
 {
    if ( iPass == TrackArtist::PassZooming )

src/tracks/ui/ZoomHandle.h

@@ -58,6 +58,7 @@ private:
       const wxRect &rect, unsigned iPass ) override;
 
    wxRect DrawingArea(
+      TrackPanelDrawingContext &,
       const wxRect &rect, const wxRect &panelRect, unsigned iPass ) override;
 
    bool IsDragZooming() const;