Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-05 14:18:53 +02:00
Code Issues Releases Wiki Activity

Move a few steps in the construction of TrackPanel and AdornedRulerPanel

Browse Source
This commit is contained in:
Paul Licameli 2016-04-29 16:40:34 -04:00
parent 3849df763b
commit 2a257fc9bf
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Project.cpp
View File

@ -926,6 +926,7 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
&mViewInfo, &mViewInfo,
this, this,
mRuler); mRuler);
mTrackPanel->UpdatePrefs();
mIndicatorOverlay = std::make_unique<PlayIndicatorOverlay>(this); mIndicatorOverlay = std::make_unique<PlayIndicatorOverlay>(this);
@ -1024,7 +1025,6 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
InitialState(); InitialState();
FixScrollbars(); FixScrollbars();
mRuler->SetLeftOffset(mTrackPanel->GetLeftOffset()); // bevel on AdornedRuler mRuler->SetLeftOffset(mTrackPanel->GetLeftOffset()); // bevel on AdornedRuler
mRuler->SetProject(this);
// //
// Set the Icon // Set the Icon

1
src/TrackPanel.cpp
View File

@ -460,7 +460,6 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
mLabelTrackStartXPos=-1; mLabelTrackStartXPos=-1;
mCircularTrackNavigation = false; mCircularTrackNavigation = false;
UpdatePrefs();
mRedrawAfterStop = false; mRedrawAfterStop = false;

1
src/widgets/Ruler.cpp
View File

@ -1785,6 +1785,7 @@ AdornedRulerPanel::AdornedRulerPanel(AudacityProject* parent,
const wxSize& size, const wxSize& size,
ViewInfo *viewinfo) ViewInfo *viewinfo)
: wxPanel(parent, id, pos, size) : wxPanel(parent, id, pos, size)
, mProject(parent)
, mViewInfo(viewinfo) , mViewInfo(viewinfo)
{ {
SetLabel( _("Timeline") ); SetLabel( _("Timeline") );

3
src/widgets/Ruler.h
View File

@ -304,7 +304,6 @@ public:
void ClearPlayRegion(); void ClearPlayRegion();
void GetPlayRegion(double* playRegionStart, double* playRegionEnd); void GetPlayRegion(double* playRegionStart, double* playRegionEnd);
void SetProject(AudacityProject* project) {mProject = project;}
void GetMaxSize(wxCoord *width, wxCoord *height); void GetMaxSize(wxCoord *width, wxCoord *height);
void InvalidateRuler(); void InvalidateRuler();
@ -364,7 +363,7 @@ private:
Ruler mRuler; Ruler mRuler;
ViewInfo *const mViewInfo; ViewInfo *const mViewInfo;
AudacityProject *mProject; AudacityProject *const mProject;
TrackList *mTracks; TrackList *mTracks;
wxBitmap *mBack; wxBitmap *mBack;