ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
YoshiRulz 2025-06-02 17:12:27 +10:00
parent 094adb0cb0
commit c5c760afa6
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
View File

@ -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

45
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -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();