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

Fix Hex Editor font/highlight alignment under Mono

This commit is contained in:
YoshiRulz 2021-11-19 01:59:28 +10:00
parent b1b06cc04a
commit 625c657531
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
View File

@ -118,7 +118,9 @@ namespace BizHawk.Client.EmuHawk
RecentTables = new RecentFiles(8);
DataSize = 1;
var font = new Font("Courier New", 8);
Font font = OSTailoredCode.IsUnixHost
? new("Liberation Mono", 9)
: new("Courier New", 8);
// Measure the font. There seems to be some extra horizontal padding on the first
// character so we'll see how much the width increases on the second character.
@ -126,6 +128,8 @@ namespace BizHawk.Client.EmuHawk
var fontSize2 = TextRenderer.MeasureText("00", font);
_fontWidth = fontSize2.Width - fontSize1.Width;
_fontHeight = fontSize1.Height;
const int MAGIC_FIX_NUMBER_H = 4; // don't wanna know
if (OSTailoredCode.IsUnixHost) _fontHeight -= MAGIC_FIX_NUMBER_H;
InitializeComponent();
Icon = Resources.PokeIcon;
@ -1049,6 +1053,14 @@ namespace BizHawk.Client.EmuHawk
var extra = (address % DataSize) * _fontWidth * 2;
var xOffset = AddressesLabel.Location.X + _fontWidth / 2 - 2;
var yOffset = AddressesLabel.Location.Y;
if (OSTailoredCode.IsUnixHost)
{
// don't wanna know
const int MAGIC_FIX_NUMBER_X = -2;
const int MAGIC_FIX_NUMBER_Y = 2;
xOffset += MAGIC_FIX_NUMBER_X;
yOffset += MAGIC_FIX_NUMBER_Y;
}
return new Point(
(int)((((address % 16) / DataSize) * (_fontWidth * (DataSize * 2 + 1))) + xOffset + extra),
@ -1066,6 +1078,8 @@ namespace BizHawk.Client.EmuHawk
int start = (16 / DataSize) * _fontWidth * (DataSize * 2 + 1);
start += AddressesLabel.Location.X + _fontWidth / 2;
start += _fontWidth * 2;
const int MAGIC_FIX_NUMBER_X_ASCII = -3; // don't wanna know
if (OSTailoredCode.IsUnixHost) start += MAGIC_FIX_NUMBER_X_ASCII;
return start;
}