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

refactor coleco config dialog

This commit is contained in:
adelikat 2019-12-15 15:55:05 -06:00
parent 5fb547a09c
commit 8c5b13097a
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2242,8 +2242,11 @@ namespace BizHawk.Client.EmuHawk
private void ColecoControllerSettingsMenuItem_Click(object sender, EventArgs e) private void ColecoControllerSettingsMenuItem_Click(object sender, EventArgs e)
{ {
using var form = new ColecoControllerSettings(); if (Emulator is ColecoVision coleco)
form.ShowDialog(); {
using var form = new ColecoControllerSettings(this, coleco.GetSyncSettings().Clone());
form.ShowDialog();
}
} }
#endregion #endregion

17
BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs
View File

@ -1,25 +1,26 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.ColecoVision; using BizHawk.Emulation.Cores.ColecoVision;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
public partial class ColecoControllerSettings : Form public partial class ColecoControllerSettings : Form
{ {
private ColecoVision.ColecoSyncSettings _syncSettings; private readonly MainForm _mainForm;
private readonly ColecoVision.ColecoSyncSettings _syncSettings;
public ColecoControllerSettings() public ColecoControllerSettings(
MainForm mainForm,
ColecoVision.ColecoSyncSettings settings)
{ {
_mainForm = mainForm;
_syncSettings = settings;
InitializeComponent(); InitializeComponent();
} }
private void ColecoControllerSettings_Load(object sender, EventArgs e) private void ColecoControllerSettings_Load(object sender, EventArgs e)
{ {
_syncSettings = ((ColecoVision)Global.Emulator).GetSyncSettings().Clone();
var possibleControllers = ColecoVisionControllerDeck.ValidControllerTypes.Select(t => t.Key); var possibleControllers = ColecoVisionControllerDeck.ValidControllerTypes.Select(t => t.Key);
foreach (var val in possibleControllers) foreach (var val in possibleControllers)
@ -43,7 +44,7 @@ namespace BizHawk.Client.EmuHawk
_syncSettings.Port1 = Port1ComboBox.SelectedItem.ToString(); _syncSettings.Port1 = Port1ComboBox.SelectedItem.ToString();
_syncSettings.Port2 = Port2ComboBox.SelectedItem.ToString(); _syncSettings.Port2 = Port2ComboBox.SelectedItem.ToString();
GlobalWin.MainForm.PutCoreSyncSettings(_syncSettings); _mainForm.PutCoreSyncSettings(_syncSettings);
} }
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
@ -52,7 +53,7 @@ namespace BizHawk.Client.EmuHawk
private void CancelBtn_Click(object sender, EventArgs e) private void CancelBtn_Click(object sender, EventArgs e)
{ {
GlobalWin.OSD.AddMessage("Controller settings aborted"); _mainForm.AddOnScreenMessage("Controller settings aborted");
DialogResult = DialogResult.Cancel; DialogResult = DialogResult.Cancel;
Close(); Close();
} }