X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fsimple_video_view.cc;fp=src%2Fwx%2Fsimple_video_view.cc;h=f5499ad9d4f6b93aa27113f7ed8d19992acd1abe;hp=55b05dfaaf9c641e910c105ac0cfb08cffbfb805;hb=7f641936b00ec87b6eea2ef0a5daa1b1710cf9f4;hpb=03e0b16f47542996b1a711df265bf3dd4fbebdad

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 55b05dfaa..f5499ad9d 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -74,24 +74,19 @@ SimpleVideoView::paint ()
 		dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
 	}
 
-	auto pad_colour = wxColour(240, 240, 240);
-	if (_viewer->pad_black()) {
-		pad_colour = wxColour(0, 0, 0);
-	} else if (gui_is_dark()) {
-		pad_colour = wxColour(50, 50, 50);
-	}
+	auto pad = pad_colour();
 
 	if (out_size.width < panel_size.GetWidth()) {
-		wxPen   p (pad_colour);
-		wxBrush b (pad_colour);
+		wxPen   p (pad);
+		wxBrush b (pad);
 		dc.SetPen (p);
 		dc.SetBrush (b);
 		dc.DrawRectangle (out_size.width, 0, panel_size.GetWidth() - out_size.width, panel_size.GetHeight());
 	}
 
 	if (out_size.height < panel_size.GetHeight()) {
-		wxPen   p (pad_colour);
-		wxBrush b (pad_colour);
+		wxPen   p (pad);
+		wxBrush b (pad);
 		dc.SetPen (p);
 		dc.SetBrush (b);
 		int const gap = (panel_size.GetHeight() - out_size.height) / 2;
@@ -100,7 +95,7 @@ SimpleVideoView::paint ()
 	}
 
 	if (_viewer->outline_content()) {
-		wxPen p (wxColour (255, 0, 0), 2);
+		wxPen p (outline_content_colour(), 2);
 		dc.SetPen (p);
 		dc.SetBrush (*wxTRANSPARENT_BRUSH);
 		dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height);
@@ -108,7 +103,7 @@ SimpleVideoView::paint ()
 
 	auto subs = _viewer->outline_subtitles();
 	if (subs) {
-		wxPen p (wxColour(0, 255, 0), 2);
+		wxPen p (outline_subtitles_colour(), 2);
 		dc.SetPen (p);
 		dc.SetBrush (*wxTRANSPARENT_BRUSH);
 		dc.DrawRectangle (subs->x * out_size.width, subs->y * out_size.height, subs->width * out_size.width, subs->height * out_size.height);