X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_view.cc;h=d96b8998fd6cf1d14e4666f2654142528b680be4;hb=d2e8a683eed6fb82d4d255fffaf571ff27057132;hp=dbcbe025911bb902dc00d1edc87bdae833fd7cfa;hpb=341f0a81591ab83b96069d6e6bb70cbf8e6cf878;p=dcpomatic.git diff --git a/src/wx/timeline_view.cc b/src/wx/timeline_view.cc index dbcbe0259..d96b8998f 100644 --- a/src/wx/timeline_view.cc +++ b/src/wx/timeline_view.cc @@ -20,32 +20,33 @@ #include "timeline_view.h" #include "timeline.h" +using std::list; + /** @class TimelineView * @brief Parent class for components of the timeline (e.g. a piece of content or an axis). */ TimelineView::TimelineView (Timeline& t) : _timeline (t) { - + } void -TimelineView::paint (wxGraphicsContext* g) +TimelineView::paint (wxGraphicsContext* g, list > overlaps) { _last_paint_bbox = bbox (); - do_paint (g); + do_paint (g, overlaps); } void TimelineView::force_redraw () { - _timeline.force_redraw (_last_paint_bbox); - _timeline.force_redraw (bbox ()); + _timeline.force_redraw (_last_paint_bbox.extended (4)); + _timeline.force_redraw (bbox().extended (4)); } int TimelineView::time_x (DCPTime t) const { - return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second().get_value_or (0); + return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second().get_value_or (0); } -