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

Pass delegates instead of MainForm to EmuHawkOptions

This commit is contained in:
YoshiRulz 2020-06-29 14:11:52 +10:00
parent b40812798b
commit 4f4a875382
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1023,9 +1023,17 @@ namespace BizHawk.Client.EmuHawk
: "Rom Extension Preferences cancelled");
}
private void BumpAutoFlushSaveRamTimer()
{
if (AutoFlushSaveRamIn > Config.FlushSaveRamFrames)
{
AutoFlushSaveRamIn = Config.FlushSaveRamFrames;
}
}
private void CustomizeMenuItem_Click(object sender, EventArgs e)
{
using var form = new EmuHawkOptions(this, Config);
using var form = new EmuHawkOptions(BumpAutoFlushSaveRamTimer, Config, this.AddOnScreenMessage);
form.ShowDialog();
}

21
src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs
View File

@ -6,13 +6,17 @@ namespace BizHawk.Client.EmuHawk
{
public partial class EmuHawkOptions : Form
{
private readonly MainForm _mainForm;
private readonly Action _autoFlushSaveRamTimerBumpCallback;
private readonly Config _config;
public EmuHawkOptions(MainForm mainForm, Config config)
private readonly Action<string> _osdMessageCallback;
public EmuHawkOptions(Action autoFlushSaveRamTimerBumpCallback, Config config, Action<string> osdMessageCallback)
{
_mainForm = mainForm;
_autoFlushSaveRamTimerBumpCallback = autoFlushSaveRamTimerBumpCallback;
_config = config;
_osdMessageCallback = osdMessageCallback;
InitializeComponent();
}
@ -121,10 +125,7 @@ namespace BizHawk.Client.EmuHawk
_config.BackupSaveram = BackupSRamCheckbox.Checked;
_config.AutosaveSaveRAM = AutosaveSRAMCheckbox.Checked;
_config.FlushSaveRamFrames = AutosaveSaveRAMSeconds * 60;
if (_mainForm.AutoFlushSaveRamIn > _config.FlushSaveRamFrames)
{
_mainForm.AutoFlushSaveRamIn = _config.FlushSaveRamFrames;
}
_autoFlushSaveRamTimerBumpCallback();
_config.SkipLagFrame = FrameAdvSkipLagCheckbox.Checked;
_config.RunLuaDuringTurbo = LuaDuringTurboCheckbox.Checked;
@ -141,10 +142,10 @@ namespace BizHawk.Client.EmuHawk
_config.LuaEngine = ELuaEngine.NLuaPlusKopiLua;
}
_mainForm.AddOnScreenMessage("Custom configurations saved.");
_osdMessageCallback("Custom configurations saved.");
if (prevLuaEngine != _config.LuaEngine)
{
_mainForm.AddOnScreenMessage("Restart emulator for Lua change to take effect");
_osdMessageCallback("Restart emulator for Lua change to take effect");
}
Close();
@ -155,7 +156,7 @@ namespace BizHawk.Client.EmuHawk
{
Close();
DialogResult = DialogResult.Cancel;
_mainForm.AddOnScreenMessage("Customizing aborted.");
_osdMessageCallback("Customizing aborted.");
}
private void AcceptBackgroundInputCheckbox_CheckedChanged(object sender, EventArgs e)