diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-02-25 23:27:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-02-25 23:27:47 +0000 |
| commit | 6479ebcd6e8927e58fc308b17d33343fdd8a663b (patch) | |
| tree | 7b5bb086799fa31c9f728d89fa2d3293a0ee76c1 /src | |
| parent | b63c5801cf1932d9d9d886ea8f481b74a8506db6 (diff) | |
Don't draw any overlap for audio views.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/timeline.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index b7f4ec231..ba320bf2f 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -103,7 +103,8 @@ Timeline::paint () list<dcpomatic::Rect<int> > overlaps; BOOST_FOREACH (shared_ptr<TimelineView> j, _views) { shared_ptr<TimelineContentView> jc = dynamic_pointer_cast<TimelineContentView> (j); - if (!ic || !jc || i == j || ic->track() != jc->track() || !ic->active() || !jc->active()) { + /* No overlap with non-content views, views no different tracks, audio views or non-active views */ + if (!ic || !jc || i == j || ic->track() != jc->track() || ic->track().get_value_or(2) >= 2 || !ic->active() || !jc->active()) { continue; } |