From 2dea3e5b53f8f05ab47a73728d036c312257d577 Mon Sep 17 00:00:00 2001
From: nog5 <43131742+nog5@users.noreply.github.com>
Date: Mon, 10 Sep 2018 10:27:29 +0200
Subject: [PATCH 1/2] lua: forms.drawText() horizontal alignment "right" fix

The lua function forms.drawText() horizontal alignment "right" did the same as "center"
---
 BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs
index ff3db73575..5ed86d46ee 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs
@@ -346,7 +346,7 @@ namespace BizHawk.Client.EmuHawk
 						x -= sizeOfText.Width / 2;
 						break;
 					case "right":
-						x -= sizeOfText.Width / 2;
+						x -= sizeOfText.Width;
 						break;
 				}
 			}

From 6b3071d8a7d14d5374fabd8f9e604651a9fcd166 Mon Sep 17 00:00:00 2001
From: nog5 <43131742+nog5@users.noreply.github.com>
Date: Fri, 14 Sep 2018 23:16:35 +0200
Subject: [PATCH 2/2] lua: drawText() alignment fix

The vertical alignment "top" and "bottom" was backwards
---
 .../tools/Lua/Libraries/EmuLuaLibrary.Gui.cs                | 6 ++++--
 BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs           | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
index 105ac74ee9..d9e6199876 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
@@ -570,6 +570,7 @@ namespace BizHawk.Client.EmuHawk
 							case "left":
 								break;
 							case "center":
+							case "middle":
 								x -= sizeOfText.Width / 2;
 								break;
 							case "right":
@@ -583,12 +584,13 @@ namespace BizHawk.Client.EmuHawk
 						switch (vertalign.ToLower())
 						{
 							default:
-							case "bottom":
+							case "top":
 								break;
+							case "center":
 							case "middle":
 								y -= sizeOfText.Height / 2;
 								break;
-							case "top":
+							case "bottom":
 								y -= sizeOfText.Height;
 								break;
 						}
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs
index 5ed86d46ee..15f812f616 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs
@@ -343,6 +343,7 @@ namespace BizHawk.Client.EmuHawk
 					case "left":
 						break;
 					case "center":
+					case "middle":
 						x -= sizeOfText.Width / 2;
 						break;
 					case "right":
@@ -356,12 +357,13 @@ namespace BizHawk.Client.EmuHawk
 				switch (vertalign.ToLower())
 				{
 					default:
-					case "bottom":
+					case "top":
 						break;
+					case "center":
 					case "middle":
 						y -= sizeOfText.Height / 2;
 						break;
-					case "top":
+					case "bottom":
 						y -= sizeOfText.Height;
 						break;
 				}