diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-25 00:32:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-04-25 00:32:58 +0100 |
| commit | 740977ac39b3b1ae64bd06efce0a3bf9d188dd67 (patch) | |
| tree | 97272e97cecceffe4282420d300ae33caea75dc9 /src | |
| parent | 7bd4ecce60488f7f7cfbdcc16ba7022b979a891d (diff) | |
Move reel markers to the top of the timeline (#846).
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/timeline.cc | 4 | ||||
| -rw-r--r-- | src/wx/timeline_labels_view.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 9a86ada12..786d70721 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -77,7 +77,7 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film) SetMinSize (wxSize (640, tracks() * track_height() + 96)); - _tracks_position = Position<int> (_labels_view->bbox().width, 8); + _tracks_position = Position<int> (_labels_view->bbox().width, 32); _film_changed_connection = film->Changed.connect (bind (&Timeline::film_changed, this, _1)); _film_content_changed_connection = film->ContentChanged.connect (bind (&Timeline::film_content_changed, this, _2, _3)); @@ -246,7 +246,7 @@ Timeline::assign_tracks () } _time_axis_view->set_y (tracks() * track_height() + 64); - _reels_view->set_y (tracks() * track_height() + 32); + _reels_view->set_y (8); } int diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc index 9b55c2bd0..3a809bfff 100644 --- a/src/wx/timeline_labels_view.cc +++ b/src/wx/timeline_labels_view.cc @@ -58,7 +58,7 @@ TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> > { int const h = _timeline.track_height (); gc->SetFont (gc->CreateFont(wxNORMAL_FONT->Bold(), wxColour (0, 0, 0))); - gc->DrawText (_("Video"), 0, h / 2); - gc->DrawText (_("Subtitles"), 0, 5 * h / 2); - gc->DrawText (_("Audio"), 0, h + max (_timeline.tracks(), 2) * h / 2); + gc->DrawText (_("Video"), 0, _timeline.tracks_position().y + h - 8); + gc->DrawText (_("Subtitles"), 0, _timeline.tracks_position().y + 5 * h / 2 - 8); + gc->DrawText (_("Audio"), 0, _timeline.tracks_position().y + (3 + max (_timeline.tracks(), 3)) * h / 2 - 8); } |