diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-10-12 23:48:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-10-12 23:48:50 +0100 |
| commit | d3beea99d7872607cf85cd59be9caf80901e44de (patch) | |
| tree | bee6c6682b1b888a46d4d86c2dccfca5021a3225 /src | |
| parent | 6c3ec3c0a96fbe60f748d27ae80d492104df86a2 (diff) | |
Fix colours when filling in the preview. Fix outline box position (#1378).
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/film_viewer.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 8ac7e4495..2247f3dd0 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -353,16 +353,17 @@ FilmViewer::paint_panel () #endif if (_out_size.width < _panel_size.width) { - wxPen p (_panel->GetParent()->GetBackgroundColour()); - wxBrush b (_panel->GetParent()->GetBackgroundColour()); + /* XXX: these colours are right for GNOME; may need adjusting for other OS */ + wxPen p (wxColour (240, 240, 240)); + wxBrush b (wxColour (240, 240, 240)); dc.SetPen (p); dc.SetBrush (b); dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height); } if (_out_size.height < _panel_size.height) { - wxPen p (_panel->GetParent()->GetBackgroundColour()); - wxBrush b (_panel->GetParent()->GetBackgroundColour()); + wxPen p (wxColour (240, 240, 240)); + wxBrush b (wxColour (240, 240, 240)); dc.SetPen (p); dc.SetBrush (b); int const gap = (_panel_size.height - _out_size.height) / 2; @@ -374,7 +375,7 @@ FilmViewer::paint_panel () wxPen p (wxColour (255, 0, 0), 2); dc.SetPen (p); dc.SetBrush (*wxTRANSPARENT_BRUSH); - dc.DrawRectangle (_inter_position.x, _inter_position.y, _inter_size.width, _inter_size.height); + dc.DrawRectangle (_inter_position.x, _inter_position.y + (_panel_size.height - _out_size.height) / 2, _inter_size.width, _inter_size.height); } } |