X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ftimeline_content_view.cc;h=b520b5ceb2bd40e292709c0ffe254232d016a6ec;hb=0a2d40420813403a96352c6dc895d23fcd9994c0;hp=ed7e1d3d04ac4c13abd145f881360b861dc55593;hpb=e1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a;p=dcpomatic.git diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc index ed7e1d3d0..b520b5ceb 100644 --- a/src/wx/timeline_content_view.cc +++ b/src/wx/timeline_content_view.cc @@ -24,6 +24,7 @@ #include #include +using std::list; using boost::shared_ptr; TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr c) @@ -91,7 +92,7 @@ TimelineContentView::track () const } void -TimelineContentView::do_paint (wxGraphicsContext* gc) +TimelineContentView::do_paint (wxGraphicsContext* gc, list > overlaps) { DCPOMATIC_ASSERT (_track); @@ -132,6 +133,12 @@ TimelineContentView::do_paint (wxGraphicsContext* gc) gc->StrokePath (path); } + /* Overlaps */ + gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (foreground_colour(), wxBRUSHSTYLE_CROSSDIAG_HATCH)); + for (list >::const_iterator i = overlaps.begin(); i != overlaps.end(); ++i) { + gc->DrawRectangle (i->x, i->y + 4, i->width, i->height - 8); + } + /* Label text */ wxString name = std_to_wx (cont->summary()); wxDouble name_width;