Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 22:12:58 +02:00
Code Issues Releases Wiki Activity

Bugs2151,2156: playhead ruler overlay was leaving black marks behind

Browse Source
This commit is contained in:
Paul Licameli
2019-07-26 11:57:30 -04:00
parent f89d96a870
commit 960fe47412
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tracks/ui/PlayIndicatorOverlay.cpp
View File

@@ -55,10 +55,19 @@ unsigned PlayIndicatorOverlayBase::SequenceNumber() const
std::pair<wxRect, bool> PlayIndicatorOverlayBase::DoGetRectangle(wxSize size)
{
auto width = mIsMaster ? 1 : IndicatorMediumWidth;
wxCoord width = 1, xx = mLastIndicatorX;
if ( !mIsMaster ) {
auto &ruler = AdornedRulerPanel::Get( *mProject );
auto gAudioIO = AudioIO::Get();
bool rec = gAudioIO->IsCapturing();
auto pair = ruler.GetIndicatorBitmap( xx, !rec );
xx = pair.first.x;
width = pair.second.GetWidth();
}
// May be excessive height, but little matter
wxRect rect(mLastIndicatorX - width / 2, 0, width, size.GetHeight());
wxRect rect( xx, 0, width, size.GetHeight());
return {
rect,
(mLastIndicatorX != mNewIndicatorX
@@ -113,7 +122,8 @@ void PlayIndicatorOverlayBase::Draw(OverlayPanel &panel, wxDC &dc)
else if(auto ruler = dynamic_cast<AdornedRulerPanel*>(&panel)) {
wxASSERT(!mIsMaster);
ruler->DoDrawIndicator(&dc, mLastIndicatorX, !rec, IndicatorMediumWidth, false, false);
auto pair = ruler->GetIndicatorBitmap( mLastIndicatorX, !rec );
dc.DrawBitmap( pair.second, pair.first.x, pair.first.y );
}
else
wxASSERT(false);