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

Clean up some `DropDownOpened` handlers for disk switch submenus

This commit is contained in:
YoshiRulz 2024-07-14 05:25:22 +10:00
parent 65979e61ec
commit b2184e46d5
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 64 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1817,21 +1817,21 @@ namespace BizHawk.Client.EmuHawk
{ {
AppleDisksSubMenu.DropDownItems.Clear(); AppleDisksSubMenu.DropDownItems.Clear();
if (Emulator is not AppleII appleII) return; if (Emulator is not AppleII appleII) return;
EventHandler clickHandler = (clickSender, _) =>
{
if (!object.ReferenceEquals(appleII, Emulator)) return;
appleII.SetDisk((int) ((Control) clickSender).Tag);
};
var selected = appleII.CurrentDisk;
for (int i = 0; i < appleII.DiskCount; i++) for (int i = 0; i < appleII.DiskCount; i++)
{ {
var menuItem = new ToolStripMenuItem ToolStripMenuItem menuItem = new()
{ {
Name = $"Disk{i + 1}", Checked = i == selected,
Tag = i,
Text = $"Disk{i + 1}", Text = $"Disk{i + 1}",
Checked = appleII.CurrentDisk == i
}; };
menuItem.Click += clickHandler;
int dummy = i;
menuItem.Click += (o, ev) =>
{
appleII.SetDisk(dummy);
};
AppleDisksSubMenu.DropDownItems.Add(menuItem); AppleDisksSubMenu.DropDownItems.Add(menuItem);
} }
} }
@ -1846,21 +1846,21 @@ namespace BizHawk.Client.EmuHawk
{ {
C64DisksSubMenu.DropDownItems.Clear(); C64DisksSubMenu.DropDownItems.Clear();
if (Emulator is not C64 c64) return; if (Emulator is not C64 c64) return;
EventHandler clickHandler = (clickSender, _) =>
{
if (!object.ReferenceEquals(c64, Emulator)) return;
c64.SetDisk((int) ((Control) clickSender).Tag);
};
var selected = c64.CurrentDisk;
for (int i = 0; i < c64.DiskCount; i++) for (int i = 0; i < c64.DiskCount; i++)
{ {
var menuItem = new ToolStripMenuItem ToolStripMenuItem menuItem = new()
{ {
Name = $"Disk{i + 1}", Checked = i == selected,
Tag = i,
Text = $"Disk{i + 1}", Text = $"Disk{i + 1}",
Checked = c64.CurrentDisk == i
}; };
menuItem.Click += clickHandler;
int dummy = i;
menuItem.Click += (o, ev) =>
{
c64.SetDisk(dummy);
};
C64DisksSubMenu.DropDownItems.Add(menuItem); C64DisksSubMenu.DropDownItems.Add(menuItem);
} }
} }
@ -1968,58 +1968,46 @@ namespace BizHawk.Client.EmuHawk
{ {
ZXSpectrumTapesSubMenu.DropDownItems.Clear(); ZXSpectrumTapesSubMenu.DropDownItems.Clear();
if (Emulator is not ZXSpectrum speccy) return; if (Emulator is not ZXSpectrum speccy) return;
List<ToolStripItem> items = new(); EventHandler clickHandler = (clickSender, _) =>
{
if (!object.ReferenceEquals(speccy, Emulator)) return;
speccy._machine.TapeMediaIndex = (int) ((Control) clickSender).Tag;
};
var tapeMediaIndex = speccy._machine.TapeMediaIndex; var tapeMediaIndex = speccy._machine.TapeMediaIndex;
for (int i = 0; i < speccy._tapeInfo.Count; i++) for (int i = 0; i < speccy._tapeInfo.Count; i++)
{ {
string name = speccy._tapeInfo[i].Name; ToolStripMenuItem menuItem = new()
var menuItem = new ToolStripMenuItem
{ {
Name = $"{i}_{name}", Checked = i == tapeMediaIndex,
Text = $"{i}: {name}", Tag = i,
Checked = tapeMediaIndex == i Text = $"{i}: {speccy._tapeInfo[i].Name}",
}; };
menuItem.Click += clickHandler;
int dummy = i; ZXSpectrumTapesSubMenu.DropDownItems.Add(menuItem);
menuItem.Click += (o, ev) =>
{
speccy._machine.TapeMediaIndex = dummy;
};
items.Add(menuItem);
} }
ZXSpectrumTapesSubMenu.DropDownItems.AddRange(items.ToArray());
} }
private void ZXSpectrumDisksSubMenu_DropDownOpened(object sender, EventArgs e) private void ZXSpectrumDisksSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
ZXSpectrumDisksSubMenu.DropDownItems.Clear(); ZXSpectrumDisksSubMenu.DropDownItems.Clear();
if (Emulator is not ZXSpectrum speccy) return; if (Emulator is not ZXSpectrum speccy) return;
List<ToolStripItem> items = new(); EventHandler clickHandler = (clickSender, _) =>
{
if (!object.ReferenceEquals(speccy, Emulator)) return;
speccy._machine.DiskMediaIndex = (int) ((Control) clickSender).Tag;
};
var diskMediaIndex = speccy._machine.DiskMediaIndex; var diskMediaIndex = speccy._machine.DiskMediaIndex;
for (int i = 0; i < speccy._diskInfo.Count; i++) for (int i = 0; i < speccy._diskInfo.Count; i++)
{ {
string name = speccy._diskInfo[i].Name; ToolStripMenuItem menuItem = new()
var menuItem = new ToolStripMenuItem
{ {
Name = $"{i}_{name}", Checked = i == diskMediaIndex,
Text = $"{i}: {name}", Tag = i,
Checked = diskMediaIndex == i Text = $"{i}: {speccy._diskInfo[i].Name}",
}; };
menuItem.Click += clickHandler;
int dummy = i; ZXSpectrumDisksSubMenu.DropDownItems.Add(menuItem);
menuItem.Click += (o, ev) =>
{
speccy._machine.DiskMediaIndex = dummy;
};
items.Add(menuItem);
} }
ZXSpectrumDisksSubMenu.DropDownItems.AddRange(items.ToArray());
} }
private void ZXSpectrumExportSnapshotMenuItemMenuItem_Click(object sender, EventArgs e) private void ZXSpectrumExportSnapshotMenuItemMenuItem_Click(object sender, EventArgs e)
@ -2087,58 +2075,46 @@ namespace BizHawk.Client.EmuHawk
{ {
AmstradCPCTapesSubMenu.DropDownItems.Clear(); AmstradCPCTapesSubMenu.DropDownItems.Clear();
if (Emulator is not AmstradCPC ams) return; if (Emulator is not AmstradCPC ams) return;
List<ToolStripItem> items = new(); EventHandler clickHandler = (clickSender, _) =>
{
if (!object.ReferenceEquals(ams, Emulator)) return;
ams._machine.TapeMediaIndex = (int) ((Control) clickSender).Tag;
};
var tapeMediaIndex = ams._machine.TapeMediaIndex; var tapeMediaIndex = ams._machine.TapeMediaIndex;
for (int i = 0; i < ams._tapeInfo.Count; i++) for (int i = 0; i < ams._tapeInfo.Count; i++)
{ {
string name = ams._tapeInfo[i].Name; ToolStripMenuItem menuItem = new()
var menuItem = new ToolStripMenuItem
{ {
Name = $"{i}_{name}", Checked = i == tapeMediaIndex,
Text = $"{i}: {name}", Tag = i,
Checked = tapeMediaIndex == i Text = $"{i}: {ams._tapeInfo[i].Name}",
}; };
menuItem.Click += clickHandler;
int dummy = i; AmstradCPCTapesSubMenu.DropDownItems.Add(menuItem);
menuItem.Click += (o, ev) =>
{
ams._machine.TapeMediaIndex = dummy;
};
items.Add(menuItem);
} }
AmstradCPCTapesSubMenu.DropDownItems.AddRange(items.ToArray());
} }
private void AmstradCpcDisksSubMenu_DropDownOpened(object sender, EventArgs e) private void AmstradCpcDisksSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
AmstradCPCDisksSubMenu.DropDownItems.Clear(); AmstradCPCDisksSubMenu.DropDownItems.Clear();
if (Emulator is not AmstradCPC ams) return; if (Emulator is not AmstradCPC ams) return;
List<ToolStripItem> items = new(); EventHandler clickHandler = (clickSender, _) =>
{
if (!object.ReferenceEquals(ams, Emulator)) return;
ams._machine.DiskMediaIndex = (int) ((Control) clickSender).Tag;
};
var diskMediaIndex = ams._machine.DiskMediaIndex; var diskMediaIndex = ams._machine.DiskMediaIndex;
for (int i = 0; i < ams._diskInfo.Count; i++) for (int i = 0; i < ams._diskInfo.Count; i++)
{ {
string name = ams._diskInfo[i].Name; ToolStripMenuItem menuItem = new()
var menuItem = new ToolStripMenuItem
{ {
Name = $"{i}_{name}", Checked = i == diskMediaIndex,
Text = $"{i}: {name}", Tag = i,
Checked = diskMediaIndex == i Text = $"{i}: {ams._diskInfo[i].Name}",
}; };
menuItem.Click += clickHandler;
int dummy = i; AmstradCPCDisksSubMenu.DropDownItems.Add(menuItem);
menuItem.Click += (o, ev) =>
{
ams._machine.DiskMediaIndex = dummy;
};
items.Add(menuItem);
} }
AmstradCPCDisksSubMenu.DropDownItems.AddRange(items.ToArray());
} }
private DialogResult OpenCPCHawkSettingsDialog(ISettingsAdapter settable) private DialogResult OpenCPCHawkSettingsDialog(ISettingsAdapter settable)