Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-05 22:28:57 +02:00
Code Issues Releases Wiki Activity

Reimplement TrackPanel::FindTrackRect...

Browse Source 
... addressing unfinished business mentioned in comment of commit b7e1cc0.

This eliminates a duplicate definition of track panel area subdivision, which
might grow inconsistent.

Now that subdivision is defined only by the tree of TrackPanelNodes built by
TrackPanel::Root() -- EXCEPT in the drawing code, which is still quite a lot
of other code needing its own difficult refactoring.
This commit is contained in:
Paul Licameli 2018-11-19 11:24:06 -05:00
parent 5bb4e1446f
commit 6c931dc885
1 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/TrackPanel.cpp
View File

@ -2171,41 +2171,16 @@ std::shared_ptr<TrackPanelNode> TrackPanel::Root()
// The given track is assumed to be the first channel
wxRect TrackPanel::FindTrackRect( const Track * target )
{
if (!target) {
auto leader = *GetTracks()->FindLeader( target );
if (!leader) {
return { 0, 0, 0, 0 };
}
// PRL: I think the following very old comment misused the term "race
// condition" for a bug that happened with only a single thread. I think the
// real problem referred to, was that this function could be reached, via
// TrackPanelAx callbacks, during low-level operations while the TrackList
// was not in a consistent state.
// Now the problem is fixed by delaying the handling of events generated
// by TrackList. And besides that, we use Channels() instead of looking
// directly at the links.
// Old comment:
// The check for a null linked track is necessary because there's
// a possible race condition between the time the 2 linked tracks
// are added and when wxAccessible methods are called. This is
// most evident when using Jaws.
auto height = TrackList::Channels( target ).sum( &Track::GetHeight );
wxRect rect{
0,
target->GetY() - mViewInfo->vpos,
GetSize().GetWidth(),
height
};
rect.x += kLeftMargin;
rect.width -= (kLeftMargin + kRightMargin);
rect.y += kTopMargin;
rect.height -= (kTopMargin + kBottomMargin);
return rect;
return CellularPanel::FindRect( [&] ( TrackPanelNode &node ) {
if (auto pGroup = dynamic_cast<const LabeledChannelGroup*>( &node ))
return pGroup->mpTrack.get() == leader;
return false;
} );
}
int TrackPanel::GetVRulerWidth() const