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

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
{
if (PakTypeDropdown.SelectedItem != null) // Null check for designer
{
return PakTypeDropdown.SelectedItem
.ToString() .ToString()
.GetEnumFromDescription<N64SyncSettings.N64ControllerSettings.N64ControllerPakType>(); .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

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 =>
{ {

View File

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

View File

@ -66,14 +66,15 @@ 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
{ {
return;
}
TurboSeekCheckbox.Checked = Tastudio.Config?.TurboSeek ?? false; TurboSeekCheckbox.Checked = Tastudio.Config?.TurboSeek ?? false;
AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition; AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition;
FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor; FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor;
RecordingModeCheckbox.Checked = RecordingMode; RecordingModeCheckbox.Checked = RecordingMode;
}
_loading = false; _loading = false;
} }