Simplify the track rectangle calculations in TrackArtist

src/TrackArtist.cpp

@@ -78,6 +78,7 @@ audio tracks.
 #include "prefs/TracksPrefs.h"
 #include "prefs/WaveformSettings.h"
 #include "Spectrum.h"
+#include "TrackPanel.h"
 #include "ViewInfo.h"
 #include "widgets/Ruler.h"
 #include "Theme.h"
@@ -165,11 +166,6 @@ int TrackArtist::GetBottom(NoteTrack *t, const wxRect &rect)
 
 TrackArtist::TrackArtist()
 {
-   mMarginLeft   = 0;
-   mMarginTop    = 0;
-   mMarginRight  = 0;
-   mMarginBottom = 0;
-
    mdBrange = ENV_DB_RANGE;
    mShowClipping = false;
    mSampleDisplay = 1;// Stem plots by default.
@@ -230,27 +226,20 @@ void TrackArtist::SetColours( int iColorIndex)
    }
 }
 
-void TrackArtist::SetMargins(int left, int top, int right, int bottom)
-{
-   mMarginLeft   = left;
-   mMarginTop    = top;
-   mMarginRight  = right;
-   mMarginBottom = bottom;
-}
-
 void TrackArtist::DrawTracks(TrackPanelDrawingContext &context,
                              const TrackList * tracks,
                              const wxRegion & reg,
-                             const wxRect & rect,
+                             const wxRect & clip, int leftOffset,
-                             const wxRect & clip,
                              const SelectedRegion &selectedRegion,
                              const ZoomInfo &zoomInfo,
                              bool drawEnvelope,
                              bool bigPoints,
                              bool drawSliders)
 {
-   // Copy the horizontal extent of rect; will later change only the vertical.
+   // Fix the horizontal extent; will later change only the vertical extent.
-   wxRect teamRect = rect;
+   wxRect teamRect{
+      clip.x + leftOffset, 0, clip.width - (leftOffset + kRightMargin), 0
+   };
 
    bool hasSolo = false;
    for (const Track *t : *tracks) {
@@ -262,19 +251,6 @@ void TrackArtist::DrawTracks(TrackPanelDrawingContext &context,
       }
    }
 
-#if defined(DEBUG_CLIENT_AREA)
-   // Change the +0 to +1 or +2 to see the bounding box
-   mMarginLeft = 1+0; mMarginTop = 5+0; mMarginRight = 6+0; mMarginBottom = 2+0;
-
-   // This just shows what the passed in rectangles enclose
-   dc.SetPen(wxColour(*wxGREEN));
-   dc.SetBrush(*wxTRANSPARENT_BRUSH);
-   dc.DrawRectangle(rect);
-   dc.SetPen(wxColour(*wxBLUE));
-   dc.SetBrush(*wxTRANSPARENT_BRUSH);
-   dc.DrawRectangle(clip);
-#endif
-
    gPrefs->Read(wxT("/GUI/ShowTrackNameInWaveform"), &mbShowTrackNameInWaveform, false);
 
    for(auto leader : tracks->Leaders()) {
@@ -293,15 +269,6 @@ void TrackArtist::DrawTracks(TrackPanelDrawingContext &context,
          break;
 
       for (auto t : group) {
-#if defined(DEBUG_CLIENT_AREA)
-         // Filled rectangle to show the interior of the client area
-         wxRect zr = trackRect;
-         zr.x+=1; zr.y+=5; zr.width-=7; zr.height-=7;
-         dc.SetPen(*wxCYAN_PEN);
-         dc.SetBrush(*wxRED_BRUSH);
-         dc.DrawRectangle(zr);
-#endif
-
          // For various reasons, the code will break if we display one
          // of a stereo pair of tracks but not the other - for example,
          // if you try to edit the envelope of one track when its linked
@@ -313,10 +280,10 @@ void TrackArtist::DrawTracks(TrackPanelDrawingContext &context,
          if (teamRect.Intersects(clip) && reg.Contains(teamRect)) {
             t = t->SubstitutePendingChangedTrack().get();
             wxRect trackRect {
-               rect.x + mMarginLeft,
+               teamRect.x,
-               t->GetY() - zoomInfo.vpos + mMarginTop,
+               t->GetY() - zoomInfo.vpos + kTopMargin,
-               rect.width - (mMarginLeft + mMarginRight),
+               teamRect.width,
-               t->GetHeight() - (mMarginTop + mMarginBottom)
+               t->GetHeight() - (kTopMargin + kBottomMargin)
             };
             DrawTrack(context, t, trackRect,
                       selectedRegion, zoomInfo,

src/TrackArtist.h

@@ -57,7 +57,7 @@ class AUDACITY_DLL_API TrackArtist {
    void DrawTracks(TrackPanelDrawingContext &context,
                    const TrackList *tracks,
                    const wxRegion & reg,
-                   const wxRect & rect, const wxRect & clip,
+                   const wxRect &clip, int leftOffset,
                    const SelectedRegion &selectedRegion, const ZoomInfo &zoomInfo,
                    bool drawEnvelope, bool bigPoints, bool drawSliders);
 
@@ -73,8 +73,6 @@ class AUDACITY_DLL_API TrackArtist {
 
    void UpdateVRuler(const Track *t, const wxRect & rect);
 
-   void SetMargins(int left, int top, int right, int bottom);
-
    void UpdatePrefs();
 
    void SetBackgroundBrushes(wxBrush unselectedBrushIn, wxBrush selectedBrushIn,
@@ -182,11 +180,6 @@ class AUDACITY_DLL_API TrackArtist {
    int  mSampleDisplay;
    bool mbShowTrackNameInWaveform;  // "/GUI/ShowTrackNameInWaveform"
 
-   int mMarginLeft;
-   int mMarginTop;
-   int mMarginRight;
-   int mMarginBottom;
-
    wxBrush blankBrush;
    wxBrush unselectedBrush;
    wxBrush selectedBrush;

src/TrackPanel.cpp

@@ -242,8 +242,6 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
 
    mTrackArtist = std::make_unique<TrackArtist>();
 
-   mTrackArtist->SetMargins(1, kTopMargin, kRightMargin, kBottomMargin);
-
    mTimeCount = 0;
    mTimer.parent = this;
    // Timer is started after the window is visible
@@ -1053,13 +1051,6 @@ void TrackPanel::DrawTracks(wxDC * dc)
 
    const wxRect clip = GetRect();
 
-   wxRect panelRect = clip;
-   panelRect.y = -mViewInfo->vpos;
-
-   wxRect tracksRect = panelRect;
-   tracksRect.x += GetLabelWidth();
-   tracksRect.width -= GetLabelWidth();
-
    ToolsToolBar *pTtb = mListener->TP_GetToolsToolBar();
    bool bMultiToolDown = pTtb->IsDown(multiTool);
    bool envelopeFlag   = pTtb->IsDown(envelopeTool) || bMultiToolDown;
@@ -1070,7 +1061,7 @@ void TrackPanel::DrawTracks(wxDC * dc)
 
    // The track artist actually draws the stuff inside each track
    mTrackArtist->DrawTracks(context, GetTracks(),
-                            region, tracksRect, clip,
+                            region, clip, GetLeftOffset(),
                             mViewInfo->selectedRegion, *mViewInfo,
                             envelopeFlag, bigPointsFlag, sliderFlag);