From 012fb6d4640f1353dd1307754d3423cdf58cd09c Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 7 Oct 2013 19:33:06 +0000
Subject: [PATCH] Fix pop up location with the "Go To Address" feature in Hex
 Editor and Ram Search

---
 BizHawk.MultiClient/tools/HexEditor/HexEditor.cs | 7 +++++++
 BizHawk.MultiClient/tools/Watch/RamSearch.cs     | 1 +
 2 files changed, 8 insertions(+)

diff --git a/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs
index 64066e6b79..c8ef23106c 100644
--- a/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor/HexEditor.cs
@@ -523,9 +523,16 @@ namespace BizHawk.MultiClient
 			else return 8;
 		}
 
+		private Point GetPromptPoint()
+		{
+			Point p = new Point(MemoryViewerBox.Location.X + 30, MemoryViewerBox.Location.Y + 30);
+			return PointToScreen(p);
+		}
+
 		public void GoToSpecifiedAddress()
 		{
 			InputPrompt i = new InputPrompt {Text = "Go to Address"};
+			i._Location = GetPromptPoint();
 			i.SetMessage("Enter a hexadecimal value");
 			Global.Sound.StopSound();
 			i.ShowDialog();
diff --git a/BizHawk.MultiClient/tools/Watch/RamSearch.cs b/BizHawk.MultiClient/tools/Watch/RamSearch.cs
index 2fa39aadec..5d1b030abf 100644
--- a/BizHawk.MultiClient/tools/Watch/RamSearch.cs
+++ b/BizHawk.MultiClient/tools/Watch/RamSearch.cs
@@ -766,6 +766,7 @@ namespace BizHawk.MultiClient
 		{
 			WatchListView.SelectedIndices.Clear();
 			InputPrompt i = new InputPrompt { Text = "Go to Address" };
+			i._Location = GetPromptPoint();
 			i.SetMessage("Enter a hexadecimal value");
 			Global.Sound.StopSound();
 			i.ShowDialog();