diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-05-08 10:54:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-05-08 10:54:49 +0100 |
| commit | 58e851f428a035841acf0196348a0643230ed808 (patch) | |
| tree | 505c1401445581a39d428b43addefcbe93b324c0 /src/wx/timeline_labels_view.cc | |
| parent | 0e9d03990993bd19a968ee356443a39336e9b8c5 (diff) | |
Show overlapping subs in multiple tracks on the timeline (#941).
Diffstat (limited to 'src/wx/timeline_labels_view.cc')
| -rw-r--r-- | src/wx/timeline_labels_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc index 1a712f42d..ee1b19489 100644 --- a/src/wx/timeline_labels_view.cc +++ b/src/wx/timeline_labels_view.cc @@ -31,7 +31,7 @@ using std::max; TimelineLabelsView::TimelineLabelsView (Timeline& tl) : TimelineView (tl) , _threed (true) - , _subtitle (true) + , _subtitle_tracks (0) , _atmos (true) { wxString labels[] = { @@ -69,8 +69,8 @@ TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> > gc->DrawText (_("Video"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8); fy = ty; - if (_subtitle) { - ty = fy + h; + if (_subtitle_tracks) { + ty = fy + _subtitle_tracks * h; gc->DrawText (_("Subtitles"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8); fy = ty; } @@ -92,9 +92,9 @@ TimelineLabelsView::set_3d (bool s) } void -TimelineLabelsView::set_subtitle (bool s) +TimelineLabelsView::set_subtitle_tracks (int n) { - _subtitle = s; + _subtitle_tracks = n; } void |