From b101df8235ed1ab4a95faeca4c9c85c3a7a31c1f Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 7 Aug 2020 21:02:07 -0500
Subject: [PATCH] Allow multiple marker selection, and multiple marker
 deletion, also dejunkify some hack workarounds that aren't needed anymore,
 and fix focus issues on input roll

---
 .../CustomControls/InputRoll/InputRoll.cs     |  4 ++++
 .../tools/TAStudio/MarkerControl.Designer.cs  |  3 +--
 .../tools/TAStudio/MarkerControl.cs           | 23 +++----------------
 .../tools/TAStudio/TAStudio.MenuItems.cs      |  2 +-
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
index 797def56b9..94d7854ad6 100644
--- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
+++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
@@ -85,6 +85,10 @@ namespace BizHawk.Client.EmuHawk
 			SetStyle(ControlStyles.Opaque, true);
 			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
 
+			// Deep in the bowels of winform documentation we discover these are necessary if you want your control to be able to have focus
+			SetStyle(ControlStyles.Selectable, true);
+			SetStyle(ControlStyles.UserMouse, true);
+
 			_renderer = new GdiPlusRenderer(Font);
 
 			UpdateCellSize();
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
index 3d89cb05a1..3ea8161d43 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
@@ -176,7 +176,7 @@
 			this.MarkerView.LagFramesToHide = 0;
 			this.MarkerView.LetKeysModifySelection = false;
 			this.MarkerView.Location = new System.Drawing.Point(6, 19);
-			this.MarkerView.MultiSelect = false;
+			this.MarkerView.MultiSelect = true;
 			this.MarkerView.Name = "MarkerView";
 			this.MarkerView.RowCount = 0;
 			this.MarkerView.ScrollSpeed = 1;
@@ -185,7 +185,6 @@
 			this.MarkerView.TabIndex = 0;
 			this.MarkerView.TabStop = false;
 			this.MarkerView.SelectedIndexChanged += new System.EventHandler(this.MarkerView_SelectedIndexChanged);
-			this.MarkerView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MarkerView_MouseClick);
 			this.MarkerView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.MarkerView_MouseDoubleClick);
 			// 
 			// MarkersGroupBox
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
index 702b4e969c..2ae721b862 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
@@ -167,26 +167,14 @@ namespace BizHawk.Client.EmuHawk
 			if (MarkerView.AnyRowsSelected)
 			{
 				SelectedMarkers.ForEach(i => Markers.Remove(i));
-				ShrinkSelection();
+				MarkerView.RowCount = Markers.Count;
 				Tastudio.RefreshDialog();
-				MarkerView_SelectedIndexChanged(null, null);
 			}
 		}
 
-		// feos: not the same as InputRoll.TruncateSelection(), since multiple selection of markers is forbidden
-		// moreover, when the last marker is removed, we need its selection to move to the previous marker
-		// still iterate, so things don't break if multiple selection is allowed someday
-		public void ShrinkSelection()
+		public void UpdateMarkerCount()
 		{
-			if (MarkerView.AnyRowsSelected)
-			{
-				while (MarkerView.SelectedRows.Last() > Markers.Count - 1)
-				{
-					MarkerView.SelectRow(Markers.Count, false);
-					MarkerView.SelectRow(Markers.Count - 1, true);
-				}
-			}
-
+			MarkerView.RowCount = Markers.Count;
 		}
 
 		public void AddMarker(bool editText = false, int? frame = null)
@@ -327,10 +315,5 @@ namespace BizHawk.Client.EmuHawk
 
 			return -1;
 		}
-
-		private void MarkerView_MouseClick(object sender, MouseEventArgs e)
-		{
-			MarkerContextMenu.Close();
-		}
 	}
 }
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index 131525013b..033353d056 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -739,7 +739,7 @@ namespace BizHawk.Client.EmuHawk
 		private void RemoveMarkersMenuItem_Click(object sender, EventArgs e)
 		{
 			CurrentTasMovie.Markers.RemoveAll(m => TasView.SelectedRows.Contains(m.Frame));
-			MarkerControl.ShrinkSelection();
+			MarkerControl.UpdateMarkerCount();
 			RefreshDialog();
 		}