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

GdiRenderer - cleanup font caching logic and fix rotated text

This commit is contained in:
adelikat 2019-10-26 12:59:30 -05:00
parent e11f3e68e7
commit f6b0fa1550
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GDIRenderer.cs
View File

@ -127,18 +127,7 @@ namespace BizHawk.Client.EmuHawk.CustomControls
public void PrepDrawString(Font font, Color color, bool rotate = false)
{
FontCacheEntry fontEntry;
var result = _fontsCache.TryGetValue(font, out fontEntry);
if (!result)
{
// Hack! The 6 is hardcoded to make tastudio look like taseditor, because taseditor is so perfect and wonderful
_fontsCache.Add(font, new FontCacheEntry
{
HFont = CreateNormalHFont(font, 6),
RotatedHFont = CreateRotatedHFont(font, true)
});
}
var fontEntry = GetCachedHFont(font);
SetGraphicsMode(CurrentHdc, 2); // shouldn't be necessary.. cant hurt
SelectObject(CurrentHdc, rotate ? fontEntry.RotatedHFont : fontEntry.HFont);
SetTextColor(color);
@ -232,22 +221,26 @@ namespace BizHawk.Client.EmuHawk.CustomControls
// Set a resource (e.g. a font) for the current device context.
private void SetFont(Font font)
{
SelectObject(CurrentHdc, GetCachedHFont(font));
var blah = GetCachedHFont(font);
SelectObject(CurrentHdc, blah.HFont);
}
private IntPtr GetCachedHFont(Font font)
private FontCacheEntry GetCachedHFont(Font font)
{
// the original code struck me as bad. attempting to ID fonts by picking a subset of their fields is not gonna work.
// don't call this.Font in InputRoll.cs, it is probably slow.
// consider Fonts to be a jealously guarded resource (they need to be disposed, after all) and manage them carefully.
// this cache maintains the hFonts only.
FontCacheEntry ce;
if (!_fontsCache.TryGetValue(font, out ce))
FontCacheEntry fontEntry;
var result = _fontsCache.TryGetValue(font, out fontEntry);
if (!result)
{
_fontsCache[font] = ce = new FontCacheEntry();
ce.HFont = font.ToHfont();
// Hack! The 6 is hardcoded to make tastudio look like taseditor, because taseditor is so perfect and wonderful
fontEntry = new FontCacheEntry
{
HFont = CreateNormalHFont(font, 6),
RotatedHFont = CreateRotatedHFont(font, true)
};
_fontsCache.Add(font, fontEntry);
}
return ce.HFont;
return fontEntry;
}
#endregion