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

nes config dialogs - pass in dependencies

This commit is contained in:
adelikat 2019-12-15 16:40:43 -06:00
parent 16be999cbc
commit e6ac894955
3 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1653,14 +1653,14 @@ namespace BizHawk.Client.EmuHawk
private void NesControllerSettingsMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is NES)
if (Emulator is NES nes)
{
using var form = new NesControllerSettings();
using var form = new NesControllerSettings(this, nes.GetSyncSettings().Clone());
form.ShowDialog();
}
else if (Emulator is SubNESHawk)
else if (Emulator is SubNESHawk sub)
{
using var form = new NesControllerSettings();
using var form = new NesControllerSettings(this, sub.GetSyncSettings().Clone());
form.ShowDialog();
}
else if (Emulator is QuickNES)

1
BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs
View File

@ -6,7 +6,6 @@ using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Common.NumberExtensions;
namespace BizHawk.Client.EmuHawk
{

29
BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs
View File

@ -1,29 +1,22 @@
using System;
using System.Linq;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Emulation.Cores.Nintendo.SubNESHawk;
namespace BizHawk.Client.EmuHawk
{
public partial class NesControllerSettings : Form
{
private readonly MainForm _mainForm;
private readonly NES.NESSyncSettings _syncSettings;
public NesControllerSettings()
public NesControllerSettings(
MainForm mainForm,
NES.NESSyncSettings syncSettings)
{
_mainForm = mainForm;
_syncSettings = syncSettings;
InitializeComponent();
if (Global.Emulator is NES)
{
_syncSettings = ((NES)Global.Emulator).GetSyncSettings();
}
else
{
_syncSettings = ((SubNESHawk)Global.Emulator).GetSyncSettings();
}
// TODO: use combobox extension and add descriptions to enum values
comboBoxFamicom.Items.AddRange(NESControlSettings.GetFamicomExpansionValues().ToArray());
@ -45,7 +38,7 @@ namespace BizHawk.Client.EmuHawk
private void OkBtn_Click(object sender, EventArgs e)
{
var ctrls = new NESControlSettings
var controls = new NESControlSettings
{
Famicom = checkBoxFamicom.Checked,
FamicomExpPort = (string)comboBoxFamicom.SelectedItem,
@ -53,13 +46,13 @@ namespace BizHawk.Client.EmuHawk
NesRightPort = (string)comboBoxNESR.SelectedItem
};
bool changed = NESControlSettings.NeedsReboot(ctrls, _syncSettings.Controls);
bool changed = NESControlSettings.NeedsReboot(controls, _syncSettings.Controls);
_syncSettings.Controls = ctrls;
_syncSettings.Controls = controls;
if (changed)
{
GlobalWin.MainForm.PutCoreSyncSettings(_syncSettings);
_mainForm.PutCoreSyncSettings(_syncSettings);
}
DialogResult = DialogResult.OK;
@ -68,7 +61,7 @@ namespace BizHawk.Client.EmuHawk
private void CancelBtn_Click(object sender, EventArgs e)
{
GlobalWin.OSD.AddMessage("Controller settings aborted");
_mainForm.AddOnScreenMessage("Controller settings aborted");
DialogResult = DialogResult.Cancel;
Close();
}