Hopefully improve layout on high-resolution displays (#1303).

diff --git a/ChangeLog b/ChangeLog
index df09bce5b395f6378128e52eda45d56f33987fd5..7aa6e0f330f3ecf351592a2ba18bde27c65aaec1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-09  Carl Hetherington  <cth@carlh.net>
+
+       * Hopefully improve layout on high-resolution (>2K) displays (#1303).
+
 2019-01-08  Carl Hetherington  <cth@carlh.net>
 
        * Re-analyse audio when DCP channel count changes (#1189).

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 193611f30e0a8de8bdba6729241e9edc243e91ce..b337ff10208ba7265dd37c697dd9824187b56915 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -339,8 +339,8 @@ public:
                right_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6);
 
                wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
-               main_sizer->Add (_film_editor, 1, wxEXPAND | wxALL, 6);
-               main_sizer->Add (right_sizer, 2, wxEXPAND | wxALL, 6);
+               main_sizer->Add (_film_editor, 0, wxEXPAND | wxALL, 6);
+               main_sizer->Add (right_sizer, 1, wxEXPAND | wxALL, 6);
 
                set_menu_sensitivity ();
 

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index e72ca28a18a11b0f667b7dfe545fc0a6d1ea3457..ad3419d148056c11d55881f281cb0d6c58889c0e 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -124,11 +124,11 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
 
                s->Add (b, 0, wxALL, 4);
 
-               _sizer->Add (s, 0, wxEXPAND | wxALL, 6);
+               _sizer->Add (s, 1, wxEXPAND | wxALL, 6);
        }
 
        _notebook = new wxNotebook (_panel, wxID_ANY);
-       _sizer->Add (_notebook, 1, wxEXPAND | wxTOP, 6);
+       _sizer->Add (_notebook, 0, wxEXPAND | wxTOP, 6);
 
        _timing_panel = new TimingPanel (this, _film_viewer);
        _notebook->AddPage (_timing_panel, _("Timing"), false);

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index aee0d6595ae3e8a3ca8743c450545151d94728b6..2fe104563eb16db5d0d35908649bcab1c8f4e50c 100644 (file)
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -39,6 +39,8 @@ ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
 {
        SetScrollRate (8, 8);
        SetSizer (_sizer);
+       /* This stops the notebook collapsing to near-zero size.  The 600 is a guess. */
+       SetMinSize (wxSize(-1, 600));
 
        _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        _sizer->Add (_grid, 0, wxALL, 8);