Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-28 14:18:41 +02:00
Code Issues Releases Wiki Activity

Rewrite iteration over tracks in DrawEverythingElse

Browse Source
This commit is contained in:
Paul Licameli 2018-10-31 21:11:39 -04:00
parent 10bc061b00
commit 3589aacd7c
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/TrackPanel.cpp
View File

@ -1087,36 +1087,29 @@ void TrackPanel::DrawEverythingElse(TrackPanelDrawingContext &context,
};
wxRect focusRect{};
for ( auto t :
GetTracks()->Any< const Track >() + IsVisibleTrack{ GetProject() } ) {
auto visibleT = t->SubstitutePendingChangedTrack().get();
trackRect.y = visibleT->GetY() - mViewInfo->vpos;
trackRect.height = visibleT->GetHeight();
auto leaderTrack = *GetTracks()->FindLeader( t );
// If the previous track is linked to this one but isn't on the screen
// (and thus would have been skipped) we need to draw that track's border
// instead.
bool drawBorder = (t == leaderTrack || trackRect.y < 0);
if (drawBorder) {
wxRect teamRect = trackRect;
auto visibleLeaderTrack =
leaderTrack->SubstitutePendingChangedTrack().get();
teamRect.y = visibleLeaderTrack->GetY() - mViewInfo->vpos;
teamRect.height = TrackList::Channels(leaderTrack).sum(
[&] (const Track *channel) {
channel = channel->SubstitutePendingChangedTrack().get();
return channel->GetHeight();
}
);
if (mAx->IsFocused(t)) {
focusRect = teamRect;
}
DrawOutside(context, leaderTrack, teamRect);
for ( auto leaderTrack : GetTracks()->Leaders< const Track >()
// Predicate is true iff any channel in the group is wholly or partly
// visible:
+ IsVisibleTrack{ GetProject() } ) {
const auto channels = TrackList::Channels(leaderTrack);
bool focused = false;
wxRect teamRect = trackRect;
teamRect.height = 0;
bool first = true;
for (auto channel : channels) {
focused = focused || mAx->IsFocused(channel);
channel = channel->SubstitutePendingChangedTrack().get();
if (first)
first = false,
teamRect.y = channel->GetY() - mViewInfo->vpos;
teamRect.height += channel->GetHeight();
}
if (focused) {
focusRect = teamRect;
}
DrawOutside(context, leaderTrack, teamRect);
// Believe it or not, we can speed up redrawing if we don't
// redraw the vertical ruler when only the waveform data has
// changed. An example is during recording.
@ -1127,14 +1120,21 @@ void TrackPanel::DrawEverythingElse(TrackPanelDrawingContext &context,
// rbox.x, rbox.y, rbox.width, rbox.height);
#endif
if (region.Contains(0, trackRect.y, GetLeftOffset(), trackRect.height)) {
wxRect rect{
GetVRulerOffset(),
trackRect.y + kTopMargin,
GetVRulerWidth() + 1,
trackRect.height - kSeparatorThickness
};
mTrackArtist->DrawVRuler( context, visibleT, rect, t->GetSelected() );
for (auto channel : channels) {
bool bSelected = channel->GetSelected();
channel = channel->SubstitutePendingChangedTrack().get();
trackRect.y = channel->GetY() - mViewInfo->vpos;
trackRect.height = channel->GetHeight();
if (region.Contains(
0, trackRect.y, GetLeftOffset(), trackRect.height)) {
wxRect rect{
GetVRulerOffset(),
trackRect.y + kTopMargin,
GetVRulerWidth() + 1,
trackRect.height - kSeparatorThickness
};
mTrackArtist->DrawVRuler(context, channel, rect, bSelected);
}
}
}