Skip to content

Commit

Permalink
Make preferred core labels more verbose
Browse files Browse the repository at this point in the history
they now display all system choices that they set instead of just the first
  • Loading branch information
Morilli committed Jul 8, 2024
1 parent d74b130 commit 81e2b5b
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/BizHawk.Client.EmuHawk/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ ToolStripItem[] CreateWindowSizeFactorSubmenus()

foreach (var (appliesTo, coreNames) in Config.CorePickerUIData)
{
var groupLabel = appliesTo[0];
var submenu = new ToolStripMenuItem { Text = groupLabel };
var submenu = new ToolStripMenuItem { Text = string.Join(" | ", appliesTo) };
submenu.DropDownItems.AddRange(coreNames.Select(coreName => {
var entry = new ToolStripMenuItem { Text = coreName };
entry.Click += (_, _) =>
Expand All @@ -103,14 +102,13 @@ ToolStripItem[] CreateWindowSizeFactorSubmenus()
}).ToArray());
submenu.DropDownOpened += (openedSender, _1) =>
{
_ = Config.PreferredCores.TryGetValue(groupLabel, out var preferred);
_ = Config.PreferredCores.TryGetValue(appliesTo[0], out var preferred);
if (!coreNames.Contains(preferred))
{
// invalid --> default (doing this here rather than when reading config file to allow for hacked-in values, though I'm not sure if that could do anything at the moment --yoshi)
var defaultCore = coreNames[0];
Console.WriteLine($"setting preferred core for {groupLabel} etc. to {defaultCore} (was {preferred ?? "null"})");
preferred = defaultCore;
foreach (var sysID in appliesTo) Config.PreferredCores[sysID] = preferred;
Console.WriteLine($"setting preferred core for {appliesTo[0]} etc. to {defaultCore} (was {preferred ?? "null"})");
Config.PreferredCores[appliesTo[0]] = preferred = defaultCore;
}
foreach (ToolStripMenuItem entry in ((ToolStripMenuItem) openedSender).DropDownItems) entry.Checked = entry.Text == preferred;
};
Expand Down

0 comments on commit 81e2b5b

Please sign in to comment.