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

Bug 1293 - Unable to mouse wheel zoom in beyond end of project

Browse Source
This commit is contained in:
James Crook 2017-08-17 13:55:12 +01:00
parent 50258c1f21
commit fc25ce093f
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tracks/ui/CommonTrackPanelCell.cpp
View File

@ -84,9 +84,12 @@ unsigned CommonTrackPanelCell::HandleWheelRotation
xx = event.m_x; xx = event.m_x;
center_h = viewInfo.PositionToTime(xx, trackLeftEdge); center_h = viewInfo.PositionToTime(xx, trackLeftEdge);
} }
// Time corresponding to last (most far right) audio. // Time corresponding to last (most far right) audio.
double audioEndTime = pProject->GetTracks()->GetEndTime(); double audioEndTime = pProject->GetTracks()->GetEndTime();
// Disabled this code to fix Bug 1923 (tricky to wheel-zoom right of waveform).
#if 0
// When zooming in in empty space, it's easy to 'lose' the waveform. // When zooming in in empty space, it's easy to 'lose' the waveform.
// This prevents it. // This prevents it.
// IF zooming in // IF zooming in
@ -97,12 +100,20 @@ unsigned CommonTrackPanelCell::HandleWheelRotation
// Zooming brings far right of audio to mouse. // Zooming brings far right of audio to mouse.
center_h = audioEndTime; center_h = audioEndTime;
} }
#endif
wxCoord xTrackEnd = viewInfo.TimeToPosition( audioEndTime );
viewInfo.ZoomBy(pow(2.0, steps)); viewInfo.ZoomBy(pow(2.0, steps));
double new_center_h = viewInfo.PositionToTime(xx, trackLeftEdge); double new_center_h = viewInfo.PositionToTime(xx, trackLeftEdge);
viewInfo.h += (center_h - new_center_h); viewInfo.h += (center_h - new_center_h);
// If wave has gone off screen, bring it back.
// This means that the end of the track stays where it was.
if( viewInfo.h > audioEndTime )
viewInfo.h += audioEndTime - viewInfo.PositionToTime( xTrackEnd );
result |= FixScrollbars; result |= FixScrollbars;
} }
else else