From fbd1d6d8e2cd1032ba68088ecfe997d5fdc4760c Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sun, 29 Nov 2015 13:29:07 +0300
Subject: [PATCH] Lua: autoload recent scripts too (unless there's a recent
 session to autoload). pixelText bg tweak.

---
 BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj |  4 +++-
 .../tools/Lua/Libraries/EmuLuaLibrary.Gui.cs         |  2 +-
 BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs       | 12 ++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 3ceb7ebfe2..88b0b3faa6 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -531,7 +531,9 @@
     <Compile Include="CustomControls\ViewportPanel.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="CustomControls\VirtualListView.cs" />
+    <Compile Include="CustomControls\VirtualListView.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="CustomControls\Win32.cs" />
     <Compile Include="DisplayManager\DisplayManager.cs" />
     <Compile Include="DisplayManager\DisplaySurface.cs" />
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
index 01e8422fa5..8576c7d584 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
@@ -606,7 +606,7 @@ namespace BizHawk.Client.EmuHawk
 					}
 					var font = new Font(GlobalWin.DisplayManager.CustomFonts.Families[index], 8, FontStyle.Regular, GraphicsUnit.Pixel);
 					Size sizeOfText = g.MeasureString(message, font, 0, StringFormat.GenericTypographic).ToSize();
-					Rectangle rect = new Rectangle(new Point(x, y), sizeOfText);
+					Rectangle rect = new Rectangle(new Point(x, y - 1), sizeOfText + new Size(1, 2));
 					g.FillRectangle(GetBrush(backcolor ?? DefaultTextBackground.Value), rect);
 					g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
 					g.DrawString(message, font, GetBrush(forecolor ?? DefaultForeground), x, y);
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index 7c4b056c77..a46dc789af 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -97,11 +97,15 @@ namespace BizHawk.Client.EmuHawk
 
 		private void LuaConsole_Load(object sender, EventArgs e)
 		{
-			if (Global.Config.RecentLuaSession.AutoLoad)
+			if (Global.Config.RecentLuaSession.AutoLoad && !Global.Config.RecentLuaSession.Empty)
 			{
-				if (!Global.Config.RecentLuaSession.Empty)
-				{
 					LoadSessionFromRecent(Global.Config.RecentLuaSession[0]);
+			}
+			else if (Global.Config.RecentLua.AutoLoad)
+			{
+				if (!Global.Config.RecentLua.Empty)
+				{
+					LoadLuaFromRecent(Global.Config.RecentLua[0]);
 				}
 			}
 		}
@@ -619,7 +623,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			RecentScriptsSubMenu.DropDownItems.Clear();
 			RecentScriptsSubMenu.DropDownItems.AddRange(
-				Global.Config.RecentLua.RecentMenu(LoadLuaFromRecent));
+				Global.Config.RecentLua.RecentMenu(LoadLuaFromRecent, true));
 		}
 
 		private void NewSessionMenuItem_Click(object sender, EventArgs e)