From: Carl Hetherington <cth@carlh.net>
Date: Fri, 15 Jan 2021 11:49:48 +0000 (+0100)
Subject: Fix padding around preview in macOS dark mode (#1897).
X-Git-Tag: v2.15.121~8
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2b72040260c8b38c8986dc1601e36053115b4914

Fix padding around preview in macOS dark mode (#1897).
---

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 342829471..358e4268c 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -75,18 +75,20 @@ SimpleVideoView::paint ()
 		dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
 	}
 
+	auto appearance = wxSystemSettings::GetAppearance();
+	auto const pad_colour = (_viewer->pad_black() || appearance.IsDark()) ? wxColour(0, 0, 0) : wxColour(240, 240, 240);
+
 	if (out_size.width < panel_size.GetWidth()) {
-		/* XXX: these colours are right for GNOME; may need adjusting for other OS */
-		wxPen   p (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
-		wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+		wxPen   p (pad_colour);
+		wxBrush b (pad_colour);
 		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 (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
-		wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+		wxPen   p (pad_colour);
+		wxBrush b (pad_colour);
 		dc.SetPen (p);
 		dc.SetBrush (b);
 		int const gap = (panel_size.GetHeight() - out_size.height) / 2;