audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug #1110

This commit is contained in:
Leland Lucius 2015-08-09 23:28:13 -05:00
parent f342ae8836
commit 8d236b88ae
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib-src/FileDialog/win/FileDialogPrivate.cpp
View File

@ -180,6 +180,14 @@ void FileDialog::MSWOnSize(HWND hDlg, LPOPENFILENAME pOfn)
SetHWND(mChildDlg); SetHWND(mChildDlg);
SetWindowPos(mChildDlg,
HWND_TOP,
0,
0,
r.GetWidth(),
r.GetHeight(),
SWP_NOZORDER | SWP_NOMOVE);
SetSize(r); SetSize(r);
if (mRoot) if (mRoot)
@ -272,19 +280,19 @@ void FileDialog::MSWOnInitDialog(HWND hDlg, LPOPENFILENAME pOfn)
if (HasUserPaneCreator()) if (HasUserPaneCreator())
{ {
// Create the root window // Create the root window
wxBoxSizer *verticalSizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *verticalSizer = new wxBoxSizer(wxVERTICAL);
mRoot = new wxPanel(this, wxID_ANY); mRoot = new wxPanel(this, wxID_ANY);
wxPanel *userpane = new wxPanel(mRoot, wxID_ANY); wxPanel *userpane = new wxPanel(mRoot, wxID_ANY);
CreateUserPane(userpane); CreateUserPane(userpane);
wxBoxSizer *horizontalSizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *horizontalSizer = new wxBoxSizer(wxHORIZONTAL);
horizontalSizer->Add(userpane, 1, wxEXPAND, 0); horizontalSizer->Add(userpane, 1, wxEXPAND);
verticalSizer->Add(horizontalSizer, 1, wxEXPAND|wxALL, 0); verticalSizer->Add(horizontalSizer, 1, wxEXPAND);
mRoot->SetSizer(verticalSizer); mRoot->SetSizer(verticalSizer);
mRoot->Layout(); mRoot->Layout();
verticalSizer->SetSizeHints(mRoot); mRoot->Fit();
// This reserves space for the additional panel // This reserves space for the additional panel
wxSize sz = mRoot->GetBestSize(); wxSize sz = mRoot->GetBestSize();

4
src/export/Export.cpp
View File

@ -871,7 +871,7 @@ void Exporter::CreateUserPaneCallback(wxWindow *parent, wxUIntPtr userdata)
void Exporter::CreateUserPane(wxWindow *parent) void Exporter::CreateUserPane(wxWindow *parent)
{ {
ShuttleGui S(parent, eIsCreatingFromPrefs); ShuttleGui S(parent, eIsCreating);
S.StartVerticalLay(); S.StartVerticalLay();
{ {
@ -894,7 +894,7 @@ void Exporter::CreateUserPane(wxWindow *parent)
} }
S.EndHorizontalLay(); S.EndHorizontalLay();
} }
S.EndHorizontalLay(); S.EndVerticalLay();
return; return;
} }