mirror of
https://github.com/cookiengineer/audacity
synced 2025-05-05 14:18:53 +02:00
Move a few steps in the construction of TrackPanel and AdornedRulerPanel
This commit is contained in:
parent
3849df763b
commit
2a257fc9bf
@ -926,6 +926,7 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
|
||||
&mViewInfo,
|
||||
this,
|
||||
mRuler);
|
||||
mTrackPanel->UpdatePrefs();
|
||||
|
||||
mIndicatorOverlay = std::make_unique<PlayIndicatorOverlay>(this);
|
||||
|
||||
@ -1024,7 +1025,6 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
|
||||
InitialState();
|
||||
FixScrollbars();
|
||||
mRuler->SetLeftOffset(mTrackPanel->GetLeftOffset()); // bevel on AdornedRuler
|
||||
mRuler->SetProject(this);
|
||||
|
||||
//
|
||||
// Set the Icon
|
||||
|
@ -460,7 +460,6 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
|
||||
mLabelTrackStartXPos=-1;
|
||||
mCircularTrackNavigation = false;
|
||||
|
||||
UpdatePrefs();
|
||||
|
||||
mRedrawAfterStop = false;
|
||||
|
||||
|
@ -1785,6 +1785,7 @@ AdornedRulerPanel::AdornedRulerPanel(AudacityProject* parent,
|
||||
const wxSize& size,
|
||||
ViewInfo *viewinfo)
|
||||
: wxPanel(parent, id, pos, size)
|
||||
, mProject(parent)
|
||||
, mViewInfo(viewinfo)
|
||||
{
|
||||
SetLabel( _("Timeline") );
|
||||
|
@ -304,7 +304,6 @@ public:
|
||||
void ClearPlayRegion();
|
||||
void GetPlayRegion(double* playRegionStart, double* playRegionEnd);
|
||||
|
||||
void SetProject(AudacityProject* project) {mProject = project;}
|
||||
void GetMaxSize(wxCoord *width, wxCoord *height);
|
||||
|
||||
void InvalidateRuler();
|
||||
@ -364,7 +363,7 @@ private:
|
||||
|
||||
Ruler mRuler;
|
||||
ViewInfo *const mViewInfo;
|
||||
AudacityProject *mProject;
|
||||
AudacityProject *const mProject;
|
||||
TrackList *mTracks;
|
||||
|
||||
wxBitmap *mBack;
|
||||
|
Loading…
x
Reference in New Issue
Block a user