From c5c760afa6458e13a2454f08068b66dd87e5e4a8 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Mon, 2 Jun 2025 17:12:27 +1000
Subject: [PATCH] Change behaviour of TAStudio `Columns` > `Show Player #`

partially reverts b62f4bc6a
see #2449
No longer hides the submenu, and toggling individual columns updates the
whole-player checkbox, which is now tri-state.
Same for the "Show Keys" item.
And after all that, Mono doesn't distinguish Indeterminate :P
---
 .../Extensions/ControlExtensions.cs           |  8 ++++
 .../tools/TAStudio/TAStudio.MenuItems.cs      | 45 +++++++++++++++----
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs b/src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
index b25d632af6..1327cce430 100644
--- a/src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
+++ b/src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
@@ -179,6 +179,14 @@ namespace BizHawk.Client.EmuHawk
 
 		public static void ReplaceItems(this ComboBox dropdown, IEnumerable<object> items)
 			=> dropdown.ReplaceItems(items: items.ToArray());
+
+		public static CheckState ToCheckState(this bool? tristate)
+			=> tristate switch
+			{
+				true => CheckState.Checked,
+				false => CheckState.Unchecked,
+				null => CheckState.Indeterminate,
+			};
 	}
 
 	public static class ListViewExtensions
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index 14b595b24c..2c896ac728 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -1194,13 +1194,28 @@ namespace BizHawk.Client.EmuHawk
 
 			if (keysMenus.Length > 0)
 			{
-				var item = new ToolStripMenuItem("Show Keys")
+				ToolStripMenuItem item = new("Show Keys") { CheckOnClick = true };
+				void UpdateAggregateCheckState()
+					=> item.CheckState = keysMenus
+						.SelectMany(static submenu => submenu.DropDownItems.OfType<ToolStripMenuItem>())
+						.Select(static mi => mi.Checked).Unanimity().ToCheckState();
+				UpdateAggregateCheckState();
+				var programmaticallyHidingColumns = false;
+				EventHandler columnHandler = (_, _) =>
 				{
-					CheckOnClick = true,
-					Checked = false,
+					if (programmaticallyHidingColumns) return;
+					programmaticallyHidingColumns = true;
+					UpdateAggregateCheckState();
+					programmaticallyHidingColumns = false;
 				};
+				foreach (var submenu in keysMenus) foreach (ToolStripMenuItem button in submenu.DropDownItems)
+				{
+					button.CheckedChanged += columnHandler;
+				}
 				item.CheckedChanged += (o, ev) =>
 				{
+					if (programmaticallyHidingColumns) return;
+					programmaticallyHidingColumns = true;
 					foreach (var menu in keysMenus)
 					{
 						foreach (ToolStripMenuItem menuItem in menu.DropDownItems)
@@ -1212,6 +1227,7 @@ namespace BizHawk.Client.EmuHawk
 						TasView.AllColumns.ColumnsChanged();
 						TasView.Refresh();
 					}
+					programmaticallyHidingColumns = false;
 				};
 				ColumnsSubMenu.DropDownItems.Add(item);
 			}
@@ -1220,19 +1236,32 @@ namespace BizHawk.Client.EmuHawk
 			{
 				ToolStripMenuItem dummyObject = playerMenus[i];
 				if (!dummyObject.HasDropDownItems) continue;
-				var item = new ToolStripMenuItem($"Show Player {i}")
+				ToolStripMenuItem item = new($"Show Player {i}") { CheckOnClick = true };
+				void UpdateAggregateCheckState()
+					=> item.CheckState = dummyObject.DropDownItems.OfType<ToolStripMenuItem>()
+						.Select(static mi => mi.Checked).Unanimity().ToCheckState();
+				UpdateAggregateCheckState();
+				var programmaticallyHidingColumns = false;
+				EventHandler columnHandler = (_, _) =>
 				{
-					CheckOnClick = true,
-					Checked = dummyObject.DropDownItems.OfType<ToolStripMenuItem>().Any(static mi => mi.Checked),
+					if (programmaticallyHidingColumns) return;
+					programmaticallyHidingColumns = true;
+					UpdateAggregateCheckState();
+					programmaticallyHidingColumns = false;
 				};
+				foreach (ToolStripMenuItem button in dummyObject.DropDownItems)
+				{
+					button.CheckedChanged += columnHandler;
+				}
 				item.CheckedChanged += (o, ev) =>
 				{
-					// TODO: preserve underlying button checked state and make this a master visibility control
+					if (programmaticallyHidingColumns) return;
+					programmaticallyHidingColumns = true;
 					foreach (ToolStripMenuItem menuItem in dummyObject.DropDownItems)
 					{
 						menuItem.Checked = item.Checked;
 					}
-					dummyObject.Visible = item.Checked;
+					programmaticallyHidingColumns = false;
 
 					CurrentTasMovie.FlagChanges();
 					TasView.AllColumns.ColumnsChanged();