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

Restored previous behaviour. Mouse wheel based zooming now different from button based zooming again.

Browse Source
This commit is contained in:
james.k.crook@gmail.com 2012-05-05 21:06:19 +00:00
parent 2268f6f1e9
commit e4e9549a95
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/TrackPanel.cpp
View File

@ -4665,7 +4665,9 @@ void TrackPanel::HandleWheelRotation(wxMouseEvent & event)
50.0 * -steps / mViewInfo->zoom); 50.0 * -steps / mViewInfo->zoom);
} else if (event.CmdDown()) } else if (event.CmdDown())
{ {
// JKC: Now using AudacityProject zooming, which is smarter, #if 0
// JKC: Alternative scroll wheel zooming code
// using AudacityProject zooming, which is smarter,
// it keeps selections on screen and centred if it can, // it keeps selections on screen and centred if it can,
// also this ensures mousewheel and zoom buttons give same result. // also this ensures mousewheel and zoom buttons give same result.
double ZoomFactor = pow(2.0, steps); double ZoomFactor = pow(2.0, steps);
@ -4674,6 +4676,16 @@ void TrackPanel::HandleWheelRotation(wxMouseEvent & event)
p->ZoomInByFactor( ZoomFactor ); p->ZoomInByFactor( ZoomFactor );
else else
p->ZoomOutByFactor( ZoomFactor ); p->ZoomOutByFactor( ZoomFactor );
#endif
// MM: Zoom in/out when used with Control key down
// MM: I don't understand what trackLeftEdge does
int trackLeftEdge = GetLeftOffset();
double center_h = PositionToTime(event.m_x, trackLeftEdge);
mViewInfo->zoom = wxMin(mViewInfo->zoom * pow(2.0, steps), gMaxZoom);
double new_center_h = PositionToTime(event.m_x, trackLeftEdge);
mViewInfo->h += (center_h - new_center_h);
MakeParentRedrawScrollbars(); MakeParentRedrawScrollbars();
Refresh(false); Refresh(false);