ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1704 from TASVideos/GdipRenderer1 

GdiPlusRenderer: Remove caches, implement Dispose
This commit is contained in:
adelikat 2019-10-26 12:45:16 -05:00 committed by GitHub
parent 5e5f69f07e 4e2818222d
commit e11f3e68e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs
View File

@ -1,28 +1,21 @@
using System;
using System.Collections.Generic;
using System.Drawing;
namespace BizHawk.Client.EmuHawk.CustomControls
{
public class GdiPlusRenderer : IControlRenderer
{
private readonly Dictionary<Color, Pen> _penCache = new Dictionary<Color, Pen>();
private readonly Dictionary<Color, Brush> _brushCache = new Dictionary<Color, Brush>();
private Graphics _graphics;
private Pen _currentPen = new Pen(Color.Black);
private Brush _currentBrush = new SolidBrush(Color.Black);
private Brush _currentStringBrush = new SolidBrush(Color.Black);
private Font _currentFont = new Font("Arial", 8, FontStyle.Bold);
private readonly Pen _currentPen = new Pen(Color.Black);
private readonly SolidBrush _currentBrush = new SolidBrush(Color.Black);
private readonly SolidBrush _currentStringBrush = new SolidBrush(Color.Black);
private readonly Font _defaultFont = new Font("Arial", 8, FontStyle.Bold);
private Font _currentFont;
public GdiPlusRenderer()
{
_currentPen = new Pen(Color.Black);
_penCache.Add(Color.Black, _currentPen);
_currentBrush = new SolidBrush(Color.Black);
_brushCache.Add(Color.Black, _currentBrush);
_currentFont = _defaultFont;
}
private class GdiPlusGraphicsLock : IDisposable
@ -37,7 +30,10 @@ namespace BizHawk.Client.EmuHawk.CustomControls
public void Dispose()
{
// TODO
_currentPen.Dispose();
_currentBrush.Dispose();
_currentStringBrush.Dispose();
_defaultFont.Dispose();
}
public void DrawBitmap(Bitmap bitmap, Point point, bool blend = false)
@ -90,39 +86,17 @@ namespace BizHawk.Client.EmuHawk.CustomControls
}
_currentFont = font;
var result = _brushCache.TryGetValue(color, out Brush brush);
if (!result)
{
brush = new SolidBrush(color);
_brushCache.Add(color, brush);
}
_currentStringBrush = brush;
_currentStringBrush.Color = color;
}
public void SetBrush(Color color)
{
var result = _brushCache.TryGetValue(color, out Brush brush);
if (!result)
{
brush = new SolidBrush(color);
_brushCache.Add(color, brush);
}
_currentBrush = brush;
_currentBrush.Color = color;
}
public void SetSolidPen(Color color)
{
var result = _penCache.TryGetValue(color, out Pen pen);
if (!result)
{
pen = new Pen(color);
_penCache.Add(color, pen);
}
_currentPen = pen;
_currentPen.Color = color;
}
}
}