diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-01-09 01:00:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-01-09 01:00:30 +0000 |
| commit | 9549ecffd4b63e48a2a3f4c58033691a36eee111 (patch) | |
| tree | b10a81225f456b132d4ddf551c0fb5a481045dff | |
| parent | 2aeff3a6c0ecf5fc0e8f13c4dc580ae5dfb464f2 (diff) | |
Hopefully improve layout on high-resolution displays (#1303).
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic.cc | 4 | ||||
| -rw-r--r-- | src/wx/content_panel.cc | 4 | ||||
| -rw-r--r-- | src/wx/content_sub_panel.cc | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -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 193611f30..b337ff102 100644 --- 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 e72ca28a1..ad3419d14 100644 --- 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 aee0d6595..2fe104563 100644 --- 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); |