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

remove designer null check hacks in favor of the intended DesignMode flag

This commit is contained in:
adelikat 2020-03-01 16:49:37 -06:00
parent 0414e15a75
commit 1337beed1b
4 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
BizHawk.Client.EmuHawk/config/N64/N64ControllerSettingControl.cs
View File

@ -34,29 +34,16 @@ namespace BizHawk.Client.EmuHawk
set set
{ {
EnabledCheckbox.Checked = value; EnabledCheckbox.Checked = value;
if (PakTypeDropdown != null) // Null check for designer PakTypeDropdown.Enabled = value;
{
PakTypeDropdown.Enabled = value;
}
Refresh(); Refresh();
} }
} }
public N64SyncSettings.N64ControllerSettings.N64ControllerPakType PakType public N64SyncSettings.N64ControllerSettings.N64ControllerPakType PakType
{ {
get get => PakTypeDropdown.SelectedItem
{ .ToString()
if (PakTypeDropdown.SelectedItem != null) // Null check for designer .GetEnumFromDescription<N64SyncSettings.N64ControllerSettings.N64ControllerPakType>();
{
return PakTypeDropdown.SelectedItem
.ToString()
.GetEnumFromDescription<N64SyncSettings.N64ControllerSettings.N64ControllerPakType>();
}
return N64SyncSettings.N64ControllerSettings.N64ControllerPakType.NO_PAK;
}
set set
{ {
if (PakTypeDropdown.Items.Count > 0) // Null check for designer if (PakTypeDropdown.Items.Count > 0) // Null check for designer

5
BizHawk.Client.EmuHawk/config/N64/N64ControllersSetup.cs
View File

@ -28,6 +28,11 @@ namespace BizHawk.Client.EmuHawk
private void N64ControllersSetup_Load(object sender, EventArgs e) private void N64ControllersSetup_Load(object sender, EventArgs e)
{ {
if (DesignMode)
{
return;
}
ControllerSettingControls ControllerSettingControls
.ForEach(c => .ForEach(c =>
{ {

22
BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
View File

@ -37,19 +37,21 @@ namespace BizHawk.Client.EmuHawk
public void Restart() public void Restart()
{ {
if (MemoryDomains != null) // the designer needs this check if (DesignMode)
{ {
DomainDropDown.Items.Clear(); return;
DomainDropDown.Items.AddRange(MemoryDomains
.Where(d => d.Writable)
.Select(d => d.ToString())
.ToArray());
DomainDropDown.SelectedItem = MemoryDomains.HasSystemBus
? MemoryDomains.SystemBus.ToString()
: MemoryDomains.MainMemory.ToString();
} }
DomainDropDown.Items.Clear();
DomainDropDown.Items.AddRange(MemoryDomains
.Where(d => d.Writable)
.Select(d => d.ToString())
.ToArray());
DomainDropDown.SelectedItem = MemoryDomains.HasSystemBus
? MemoryDomains.SystemBus.ToString()
: MemoryDomains.MainMemory.ToString();
SetFormToDefault(); SetFormToDefault();
} }

13
BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs
View File

@ -66,15 +66,16 @@ namespace BizHawk.Client.EmuHawk
protected override void OnLoad(EventArgs e) protected override void OnLoad(EventArgs e)
{ {
base.OnLoad(e); base.OnLoad(e);
if (DesignMode)
if (Tastudio != null) // For the designer
{ {
TurboSeekCheckbox.Checked = Tastudio.Config?.TurboSeek ?? false; return;
AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition;
FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor;
RecordingModeCheckbox.Checked = RecordingMode;
} }
TurboSeekCheckbox.Checked = Tastudio.Config?.TurboSeek ?? false;
AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition;
FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor;
RecordingModeCheckbox.Checked = RecordingMode;
_loading = false; _loading = false;
} }