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

Cleanup MainForm interfaces, move ShowDialogAsChild to extension

This commit is contained in:
YoshiRulz 2020-12-01 05:24:58 +10:00 committed by James Groom
parent f0664ce018
commit 8a6c7be6aa
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
View File

@ -159,6 +159,9 @@ namespace BizHawk.Client.EmuHawk
dialogController.StartSound();
return ret;
}
public static DialogResult ShowDialogAsChild(this IDialogParent dialogParent, Form dialog)
=> dialog.ShowDialog(dialogParent.SelfAsHandle);
}
public static class ListViewExtensions

4
src/BizHawk.Client.EmuHawk/IDialogController.cs
View File

@ -1,13 +1,9 @@
#nullable enable
using System.Windows.Forms;
namespace BizHawk.Client.EmuHawk
{
public interface IDialogController
{
DialogResult ShowDialogAsChild(Form dialog);
void StartSound();
void StopSound();

4
src/BizHawk.Client.EmuHawk/IMainFormForConfig.cs
View File

@ -1,11 +1,9 @@
using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk
{
public interface IMainFormForConfig : IDialogController
public interface IMainFormForConfig : IDialogController, IDialogParent
{
/// <remarks>only referenced from <see cref="GenericCoreConfig"/></remarks>
IEmulator Emulator { get; }

3
src/BizHawk.Client.EmuHawk/IMainFormForTools.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Windows.Forms;
using BizHawk.Bizware.BizwareGL;
using BizHawk.Client.Common;
@ -7,7 +6,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk
{
public interface IMainFormForTools : IDialogController
public interface IMainFormForTools : IDialogController, IDialogParent
{
CheatCollection CheatList { get; }

4
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -3464,7 +3464,7 @@ namespace BizHawk.Client.EmuHawk
private int? LoadArchiveChooser(HawkFile file)
{
using var ac = new ArchiveChooser(file);
if (ShowDialogAsChild(ac).IsOk())
if (this.ShowDialogAsChild(ac).IsOk())
{
return ac.SelectedMemberIndex;
}
@ -4495,8 +4495,6 @@ namespace BizHawk.Client.EmuHawk
public IWin32Window SelfAsHandle => this;
public DialogResult ShowDialogAsChild(Form dialog) => dialog.ShowDialog(this);
public void StartSound() => Sound.StartSound();
public void StopSound() => Sound.StopSound();
}