From 45ab749caf052ceaab186bf080d584562962f67f Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 9 Apr 2023 05:34:19 +1000 Subject: [PATCH] Fix N64 (Ares64) system menu having a blank space on Mono --- src/BizHawk.Client.EmuHawk/MainForm.Designer.cs | 9 ++++++++- src/BizHawk.Client.EmuHawk/MainForm.Events.cs | 4 +--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs index bcde286eca..7a2519ebd4 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -270,6 +270,7 @@ namespace BizHawk.Client.EmuHawk this.N64ControllerSettingsMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.toolStripSeparator23 = new BizHawk.WinForms.Controls.ToolStripSeparatorEx(); this.N64CircularAnalogRangeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); + this.Ares64CircularAnalogRangeMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.MupenStyleLagMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.N64ExpansionSlotMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.GBLSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); @@ -1776,7 +1777,7 @@ namespace BizHawk.Client.EmuHawk // this.Ares64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Ares64SettingsMenuItem, - this.N64CircularAnalogRangeMenuItem}); + this.Ares64CircularAnalogRangeMenuItem}); this.Ares64SubMenu.Text = "N64"; this.Ares64SubMenu.DropDownOpened += new System.EventHandler(this.Ares64SubMenu_DropDownOpened); // @@ -1785,6 +1786,11 @@ namespace BizHawk.Client.EmuHawk this.Ares64SettingsMenuItem.Text = "Settings..."; this.Ares64SettingsMenuItem.Click += new System.EventHandler(this.Ares64SettingsMenuItem_Click); // + // Ares64CircularAnalogRangeMenuItem + // + this.Ares64CircularAnalogRangeMenuItem.Text = "Circular Analog Range"; + this.Ares64CircularAnalogRangeMenuItem.Click += new System.EventHandler(this.N64CircularAnalogRangeMenuItem_Click); + // // GBLSubMenu // this.GBLSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2708,6 +2714,7 @@ namespace BizHawk.Client.EmuHawk private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator22; private BizHawk.WinForms.Controls.ToolStripSeparatorEx toolStripSeparator23; private BizHawk.WinForms.Controls.ToolStripMenuItemEx N64CircularAnalogRangeMenuItem; + private BizHawk.WinForms.Controls.ToolStripMenuItemEx Ares64CircularAnalogRangeMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx paletteToolStripMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx ProfilesMenuItem; private BizHawk.WinForms.Controls.ToolStripMenuItemEx SynclessRecordingMenuItem; diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index 79bce0e942..4e96f0d515 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -1840,9 +1840,7 @@ namespace BizHawk.Client.EmuHawk } private void Ares64SubMenu_DropDownOpened(object sender, EventArgs e) - { - N64CircularAnalogRangeMenuItem.Checked = Config.N64UseCircularAnalogConstraint; - } + => Ares64CircularAnalogRangeMenuItem.Checked = Config.N64UseCircularAnalogConstraint; private void Ares64SettingsMenuItem_Click(object sender, EventArgs e) => OpenGenericCoreConfigFor(CoreNames.Ares64 + " Settings");