Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 08:27:13 +01:00
Code Issues Releases Wiki Activity

Lower ViewActions as member functions of ProjectWindow

Browse Source
This commit is contained in:
Paul Licameli
2019-06-21 23:08:31 -04:00
parent b6077fd3cd
commit c6478f43af
7 changed files with 52 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/menus/ViewMenus.cpp
View File

@@ -88,7 +88,8 @@ double GetZoomOfPreset( const AudacityProject &project, int preset )
const double pixelsPerUnit = 5.0;
double result = 1.0;
double zoomToFit = ViewActions::GetZoomOfToFit( project );
auto &window = ProjectWindow::Get( project );
double zoomToFit = window.GetZoomOfToFit();
using namespace WaveTrackViewConstants;
switch( preset ){
default:
@@ -145,47 +146,6 @@ double GetZoomOfPreset( const AudacityProject &project, int preset )
}
namespace ViewActions {
// exported helper functions
double GetZoomOfToFit( const AudacityProject &project )
{
auto &tracks = TrackList::Get( project );
auto &viewInfo = ViewInfo::Get( project );
auto &trackPanel = TrackPanel::Get( project );
const double end = tracks.GetEndTime();
const double start = viewInfo.bScrollBeyondZero
? std::min( tracks.GetStartTime(), 0.0)
: 0;
const double len = end - start;
if (len <= 0.0)
return viewInfo.GetZoom();
int w;
trackPanel.GetTracksUsableArea(&w, NULL);
w -= 10;
return w/len;
}
void DoZoomFit(AudacityProject &project)
{
auto &viewInfo = ViewInfo::Get( project );
auto &tracks = TrackList::Get( project );
auto &window = ProjectWindow::Get( project );
const double start = viewInfo.bScrollBeyondZero
? std::min(tracks.GetStartTime(), 0.0)
: 0;
window.Zoom( GetZoomOfToFit( project ) );
window.TP_ScrollWindow(start);
}
}
namespace {
void DoZoomFitV(AudacityProject &project)
{
@@ -288,7 +248,9 @@ void OnZoomToggle(const CommandContext &context)
void OnZoomFit(const CommandContext &context)
{
DoZoomFit( context.project );
auto &project = context.project;
auto &window = ProjectWindow::Get( project );
window.DoZoomFit();
}
void OnZoomFitV(const CommandContext &context)