Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-18 17:10:55 +02:00
Code Issues Releases Wiki Activity

Correct AutoRecoveryDialog sizing and focus issues under wxGTK

Browse Source
This commit is contained in:
Leland Lucius 2015-07-19 20:35:00 -05:00
parent e91f9814a8
commit 4cb1b023fd
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/AutoRecovery.cpp
View File

@ -81,14 +81,14 @@ void AutoRecoveryDialog::PopulateOrExchange(ShuttleGui& S)
mFileList = S.Id(ID_FILE_LIST).AddListControlReportMode(); mFileList = S.Id(ID_FILE_LIST).AddListControlReportMode();
/*i18n-hint: (noun). It's the name of the project to recover.*/ /*i18n-hint: (noun). It's the name of the project to recover.*/
mFileList->InsertColumn(0, _("Name")); mFileList->InsertColumn(0, _("Name"));
mFileList->SetColumnWidth(0, 220); mFileList->SetColumnWidth(0, wxLIST_AUTOSIZE);
PopulateList(); PopulateList();
} }
S.EndStatic(); S.EndStatic();
S.AddVariableText(_("After recovery, save the project to save the changes to disk."), false); S.AddVariableText(_("After recovery, save the project to save the changes to disk."), false);
S.StartHorizontalLay(true); S.StartHorizontalLay();
{ {
S.Id(ID_QUIT_AUDACITY).AddButton(_("Quit Audacity")); S.Id(ID_QUIT_AUDACITY).AddButton(_("Quit Audacity"));
S.Id(ID_RECOVER_NONE).AddButton(_("Discard Projects")); S.Id(ID_RECOVER_NONE).AddButton(_("Discard Projects"));
@ -101,6 +101,10 @@ void AutoRecoveryDialog::PopulateOrExchange(ShuttleGui& S)
Layout(); Layout();
Fit(); Fit();
SetMinSize(GetSize()); SetMinSize(GetSize());
// Sometimes it centers on wxGTK and sometimes it doesn't.
// Yielding before centering seems to be a good workaround,
// but will leave to implement on a rainy day.
Center(); Center();
} }
@ -227,6 +231,20 @@ bool ShowAutoRecoveryDialogIfNeeded(AudacityProject** pproj,
*didRecoverAnything = false; *didRecoverAnything = false;
if (HaveFilesToRecover()) if (HaveFilesToRecover())
{ {
// Under wxGTK3, the auto recovery dialog will not get
// the focus since the project window hasn't been allowed
// to completely initialize.
//
// Yielding seems to allow the initialization to complete.
//
// Additionally, it also corrects a sizing issue in the dialog
// related to wxWidgets bug:
//
// http://trac.wxwidgets.org/ticket/16440
//
// This must be done before "dlg" is declared.
wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);
AutoRecoveryDialog dlg(*pproj); AutoRecoveryDialog dlg(*pproj);
int ret = dlg.ShowModal(); int ret = dlg.ShowModal();