Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-17 09:07:41 +02:00
Code Issues Releases Wiki Activity

Correct the one-pixel wobble in scroll-scrubbing play indicator...

Browse Source 
... that is, the green line, though the triangle in the ruler still jumps
sometimes.
This commit is contained in:
Paul Licameli 2015-08-26 17:37:26 -04:00
parent a35669a562
commit 67c794891d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/TrackPanel.cpp
View File

@ -1214,11 +1214,16 @@ void TrackPanel::TimerUpdateIndicator()
// Calculate the horizontal position of the indicator // Calculate the horizontal position of the indicator
pos = gAudioIO->GetStreamTime(); pos = gAudioIO->GetStreamTime();
#ifdef EXPERIMENTAL_SCRUBBING_SMOOTH_SCROLL #ifdef EXPERIMENTAL_SCRUBBING_SMOOTH_SCROLL
if (mSmoothScrollingScrub) { if (mSmoothScrollingScrub) {
// Pan the view, so that we center the play indicator. // Pan the view, so that we center the play indicator.
const double duration = GetScreenEndTime() - mViewInfo->h; const int posX = mViewInfo->TimeToPosition(pos);
mViewInfo->h = pos - duration / 2.0; int width;
GetTracksUsableArea(&width, NULL);
const int deltaX = posX - width / 2;
mViewInfo->h =
mViewInfo->OffsetTimeByPixels(mViewInfo->h, deltaX, true);
if (!mScrollBeyondZero) if (!mScrollBeyondZero)
// Can't scroll too far left // Can't scroll too far left
mViewInfo->h = std::max(0.0, mViewInfo->h); mViewInfo->h = std::max(0.0, mViewInfo->h);

4
src/ViewInfo.h
View File

@ -62,9 +62,9 @@ public:
, bool ignoreFisheye = false , bool ignoreFisheye = false
) const; ) const;
double OffsetTimeByPixels(double time, wxInt64 offset) const double OffsetTimeByPixels(double time, wxInt64 offset, bool ignoreFisheye = false) const
{ {
return PositionToTime(offset + TimeToPosition(time)); return PositionToTime(offset + TimeToPosition(time, ignoreFisheye), ignoreFisheye);
} }
bool ZoomInAvailable() const; bool ZoomInAvailable() const;