Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-25 16:48:44 +02:00
Code Issues Releases Wiki Activity

Fix bugs in retraction of Waveforms preferences page

Browse Source
This commit is contained in:
Paul Licameli 2015-08-19 11:53:31 -04:00
commit b9bc4521fe
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/WaveTrack.cpp
View File

@ -120,14 +120,6 @@ WaveTrack::WaveTrack(WaveTrack &orig):
, mpWaveformSettings(orig.mpWaveformSettings , mpWaveformSettings(orig.mpWaveformSettings
? new WaveformSettings(*orig.mpWaveformSettings) : 0) ? new WaveformSettings(*orig.mpWaveformSettings) : 0)
{ {
// Force creation always:
WaveformSettings &settings = GetIndependentWaveformSettings();
mDisplay = FindDefaultViewMode();
if (mDisplay == obsoleteWaveformDBDisplay) {
mDisplay = Waveform;
settings.scaleType = WaveformSettings::stLinear;
}
mLastScaleType = -1; mLastScaleType = -1;
mLegacyProjectFileOffset = 0; mLegacyProjectFileOffset = 0;

3
src/prefs/PrefsDialog.cpp
View File

@ -258,7 +258,8 @@ PrefsDialog::PrefsDialog
S.AddStandardButtons(eOkButton | eCancelButton); S.AddStandardButtons(eOkButton | eCancelButton);
#if defined(__WXGTK__) #if defined(__WXGTK__)
mCategories->GetTreeCtrl()->EnsureVisible(mCategories->GetTreeCtrl()->GetRootItem()); if (mCategories)
mCategories->GetTreeCtrl()->EnsureVisible(mCategories->GetTreeCtrl()->GetRootItem());
#endif #endif
// mCategories->SetSizeHints(-1, -1, 790, 600); // 790 = 800 - (border * 2) // mCategories->SetSizeHints(-1, -1, 790, 600); // 790 = 800 - (border * 2)