From 128c8e6218ef50b7d298b6ee2db319173607bad6 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Thu, 28 Nov 2024 04:45:03 +1000
Subject: [PATCH] Don't open branch/marker edit dialogs at cursor pos

resolves #3714 and #2369
---
 .../tools/TAStudio/BookmarksBranchesBox.cs        |  5 -----
 .../tools/TAStudio/MarkerControl.cs               | 15 +--------------
 .../tools/TAStudio/TAStudio.ListView.cs           |  2 +-
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index 49786f5a37..832e63ab52 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -575,11 +575,6 @@ namespace BizHawk.Client.EmuHawk
 				InitialValue = branch.UserText
 			};
 
-			var point = Cursor.Position;
-			point.Offset(i.Width / -2, i.Height / -2);
-			i.StartPosition = FormStartPosition.Manual;
-			i.Location = point;
-
 			if (this.ShowDialogWithTempMute(i).IsOk())
 			{
 				branch.UserText = i.PromptText;
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
index a5ab900da9..3bfbf6c7b4 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
@@ -175,11 +175,6 @@ namespace BizHawk.Client.EmuHawk
 						""
 				};
 
-				var point = Cursor.Position;
-				point.Offset(i.Width / -2, i.Height / -2);
-				i.StartPosition = FormStartPosition.Manual;
-				i.Location = point;
-
 				if (!this.ShowDialogWithTempMute(i).IsOk()) return;
 
 				UpdateTextColumnWidth();
@@ -210,7 +205,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		public void EditMarkerPopUp(TasMovieMarker marker, bool followCursor = false)
+		public void EditMarkerPopUp(TasMovieMarker marker)
 		{
 			var markerFrame = marker.Frame;
 			var i = new InputPrompt
@@ -224,14 +219,6 @@ namespace BizHawk.Client.EmuHawk
 					: ""
 			};
 
-			if (followCursor)
-			{
-				var point = Cursor.Position;
-				point.Offset(i.Width / -2, i.Height / -2);
-				i.StartPosition = FormStartPosition.Manual;
-				i.Location = point;
-			}
-
 			if (!this.ShowDialogWithTempMute(i).IsOk()) return;
 
 			marker.Message = i.PromptText;
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 8119d78b90..cf0ddd5214 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -903,7 +903,7 @@ namespace BizHawk.Client.EmuHawk
 
 					if (existingMarker != null)
 					{
-						MarkerControl.EditMarkerPopUp(existingMarker, true);
+						MarkerControl.EditMarkerPopUp(existingMarker);
 					}
 					else
 					{