Fix sizing of editor's reel dialog.

[dcpomatic.git] / src / tools / dcpomatic_editor.cc

diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc
index 663eb8e3b00a4d2917846471799a911fea7cd226..69fbe4643a1fa2dec5be43f748685fa0c472a8d2 100644 (file)
--- a/src/tools/dcpomatic_editor.cc
+++ b/src/tools/dcpomatic_editor.cc
@@ -147,10 +147,10 @@ public:
        ReelEditor(wxWindow* parent)
                : wxDialog(parent, wxID_ANY, _("Edit reel"))
        {
-               auto sizer = new wxBoxSizer(wxVERTICAL);
+               _sizer = new wxBoxSizer(wxVERTICAL);
                _notebook = new wxNotebook(this, wxID_ANY);
-               sizer->Add(_notebook, wxEXPAND | wxALL, 1, DCPOMATIC_DIALOG_BORDER);
-               SetSizerAndFit(sizer);
+               _sizer->Add(_notebook, wxEXPAND | wxALL, 1, DCPOMATIC_DIALOG_BORDER);
+               SetSizerAndFit(_sizer);
        }
 
        optional<shared_ptr<dcp::Reel>> get() {
@@ -171,10 +171,14 @@ public:
                if (_reel->main_subtitle()) {
                        _notebook->AddPage(new AssetPanel(_notebook, _reel->main_subtitle()), _("Subtitle"));
                }
+
+               _sizer->Layout();
+               _sizer->SetSizeHints(this);
        }
 
 private:
        wxNotebook* _notebook = nullptr;
+       wxSizer* _sizer = nullptr;
        shared_ptr<dcp::Reel> _reel;
 };
 
@@ -428,7 +432,7 @@ private:
 
        bool OnInit () override
        {
-               wx_ptr<wxSplashScreen> splash;
+               wxSplashScreen* splash;
                try {
                        wxInitAllImageHandlers ();