From ceaa050a242969907e711a2369a80021a01f36d3 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 6 Jun 2017 12:34:57 -0400
Subject: [PATCH] Change some names in TrackArtist to match terminology in
 TrackPanel

---
 src/TrackArtist.cpp | 36 ++++++++++++++++++------------------
 src/TrackArtist.h   | 10 +++++-----
 src/TrackPanel.cpp  |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp
index 15d856a5d..51ac0e158 100644
--- a/src/TrackArtist.cpp
+++ b/src/TrackArtist.cpp
@@ -266,10 +266,10 @@ int TrackArtist::GetBottom(NoteTrack *t, const wxRect &rect)
 
 TrackArtist::TrackArtist()
 {
-   mInsetLeft   = 0;
-   mInsetTop    = 0;
-   mInsetRight  = 0;
-   mInsetBottom = 0;
+   mMarginLeft   = 0;
+   mMarginTop    = 0;
+   mMarginRight  = 0;
+   mMarginBottom = 0;
 
    mdBrange = ENV_DB_RANGE;
    mShowClipping = false;
@@ -310,12 +310,12 @@ void TrackArtist::SetColours()
    theTheme.SetPenColour(   blankSelectedPen,clrBlankSelected);
 }
 
-void TrackArtist::SetInset(int left, int top, int right, int bottom)
+void TrackArtist::SetMargins(int left, int top, int right, int bottom)
 {
-   mInsetLeft   = left;
-   mInsetTop    = top;
-   mInsetRight  = right;
-   mInsetBottom = bottom;
+   mMarginLeft   = left;
+   mMarginTop    = top;
+   mMarginRight  = right;
+   mMarginBottom = bottom;
 }
 
 void TrackArtist::DrawTracks(TrackList * tracks,
@@ -346,7 +346,7 @@ void TrackArtist::DrawTracks(TrackList * tracks,
 
 #if defined(DEBUG_CLIENT_AREA)
    // Change the +0 to +1 or +2 to see the bounding box
-   mInsetLeft = 1+0; mInsetTop = 5+0; mInsetRight = 6+0; mInsetBottom = 2+0;
+   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));
@@ -408,10 +408,10 @@ void TrackArtist::DrawTracks(TrackList * tracks,
 
       if (stereoTrackRect.Intersects(clip) && reg.Contains(stereoTrackRect)) {
          wxRect rr = trackRect;
-         rr.x += mInsetLeft;
-         rr.y += mInsetTop;
-         rr.width -= (mInsetLeft + mInsetRight);
-         rr.height -= (mInsetTop + mInsetBottom);
+         rr.x += mMarginLeft;
+         rr.y += mMarginTop;
+         rr.width -= (mMarginLeft + mMarginRight);
+         rr.height -= (mMarginTop + mMarginBottom);
          DrawTrack(t, dc, rr,
                    selectedRegion, zoomInfo,
                    drawEnvelope, bigPoints, drawSliders, hasSolo);
@@ -427,10 +427,10 @@ void TrackArtist::DrawTracks(TrackList * tracks,
          t->SetVirtualStereo(true);
          if (stereoTrackRect.Intersects(clip) && reg.Contains(stereoTrackRect)) {
             wxRect rr = trackRect;
-            rr.x += mInsetLeft;
-            rr.y += mInsetTop;
-            rr.width -= (mInsetLeft + mInsetRight);
-            rr.height -= (mInsetTop + mInsetBottom);
+            rr.x += mMarginLeft;
+            rr.y += mMarginTop;
+            rr.width -= (mMarginLeft + mMarginRight);
+            rr.height -= (mMarginTop + mMarginBottom);
             DrawTrack(t, dc, rr, selectedRegion, zoomInfo,
                       drawEnvelope, bigPoints, drawSliders, hasSolo);
          }
diff --git a/src/TrackArtist.h b/src/TrackArtist.h
index 5ca3a190c..3bb0b5a3b 100644
--- a/src/TrackArtist.h
+++ b/src/TrackArtist.h
@@ -68,7 +68,7 @@ class AUDACITY_DLL_API TrackArtist {
 
    void UpdateVRuler(const Track *t, wxRect & rect);
 
-   void SetInset(int left, int top, int right, int bottom);
+   void SetMargins(int left, int top, int right, int bottom);
 
    void UpdatePrefs();
 
@@ -175,10 +175,10 @@ class AUDACITY_DLL_API TrackArtist {
    int  mSampleDisplay;       // "/GUI/SampleView"
    bool mbShowTrackNameInWaveform;  // "/GUI/ShowTrackNameInWaveform"
 
-   int mInsetLeft;
-   int mInsetTop;
-   int mInsetRight;
-   int mInsetBottom;
+   int mMarginLeft;
+   int mMarginTop;
+   int mMarginRight;
+   int mMarginBottom;
 
    wxBrush blankBrush;
    wxBrush unselectedBrush;
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 22034d8f8..05e6572ec 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -512,7 +512,7 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
 
    mTrackArtist = std::make_unique<TrackArtist>();
 
-   mTrackArtist->SetInset(1, kTopMargin, kRightMargin, kBottomMargin);
+   mTrackArtist->SetMargins(1, kTopMargin, kRightMargin, kBottomMargin);
 
    mCapturedTrack = NULL;
    mPopupMenuTarget = NULL;