setup another a7800 config dialog to pass in dependencies

This commit is contained in:
adelikat 2019-12-13 16:06:12 -06:00
parent 92768858f7
commit 4d3c423f15
4 changed files with 15 additions and 13 deletions

View File

@ -2048,8 +2048,11 @@ namespace BizHawk.Client.EmuHawk
private void A7800FilterSettingsToolStripMenuItem_Click(object sender, EventArgs e)
{
using var form = new A7800FilterSettings();
form.ShowDialog();
if (Emulator is A7800Hawk atari7800Hawk)
{
using var form = new A7800FilterSettings(this, atari7800Hawk.GetSyncSettings().Clone());
form.ShowDialog();
}
}
#endregion

View File

@ -2365,6 +2365,7 @@ namespace BizHawk.Client.EmuHawk
}
}
// TODO: Get/Put settings/sync settings methods could become a service we instantiate and use and pass to other forms
/// <summary>
/// send core sync settings to emu, setting reboot flag if needed
/// </summary>

View File

@ -1,8 +1,6 @@
using System;
using System.Linq;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Atari.A7800Hawk;
namespace BizHawk.Client.EmuHawk

View File

@ -1,25 +1,26 @@
using System;
using System.Linq;
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Emulation.Cores.Atari.A7800Hawk;
namespace BizHawk.Client.EmuHawk
{
public partial class A7800FilterSettings : Form
{
private A7800Hawk.A7800SyncSettings _syncSettings;
private readonly MainForm _mainForm;
private readonly A7800Hawk.A7800SyncSettings _syncSettings;
public A7800FilterSettings()
public A7800FilterSettings(
MainForm mainForm,
A7800Hawk.A7800SyncSettings syncSettings)
{
_mainForm = mainForm;
_syncSettings = syncSettings;
InitializeComponent();
}
private void A7800FilterSettings_Load(object sender, EventArgs e)
{
_syncSettings = ((A7800Hawk)Global.Emulator).GetSyncSettings().Clone();
var possibleFilters = A7800Hawk.ValidFilterTypes.Select(t => t.Key);
foreach (var val in possibleFilters)
@ -37,8 +38,7 @@ namespace BizHawk.Client.EmuHawk
if (changed)
{
_syncSettings.Filter = Port1ComboBox.SelectedItem.ToString();
GlobalWin.MainForm.PutCoreSyncSettings(_syncSettings);
_mainForm.PutCoreSyncSettings(_syncSettings);
}
DialogResult = DialogResult.OK;
@ -47,7 +47,7 @@ namespace BizHawk.Client.EmuHawk
private void CancelBtn_Click(object sender, EventArgs e)
{
GlobalWin.OSD.AddMessage("Filter settings aborted");
_mainForm.AddOnScreenMessage("Filter settings aborted");
DialogResult = DialogResult.Cancel;
Close();
}