Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 15:23:48 +01:00
Code Issues Releases Wiki Activity

Don't use GetActiveProject when drawing label track

Browse Source
This commit is contained in:
Paul Licameli
2020-01-06 12:18:10 -05:00
parent a93c4472f5
commit d244b55709
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tracks/labeltrack/ui/LabelTrackView.cpp
View File

@@ -676,13 +676,14 @@ void LabelTrackView::CalcHighlightXs(int *x1, int *x2) const
}
#include "LabelGlyphHandle.h"
// TODO: don't rely on the global ::GetActiveProject() to find this.
// Rather, give TrackPanelCell a drawing function and pass context into it.
namespace {
LabelTrackHit *findHit()
LabelTrackHit *findHit( TrackPanel *pPanel )
{
if (! pPanel )
return nullptr;
// Fetch the highlighting state
auto target = TrackPanel::Get( *GetActiveProject() ).Target();
auto target = pPanel->Target();
if (target) {
auto handle = dynamic_cast<LabelGlyphHandle*>( target.get() );
if (handle)
@@ -705,7 +706,7 @@ void LabelTrackView::Draw
const auto artist = TrackArtist::Get( context );
const auto &zoomInfo = *artist->pZoomInfo;
auto pHit = findHit();
auto pHit = findHit( artist->parent );
if(msFont.Ok())
dc.SetFont(msFont);