Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00
Code Issues Releases Wiki Activity

Simplify the track rectangle calculations in TrackArtist

Browse Source
This commit is contained in:
Paul Licameli
2018-10-29 23:37:55 -04:00
parent 49dd6002d3
commit 8d02134d6a
3 changed files with 12 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/TrackPanel.cpp
View File

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