Fix crash when adding cinemas while a search is in force (#2378).

[dcpomatic.git] / src / wx / timeline_reels_view.cc

diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc
index 962451ac367b228e2d63ac9062afc430c45d7dce..2ec8f9e8283c06c7008c5a2e51564d9af3f5c339 100644 (file)
--- a/src/wx/timeline_reels_view.cc
+++ b/src/wx/timeline_reels_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,15 +18,22 @@
 
 */
 
-#include "timeline_reels_view.h"
+
 #include "timeline.h"
-#include <wx/wx.h>
+#include "timeline_reels_view.h"
+#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::min;
 using std::list;
 using namespace dcpomatic;
 
+
 TimelineReelsView::TimelineReelsView (Timeline& tl, int y)
        : TimelineView (tl)
        , _y (y)
@@ -34,12 +41,14 @@ TimelineReelsView::TimelineReelsView (Timeline& tl, int y)
 
 }
 
+
 dcpomatic::Rect<int>
 TimelineReelsView::bbox () const
 {
        return dcpomatic::Rect<int> (0, _y - 4, _timeline.width(), 24);
 }
 
+
 void
 TimelineReelsView::set_y (int y)
 {
@@ -47,8 +56,9 @@ TimelineReelsView::set_y (int y)
        force_redraw ();
 }
 
+
 void
-TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
+TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>)
 {
        if (!_timeline.pixels_per_second()) {
                return;
@@ -56,20 +66,21 @@ TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
 
        double const pps = _timeline.pixels_per_second().get ();
 
-       gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 255), 1, wxPENSTYLE_SOLID));
+       wxColour const colour = gui_is_dark() ? wxColour(182, 204, 240) : wxColour(0, 0, 255);
+       gc->SetPen(*wxThePenList->FindOrCreatePen(colour, 1, wxPENSTYLE_SOLID));
 
-       wxGraphicsPath path = gc->CreatePath ();
+       auto path = gc->CreatePath ();
        path.MoveToPoint (time_x (DCPTime (0)), _y);
        path.AddLineToPoint (time_x (_timeline.film()->length()), _y);
        gc->StrokePath (path);
 
-       gc->SetFont (gc->CreateFont (*wxNORMAL_FONT, wxColour (0, 0, 255)));
+       gc->SetFont(gc->CreateFont(*wxNORMAL_FONT, colour));
 
        int reel = 1;
        for (auto i: _timeline.film()->reels()) {
                int const size = min (8.0, i.duration().seconds() * pps / 2);
 
-               wxGraphicsPath path = gc->CreatePath ();
+               auto path = gc->CreatePath ();
                path.MoveToPoint (time_x (i.from) + size, _y + size / 2);
                path.AddLineToPoint (time_x (i.from), _y);
                path.AddLineToPoint (time_x (i.from) + size, _y - size / 2);
@@ -81,17 +92,17 @@ TimelineReelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
                path.AddLineToPoint (time_x (i.to) - size, _y - size / 2);
                gc->StrokePath (path);
 
-               wxString str = wxString::Format (_("Reel %d"), reel++);
+               auto str = wxString::Format (_("Reel %d"), reel++);
                wxDouble str_width;
                wxDouble str_height;
                wxDouble str_descent;
                wxDouble str_leading;
                gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
 
-               int const available_width = time_x (DCPTime (i.to.get())) - time_x (DCPTime (i.from.get()));
+               int const available_width = time_x(DCPTime(i.to.get())) - time_x(DCPTime(i.from.get()));
 
                if (available_width > str_width) {
-                       gc->DrawText (str, time_x (DCPTime (i.from.get())) + (available_width - str_width) / 2, _y + 4);
+                       gc->DrawText (str, time_x(DCPTime(i.from.get())) + (available_width - str_width) / 2, _y + 4);
                }
        }
 }