From 52017948d1f7d13fa1b71df33a66aeecc58124b9 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 5 Jun 2017 18:16:55 -0400 Subject: [PATCH] Remove argument of DrawOutside that is no longer used... ... This only was a source of confusions. --- src/TrackPanel.cpp | 13 ++++++------- src/TrackPanel.h | 3 +-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 66fd2ca04..65d12a1fe 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -7294,16 +7294,16 @@ void TrackPanel::DrawEverythingElse(wxDC * dc, // (and thus would have been skipped by VisibleTrackIterator) we need to // draw that track's border instead. Track *borderTrack = t; - wxRect borderRect = rect, borderTrackRect = trackRect; + wxRect borderRect = rect; if (l && !t->GetLinked() && trackRect.y < 0) { borderTrack = l; - borderTrackRect.y = l->GetY() - mViewInfo->vpos; - borderTrackRect.height = l->GetHeight(); + borderRect = trackRect; + borderRect.y = l->GetY() - mViewInfo->vpos; + borderRect.height = l->GetHeight(); - borderRect = borderTrackRect; borderRect.height += t->GetHeight(); } @@ -7311,7 +7311,7 @@ void TrackPanel::DrawEverythingElse(wxDC * dc, if (mAx->IsFocused(t)) { focusRect = borderRect; } - DrawOutside(borderTrack, dc, borderRect, borderTrackRect); + DrawOutside(borderTrack, dc, borderRect); } // Believe it or not, we can speed up redrawing if we don't @@ -7420,8 +7420,7 @@ void TrackPanel::DrawZooming(wxDC * dc, const wxRect & clip) dc->DrawRectangle(rect); } -void TrackPanel::DrawOutside(Track * t, wxDC * dc, const wxRect & rec, - const wxRect & trackRect) +void TrackPanel::DrawOutside(Track * t, wxDC * dc, const wxRect & rec) { wxRect rect = rec; int labelw = GetLabelWidth(); diff --git a/src/TrackPanel.h b/src/TrackPanel.h index 779f40027..f88eb2d4e 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -584,8 +584,7 @@ protected: virtual void DrawEverythingElse(wxDC *dc, const wxRegion & region, const wxRect & clip); - virtual void DrawOutside(Track *t, wxDC *dc, const wxRect & rec, - const wxRect &trackRect); + virtual void DrawOutside(Track *t, wxDC *dc, const wxRect & rec); virtual void DrawZooming(wxDC* dc, const wxRect & clip); virtual void HighlightFocusedTrack (wxDC* dc, const wxRect &rect);