Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-26 07:53:42 +02:00
Code Issues Releases Wiki Activity

Bug 1392: don't draw indicator over track control during quick play

Browse Source
This commit is contained in:
Paul Licameli
2016-05-18 09:30:55 -04:00
parent 4fb4b4b24f b0919ba44f
commit ae28b4d598
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,12 +142,20 @@ void PlayIndicatorOverlay::OnTimer(wxCommandEvent &event)
} }
} }
auto trackPanel = mProject->GetTrackPanel();
if (!mProject->IsAudioActive()) { if (!mProject->IsAudioActive()) {
mNewIndicatorX = -1;
const auto &scrubber = mProject->GetScrubber(); const auto &scrubber = mProject->GetScrubber();
if (scrubber.HasStartedScrubbing()) if (scrubber.HasStartedScrubbing()) {
mNewIndicatorX = scrubber.GetScrubStartPosition(); auto position = scrubber.GetScrubStartPosition();
else int width;
mNewIndicatorX = -1; trackPanel->GetTracksUsableArea(&width, nullptr);
const auto offset = trackPanel->GetLeftOffset();
if(position >= trackPanel->GetLeftOffset() &&
position < offset + width)
mNewIndicatorX = position;
}
} }
else { else {
ViewInfo &viewInfo = mProject->GetViewInfo(); ViewInfo &viewInfo = mProject->GetViewInfo();
@@ -155,7 +163,7 @@ void PlayIndicatorOverlay::OnTimer(wxCommandEvent &event)
// Calculate the horizontal position of the indicator // Calculate the horizontal position of the indicator
const double playPos = viewInfo.mRecentStreamTime; const double playPos = viewInfo.mRecentStreamTime;
const bool onScreen = playPos >= 0.0 && bool onScreen = playPos >= 0.0 &&
between_incexc(viewInfo.h, between_incexc(viewInfo.h,
playPos, playPos,
mProject->GetScreenEndTime()); mProject->GetScreenEndTime());
@@ -176,6 +184,11 @@ void PlayIndicatorOverlay::OnTimer(wxCommandEvent &event)
!gAudioIO->IsPaused()) !gAudioIO->IsPaused())
{ {
mProject->TP_ScrollWindow(playPos); mProject->TP_ScrollWindow(playPos);
// Might yet be off screen, check it
onScreen = playPos >= 0.0 &&
between_incexc(viewInfo.h,
playPos,
mProject->GetScreenEndTime());
} }
// Always update scrollbars even if not scrolling the window. This is // Always update scrollbars even if not scrolling the window. This is
@@ -183,7 +196,10 @@ void PlayIndicatorOverlay::OnTimer(wxCommandEvent &event)
// length of the project and therefore the appearance of the scrollbar. // length of the project and therefore the appearance of the scrollbar.
mProject->TP_RedrawScrollbars(); mProject->TP_RedrawScrollbars();
mNewIndicatorX = viewInfo.TimeToPosition(playPos, mProject->GetTrackPanel()->GetLeftOffset()); if (onScreen)
mNewIndicatorX = viewInfo.TimeToPosition(playPos, trackPanel->GetLeftOffset());
else
mNewIndicatorX = -1;
} }
if(mPartner) if(mPartner)