Merge tag 'v2.16.77' into v2.17.x

2 files changed, 12 insertions, 9 deletions

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 8524c1fe9..cbfd7d4ac 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -75,7 +75,7 @@ SimpleVideoView::paint ()
 	auto scale = 1 / dpi_scale_factor (_panel);
 	dc.SetLogicalScale (scale, scale);
 
-	auto const panel_size = _panel->GetSize ();
+	auto const panel_size = dcp::Size(_panel->GetSize().GetWidth() / scale, _panel->GetSize().GetHeight() / scale);
 	auto pad = pad_colour();
 
 	dcp::Size out_size;
@@ -88,32 +88,32 @@ SimpleVideoView::paint ()
 		out_size = _image->size();
 		wxImage frame (out_size.width, out_size.height, _image->data()[0], true);
 		wxBitmap frame_bitmap (frame);
-		dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
+		dc.DrawBitmap(frame_bitmap, 0, max(0, (panel_size.height - out_size.height) / 2));
 	}
 
-	if (out_size.width < panel_size.GetWidth()) {
+	if (out_size.width < panel_size.width) {
 		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());
+		dc.DrawRectangle(out_size.width, 0, panel_size.width - out_size.width, panel_size.height);
 	}
 
-	if (out_size.height < panel_size.GetHeight()) {
+	if (out_size.height < panel_size.height) {
 		wxPen   p (pad);
 		wxBrush b (pad);
 		dc.SetPen (p);
 		dc.SetBrush (b);
-		int const gap = (panel_size.GetHeight() - out_size.height) / 2;
-		dc.DrawRectangle (0, 0, panel_size.GetWidth(), gap);
-		dc.DrawRectangle (0, gap + out_size.height + 1, panel_size.GetWidth(), gap + 1);
+		int const gap = (panel_size.height - out_size.height) / 2;
+		dc.DrawRectangle(0, 0, panel_size.width, gap);
+		dc.DrawRectangle(0, gap + out_size.height + 1, panel_size.width, gap + 1);
 	}
 
 	if (_viewer->outline_content()) {
 		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);
+		dc.DrawRectangle(_inter_position.x, _inter_position.y + (panel_size.height - out_size.height) / 2, _inter_size.width, _inter_size.height);
 	}
 
 	auto subs = _viewer->outline_subtitles();
diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc
index 6f987de45..260081fe3 100644
--- a/src/wx/supporters.cc
+++ b/src/wx/supporters.cc
@@ -152,6 +152,7 @@ supported_by.Add (wxT ("Jonathan Bygraves"));
 supported_by.Add (wxT ("Kinokriminalitat C.I.C."));
 supported_by.Add (wxT ("Jorge Caballero"));
 supported_by.Add (wxT ("Gemma Rodriguez Cabello"));
+supported_by.Add (wxT ("Pietro Caccavo"));
 supported_by.Add (wxT ("Endcredits Film Club Cairns"));
 supported_by.Add (wxT ("Russell Calabrese"));
 supported_by.Add (wxT ("Steven Calcote"));
@@ -282,6 +283,7 @@ supported_by.Add (wxT ("Thomas Dickens"));
 supported_by.Add (wxT ("Callen Diederichs"));
 supported_by.Add (wxT ("Ageless Digitworks"));
 supported_by.Add (wxT ("Philippe Diier"));
+supported_by.Add (wxT ("Thomas Dineen"));
 supported_by.Add (wxT ("Uwe Dittes"));
 supported_by.Add (wxT ("Dizale"));
 supported_by.Add (wxT ("Hadzi-Aleksandar Djurovic"));
@@ -974,6 +976,7 @@ supported_by.Add (wxT ("CUT productions"));
 supported_by.Add (wxT ("Red Vault Productions"));
 supported_by.Add (wxT ("Zakatak Music Productions"));
 supported_by.Add (wxT ("Richard Anderson Productions"));
+supported_by.Add (wxT ("Pentimenti Productions"));
 supported_by.Add (wxT ("Hitman Productions"));
 supported_by.Add (wxT ("WLFK Productions"));
 supported_by.Add (wxT ("Ceridwen Productions"));