diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs b/src/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs index d40ed508fc..91815f3b41 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs @@ -8,8 +8,10 @@ namespace BizHawk.Client.EmuHawk.CustomControls private readonly Pen _currentPen = Pens.Black.GetMutableCopy(); - private readonly SolidBrush _currentBrush = new SolidBrush(Color.Black); - private readonly SolidBrush _currentStringBrush = new SolidBrush(Color.Black); + private readonly SolidBrush _currentBrush = ((SolidBrush) Brushes.Black).GetMutableCopy(); + + private readonly SolidBrush _currentStringBrush = ((SolidBrush) Brushes.Black).GetMutableCopy(); + private Font _currentFont; private bool _rotateString; diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/ViewportPanel.cs b/src/BizHawk.Client.EmuHawk/CustomControls/ViewportPanel.cs index 01f22098aa..073c16c9a8 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/ViewportPanel.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/ViewportPanel.cs @@ -73,8 +73,8 @@ namespace BizHawk.Client.EmuHawk } else { - using (var sb = new SolidBrush(Color.Black)) { + var sb = Brushes.Black; g.FillRectangle(sb, _bmp.Width, 0, Width - _bmp.Width, Height); g.FillRectangle(sb, 0, _bmp.Height, _bmp.Width, Height - _bmp.Height); } diff --git a/src/BizHawk.Client.EmuHawk/Extensions/DrawingExtensions.cs b/src/BizHawk.Client.EmuHawk/Extensions/DrawingExtensions.cs index 03398dbca4..5deb3aebad 100644 --- a/src/BizHawk.Client.EmuHawk/Extensions/DrawingExtensions.cs +++ b/src/BizHawk.Client.EmuHawk/Extensions/DrawingExtensions.cs @@ -6,6 +6,10 @@ namespace BizHawk.Client.EmuHawk { public static class DrawingExtensions { + public static T GetMutableCopy(this T b) + where T : Brush + => (T) b.Clone(); + public static Pen GetMutableCopy(this Pen p) => (Pen) p.Clone(); } diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs index e7a2408ede..dab939ed10 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/PaletteViewer.cs @@ -5,8 +5,9 @@ namespace BizHawk.Client.EmuHawk { public sealed class PaletteViewer : Control { - private readonly SolidBrush BgPalettesBrush = new SolidBrush(Color.Black); - private readonly SolidBrush SpritePalettesBrush = new SolidBrush(Color.Black); + private readonly SolidBrush BgPalettesBrush = ((SolidBrush) Brushes.Black).GetMutableCopy(); + + private readonly SolidBrush SpritePalettesBrush = ((SolidBrush) Brushes.Black).GetMutableCopy(); public class Palette {