1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-06 03:32:09 +01:00

Bug1239: Correct time rulers after importing files (with File>Open) ...

... The fisheye stuff was to blame.
This commit is contained in:
Paul Licameli
2016-01-26 17:37:16 -05:00
parent 8ce18979c8
commit 17c9369286
9 changed files with 30 additions and 23 deletions

View File

@@ -31,11 +31,12 @@
TimeTrack *TrackFactory::NewTimeTrack()
{
return new TimeTrack(mDirManager);
return new TimeTrack(mDirManager, mZoomInfo);
}
TimeTrack::TimeTrack(DirManager *projDirManager):
TimeTrack::TimeTrack(DirManager *projDirManager, const ZoomInfo *zoomInfo):
Track(projDirManager)
, mZoomInfo(zoomInfo)
{
mHeight = 100;
@@ -55,7 +56,7 @@ TimeTrack::TimeTrack(DirManager *projDirManager):
SetName(GetDefaultName());
mRuler = new Ruler;
mRuler->SetUseZoomInfo(0);
mRuler->SetUseZoomInfo(0, mZoomInfo);
mRuler->SetLabelEdges(false);
mRuler->SetFormat(Ruler::TimeFormat);
@@ -65,6 +66,7 @@ TimeTrack::TimeTrack(DirManager *projDirManager):
TimeTrack::TimeTrack(TimeTrack &orig):
Track(orig)
, mZoomInfo(orig.mZoomInfo)
{
Init(orig); // this copies the TimeTrack metadata (name, range, etc)
@@ -80,7 +82,7 @@ TimeTrack::TimeTrack(TimeTrack &orig):
///@TODO: Give Ruler:: a copy-constructor instead of this?
mRuler = new Ruler;
mRuler->SetUseZoomInfo(0);
mRuler->SetUseZoomInfo(0, mZoomInfo);
mRuler->SetLabelEdges(false);
mRuler->SetFormat(Ruler::TimeFormat);