From 6dbe73d306a7b65542cd5818177163b1317814ec Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Wed, 28 Apr 2021 00:51:29 +1000
Subject: [PATCH] Update Cyotek.Drawing.BitmapFont to 2.0.2 (fixes #2716)

---
 .../BizHawk.Bizware.BizwareGL.csproj              |  2 +-
 src/BizHawk.Bizware.BizwareGL/StringRenderer.cs   | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
index 278f4718cf..4fa8b743b0 100644
--- a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
+++ b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
@@ -8,7 +8,7 @@
 		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="1.3.4" />
+		<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.2" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /><!-- for (extra?) dynamic type support -->
 		<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
diff --git a/src/BizHawk.Bizware.BizwareGL/StringRenderer.cs b/src/BizHawk.Bizware.BizwareGL/StringRenderer.cs
index c58f9c96d3..1e2dc4c101 100644
--- a/src/BizHawk.Bizware.BizwareGL/StringRenderer.cs
+++ b/src/BizHawk.Bizware.BizwareGL/StringRenderer.cs
@@ -105,14 +105,15 @@ namespace BizHawk.Bizware.BizwareGL
 				Texture2d tex = TexturePages[bfc.TexturePage];
 				float w = tex.Width;
 				float h = tex.Height;
-				float u0 = bfc.Bounds.Left / w;
-				float v0 = bfc.Bounds.Top / h;
-				float u1 = bfc.Bounds.Right / w;
-				float v1 = bfc.Bounds.Bottom / h;
+				sd.Rectangle bounds = new(bfc.X, bfc.Y, bfc.Width, bfc.Height);
+				float u0 = bounds.Left / w;
+				float v0 = bounds.Top / h;
+				float u1 = bounds.Right / w;
+				float v1 = bounds.Bottom / h;
 
-				float gx = x + bfc.Offset.X;
-				float gy = y + bfc.Offset.Y;
-				renderer.DrawSubrect(tex, gx, gy, bfc.Bounds.Width, bfc.Bounds.Height, u0, v0, u1, v1);
+				float gx = x + bfc.XOffset;
+				float gy = y + bfc.YOffset;
+				renderer.DrawSubrect(tex, gx, gy, bfc.Width, bfc.Height, u0, v0, u1, v1);
 
 				x += bfc.XAdvance;
 			}