Another fix for new file dialog sizing when using DirPickerCtrl.

diff --git a/ChangeLog b/ChangeLog
index a76736a6c6a79dd30a6537754404395502d11410..64bc8775ca765f6e7215dff30866ee7fa5e60cb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-24  c.hetherington  <cth@carlh.net>
+
+       * Try again to make new file dialogue bigger on some platforms
+       (#902).
+
 2016-06-24  c.hetherington  <cth@carlh.net>
 
        * Support underlined subtitles.

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index 368ff863d8f7eff10a738b19f4b6567cf1581142..18d3ac6f42ae89c708acc847978538ed25b7861c 100644 (file)
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -28,17 +28,17 @@
 using namespace std;
 using namespace boost;
 
-DirPickerCtrl::DirPickerCtrl (wxWindow* parent, wxSize size)
-       : wxPanel (parent, wxID_ANY, wxDefaultPosition, size)
+DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
+       : wxPanel (parent)
 {
        _sizer = new wxBoxSizer (wxHORIZONTAL);
 
-       _folder = new wxStaticText (this, wxID_ANY, wxT ("This is the length of the folder label"));
+       _folder = new wxStaticText (this, wxID_ANY, wxT (""));
        _sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
        _browse = new wxButton (this, wxID_ANY, _("Browse..."));
        _sizer->Add (_browse, 0);
 
-       SetSizerAndFit (_sizer);
+       SetSizer (_sizer);
 
        _browse->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DirPickerCtrl::browse_clicked, this));
 }
@@ -58,7 +58,7 @@ DirPickerCtrl::SetPath (wxString p)
        GetEventHandler()->ProcessEvent (ev);
 
        _sizer->Layout ();
-       _sizer->SetSizeHints (this);
+       SetMinSize (wxSize (max (400, _sizer->GetSize().GetWidth()), -1));
 }
 
 wxString

diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h
index 383362f570d97095e296d6559af3e2d23da44b36..2a486d891c351a61d575c92edf63db4cf2d516fa 100644 (file)
--- a/src/wx/dir_picker_ctrl.h
+++ b/src/wx/dir_picker_ctrl.h
@@ -23,7 +23,7 @@
 class DirPickerCtrl : public wxPanel
 {
 public:
-       DirPickerCtrl (wxWindow *, wxSize size = wxDefaultSize);
+       DirPickerCtrl (wxWindow *);
 
        wxString GetPath () const;
        void SetPath (wxString);

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index df5890f2c8a2636e1bca97a628f8ec6ac6145c50..04b9e10578889d8f43b59f50f1d178dfd193d9ce 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -41,7 +41,7 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
        add (_("Create in folder"), true);
 
 #ifdef DCPOMATIC_USE_OWN_PICKER
-       _folder = new DirPickerCtrl (this, wxSize (300, -1));
+       _folder = new DirPickerCtrl (this);
 #else
        _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
 #endif