diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-09-18 01:11:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-09-18 01:11:35 +0100 |
| commit | b21103a67ef8e0e53b338b16da87ca445ba166d1 (patch) | |
| tree | 7df9aa6d3d7f6aa56bc306284e3a17d14d4b99b4 /src | |
| parent | e853aeb50f1a16d534b1174b5863e4da238dd1cb (diff) | |
Vertically-centre playback.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 3b231f811..dbd5b0fb6 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -167,7 +167,7 @@ public: _viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this)); _info = new PlayerInformation (_overall_panel, _viewer); wxSizer* main_sizer = new wxBoxSizer (wxVERTICAL); - main_sizer->Add (_viewer->panel(), 1, wxEXPAND); + main_sizer->Add (_viewer->panel(), 1, wxEXPAND | wxALIGN_CENTER_VERTICAL); main_sizer->Add (_controls, 0, wxEXPAND | wxALL, 6); main_sizer->Add (_info, 0, wxEXPAND | wxALL, 6); _overall_panel->SetSizer (main_sizer); diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index d5d391a80..86805f146 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -317,7 +317,7 @@ FilmViewer::paint_panel () wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); wxBitmap frame_bitmap (frame); - dc.DrawBitmap (frame_bitmap, 0, 0); + dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2)); if (_out_size.width < _panel_size.width) { wxPen p (_panel->GetParent()->GetBackgroundColour()); @@ -332,7 +332,9 @@ FilmViewer::paint_panel () wxBrush b (_panel->GetParent()->GetBackgroundColour()); dc.SetPen (p); dc.SetBrush (b); - dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height); + int const gap = (_panel_size.height - _out_size.height) / 2; + dc.DrawRectangle (0, gap, _panel_size.width, gap); + dc.DrawRectangle (0, gap + _out_size.height, _panel_size.width, gap); } if (_outline_content) { |