audacia/audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change some names in TrackArtist to match terminology in TrackPanel

Browse Source
This commit is contained in:
Paul Licameli 2017-06-06 12:34:57 -04:00
parent 24858dcb90
commit ceaa050a24
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/TrackArtist.cpp
View File

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

10
src/TrackArtist.h
View File

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

2
src/TrackPanel.cpp
View File

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