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

Fix accelerator on system menu

This commit is contained in:
YoshiRulz 2021-05-14 13:26:18 +10:00
parent f614e41834
commit a9facd895a
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -1905,6 +1905,11 @@ namespace BizHawk.Client.EmuHawk
private void HandlePlatformMenus()
{
if (GenericCoreSubMenu.Visible)
{
var i = GenericCoreSubMenu.Text.IndexOf('&');
if (i != -1) AvailableAccelerators.Add(GenericCoreSubMenu.Text[i + 1]);
}
GenericCoreSubMenu.Visible = false;
TI83SubMenu.Visible = false;
NESSubMenu.Visible = false;
@ -1989,14 +1994,43 @@ namespace BizHawk.Client.EmuHawk
.Where(t => t.GetCustomAttribute<SpecializedToolAttribute>() != null)
.ToList();
private ISet<char> _availableAccelerators;
private ISet<char> AvailableAccelerators
{
get
{
if (_availableAccelerators == null)
{
_availableAccelerators = new HashSet<char>();
for (var c = 'A'; c <= 'Z'; c++) _availableAccelerators.Add(c);
foreach (ToolStripItem item in MainMenuStrip.Items)
{
if (!item.Visible) continue;
var i = item.Text.IndexOf('&');
if (i == -1 || i == item.Text.Length - 1) continue;
_availableAccelerators.Remove(char.ToUpperInvariant(item.Text[i + 1]));
}
}
return _availableAccelerators;
}
}
private void DisplayDefaultCoreMenu()
{
GenericCoreSubMenu.Visible = true;
#if true
GenericCoreSubMenu.Text = Emulator.SystemId;
#else //TODO accelerator; I commented out this naive approach which doesn't work --yoshi
GenericCoreSubMenu.Text = $"&{Emulator.SystemId}";
#endif
var sysID = Emulator.SystemId;
for (var i = 0; i < sysID.Length; i++)
{
var upper = char.ToUpperInvariant(sysID[i]);
if (AvailableAccelerators.Contains(upper))
{
AvailableAccelerators.Remove(upper);
sysID = sysID.Insert(i, "&");
break;
}
}
GenericCoreSubMenu.Text = sysID;
GenericCoreSubMenu.DropDownItems.Clear();
var settingsMenuItem = new ToolStripMenuItem { Text = "&Settings" };