Don't position tools to last saved position if that position is not visible on screen

BizHawk.Client.Common/config/ToolDialogSettings.cs

@@ -1,6 +1,8 @@
-using System.Drawing;
+using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
+
 using Newtonsoft.Json;
 
 namespace BizHawk.Client.Common
@@ -56,6 +58,25 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		/// <summary>
+		/// Represents the top left corner coordinate, if Wndx and Wndy form a valid point
+		/// Throws an InvalidOperationException if Wndx or Wndy is null
+		/// It is expected to check for this before using this property
+		/// </summary>
+		[JsonIgnore]
+		public Point TopLeft
+		{
+			get
+			{
+				if (_wndx.HasValue && _wndy.HasValue)
+				{
+					return new Point(_wndx.Value, _wndy.Value);
+				}
+
+				throw new InvalidOperationException("TopLeft can not be used when one of the coordinates is null");
+			}
+		}
+
 		public int? Width { get; set; }
 		public int? Height { get; set; }
 

BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs

@@ -212,7 +212,7 @@ namespace BizHawk.Client.EmuHawk
 			_defaultWidth = Size.Width;
 			_defaultHeight = Size.Height;
 
-			if (Settings.UseWindowPosition)
+			if (Settings.UseWindowPosition && IsOnScreen(Settings.TopLeft))
 			{
 				Location = Settings.WindowPosition;
 			}

BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs

@@ -25,7 +25,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void TI83KeyPad_Load(object sender, EventArgs e)
 		{
-			if (Global.Config.TI83KeypadSettings.UseWindowPosition)
+			if (Global.Config.TI83KeypadSettings.UseWindowPosition && IsOnScreen(Global.Config.TI83KeypadSettings.TopLeft))
 			{
 				Location = Global.Config.TI83KeypadSettings.WindowPosition;
 			}

BizHawk.Client.EmuHawk/tools/ToolHelpers.cs

@@ -9,6 +9,7 @@ using BizHawk.Emulation.Common.IEmulatorExtensions;
 
 using BizHawk.Client.Common;
 using BizHawk.Client.EmuHawk.WinFormExtensions;
+using System.Drawing;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -131,5 +132,10 @@ namespace BizHawk.Client.EmuHawk
 		{
 			Owner = floatingWindow ? null : GlobalWin.MainForm;
 		}
+
+		protected bool IsOnScreen(Point topLeft)
+		{
+			return ToolManager.IsOnScreen(topLeft);
+		}
 	}
 }

BizHawk.Client.EmuHawk/tools/ToolManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -244,7 +245,7 @@ namespace BizHawk.Client.EmuHawk
 
 			RefreshSettings(form, dest, settings, idx);
 
-			if (settings.UseWindowPosition)
+			if (settings.UseWindowPosition && IsOnScreen(settings.TopLeft))
 			{
 				form.StartPosition = FormStartPosition.Manual;
 				form.Location = settings.WindowPosition;
@@ -364,6 +365,12 @@ namespace BizHawk.Client.EmuHawk
 			return false;
 		}
 
+		public static bool IsOnScreen(Point topLeft)
+		{
+			return Screen.AllScreens.Any(
+				screen => screen.WorkingArea.Contains(topLeft));
+		}
+
 		/// <summary>
 		/// Returns true if an instance of T exists
 		/// </summary>

BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs

@@ -233,7 +233,7 @@ namespace BizHawk.Client.EmuHawk
 			_defaultWidth = Size.Width;
 			_defaultHeight = Size.Height;
 
-			if (Settings.UseWindowPosition)
+			if (Settings.UseWindowPosition && IsOnScreen(Settings.TopLeft))
 			{
 				Location = Settings.WindowPosition;
 			}

BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs

@@ -464,7 +464,7 @@ namespace BizHawk.Client.EmuHawk
 			_defaultWidth = Size.Width;
 			_defaultHeight = Size.Height;
 
-			if (Settings.UseWindowPosition)
+			if (Settings.UseWindowPosition && IsOnScreen(Settings.TopLeft))
 			{
 				Location = Settings.WindowPosition;
 			}