From 9bc3e182f913a641358453886cc5f4fc40b3ad8a Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Fri, 24 May 2024 22:52:58 -0700
Subject: [PATCH] Fix DrawBox calculation

---
 .../Api/Classes/GuiApi.cs                     | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs b/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs
index efad8cdd53..bfeb84d5ac 100644
--- a/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs
+++ b/src/BizHawk.Client.Common/Api/Classes/GuiApi.cs
@@ -169,28 +169,19 @@ namespace BizHawk.Client.Common
 		{
 			try
 			{
-				int w;
-				if (x < x2)
+				if (x > x2)
 				{
-					w = x2 - x;
+					(x, x2) = (x2, x);
 				}
-				else
+
+				if (y > y2)
 				{
-					x2 = x - x2;
-					x -= x2;
-					w = Math.Max(x2, 1);
-				}
-				int h;
-				if (y < y2)
-				{
-					h = y2 - y;
-				}
-				else
-				{
-					y2 = y - y2;
-					y -= y2;
-					h = Math.Max(y2, 1);
+					(y, y2) = (y2, y);
 				}
+
+				var w = x2 - x + 1;
+				var h = y2 - y + 1;
+
 				var r = Get2DRenderer(surfaceID);
 				r.CompositingMode = _compositingMode;
 				r.DrawRectangle(line ?? _defaultForeground, x, y, w, h);