From b144906e2b694f805851e06a2d49dc25371e635a Mon Sep 17 00:00:00 2001 From: Sour Date: Fri, 22 Dec 2017 22:36:24 -0500 Subject: [PATCH] UI: Fixed "Show FPS" menu command --- GUI.NET/Forms/frmMain.Designer.cs | 29 +++++++++++++++-------------- GUI.NET/Forms/frmMain.Options.cs | 5 +++++ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/GUI.NET/Forms/frmMain.Designer.cs b/GUI.NET/Forms/frmMain.Designer.cs index 32dc7369..9c45e0f2 100644 --- a/GUI.NET/Forms/frmMain.Designer.cs +++ b/GUI.NET/Forms/frmMain.Designer.cs @@ -587,7 +587,7 @@ namespace Mesen.GUI.Forms this.mnuShowFPS}); this.mnuEmulationSpeed.Image = global::Mesen.GUI.Properties.Resources.Speed; this.mnuEmulationSpeed.Name = "mnuEmulationSpeed"; - this.mnuEmulationSpeed.Size = new System.Drawing.Size(135, 22); + this.mnuEmulationSpeed.Size = new System.Drawing.Size(152, 22); this.mnuEmulationSpeed.Text = "Speed"; this.mnuEmulationSpeed.DropDownOpening += new System.EventHandler(this.mnuEmulationSpeed_DropDownOpening); // @@ -666,6 +666,7 @@ namespace Mesen.GUI.Forms this.mnuShowFPS.Name = "mnuShowFPS"; this.mnuShowFPS.Size = new System.Drawing.Size(163, 22); this.mnuShowFPS.Text = "Show FPS"; + this.mnuShowFPS.Click += new System.EventHandler(this.mnuShowFPS_Click); // // mnuVideoScale // @@ -680,7 +681,7 @@ namespace Mesen.GUI.Forms this.mnuFullscreen}); this.mnuVideoScale.Image = global::Mesen.GUI.Properties.Resources.Fullscreen; this.mnuVideoScale.Name = "mnuVideoScale"; - this.mnuVideoScale.Size = new System.Drawing.Size(135, 22); + this.mnuVideoScale.Size = new System.Drawing.Size(152, 22); this.mnuVideoScale.Text = "Video Size"; // // mnuScale1x @@ -768,7 +769,7 @@ namespace Mesen.GUI.Forms this.mnuBilinearInterpolation}); this.mnuVideoFilter.Image = global::Mesen.GUI.Properties.Resources.VideoFilter; this.mnuVideoFilter.Name = "mnuVideoFilter"; - this.mnuVideoFilter.Size = new System.Drawing.Size(135, 22); + this.mnuVideoFilter.Size = new System.Drawing.Size(152, 22); this.mnuVideoFilter.Text = "Video Filter"; // // mnuNoneFilter @@ -998,7 +999,7 @@ namespace Mesen.GUI.Forms this.mnuRegionDendy}); this.mnuRegion.Image = global::Mesen.GUI.Properties.Resources.Globe; this.mnuRegion.Name = "mnuRegion"; - this.mnuRegion.Size = new System.Drawing.Size(135, 22); + this.mnuRegion.Size = new System.Drawing.Size(152, 22); this.mnuRegion.Text = "Region"; // // mnuRegionAuto @@ -1032,13 +1033,13 @@ namespace Mesen.GUI.Forms // toolStripMenuItem10 // this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(132, 6); + this.toolStripMenuItem10.Size = new System.Drawing.Size(149, 6); // // mnuAudioConfig // this.mnuAudioConfig.Image = global::Mesen.GUI.Properties.Resources.Audio; this.mnuAudioConfig.Name = "mnuAudioConfig"; - this.mnuAudioConfig.Size = new System.Drawing.Size(135, 22); + this.mnuAudioConfig.Size = new System.Drawing.Size(152, 22); this.mnuAudioConfig.Text = "Audio"; this.mnuAudioConfig.Click += new System.EventHandler(this.mnuAudioConfig_Click); // @@ -1046,7 +1047,7 @@ namespace Mesen.GUI.Forms // this.mnuInput.Image = global::Mesen.GUI.Properties.Resources.Controller; this.mnuInput.Name = "mnuInput"; - this.mnuInput.Size = new System.Drawing.Size(135, 22); + this.mnuInput.Size = new System.Drawing.Size(152, 22); this.mnuInput.Text = "Input"; this.mnuInput.Click += new System.EventHandler(this.mnuInput_Click); // @@ -1054,7 +1055,7 @@ namespace Mesen.GUI.Forms // this.mnuVideoConfig.Image = global::Mesen.GUI.Properties.Resources.Video; this.mnuVideoConfig.Name = "mnuVideoConfig"; - this.mnuVideoConfig.Size = new System.Drawing.Size(135, 22); + this.mnuVideoConfig.Size = new System.Drawing.Size(152, 22); this.mnuVideoConfig.Text = "Video"; this.mnuVideoConfig.Click += new System.EventHandler(this.mnuVideoConfig_Click); // @@ -1062,20 +1063,20 @@ namespace Mesen.GUI.Forms // this.mnuEmulationConfig.Image = global::Mesen.GUI.Properties.Resources.DipSwitches; this.mnuEmulationConfig.Name = "mnuEmulationConfig"; - this.mnuEmulationConfig.Size = new System.Drawing.Size(135, 22); + this.mnuEmulationConfig.Size = new System.Drawing.Size(152, 22); this.mnuEmulationConfig.Text = "Emulation"; this.mnuEmulationConfig.Click += new System.EventHandler(this.mnuEmulationConfig_Click); // // toolStripMenuItem11 // this.toolStripMenuItem11.Name = "toolStripMenuItem11"; - this.toolStripMenuItem11.Size = new System.Drawing.Size(132, 6); + this.toolStripMenuItem11.Size = new System.Drawing.Size(149, 6); // // mnuPreferences // this.mnuPreferences.Image = global::Mesen.GUI.Properties.Resources.Cog; this.mnuPreferences.Name = "mnuPreferences"; - this.mnuPreferences.Size = new System.Drawing.Size(135, 22); + this.mnuPreferences.Size = new System.Drawing.Size(152, 22); this.mnuPreferences.Text = "Preferences"; this.mnuPreferences.Click += new System.EventHandler(this.mnuPreferences_Click); // @@ -1224,7 +1225,7 @@ namespace Mesen.GUI.Forms // this.mnuPlayMovie.Image = global::Mesen.GUI.Properties.Resources.Play; this.mnuPlayMovie.Name = "mnuPlayMovie"; - this.mnuPlayMovie.Size = new System.Drawing.Size(152, 22); + this.mnuPlayMovie.Size = new System.Drawing.Size(120, 22); this.mnuPlayMovie.Text = "Play..."; this.mnuPlayMovie.Click += new System.EventHandler(this.mnuPlayMovie_Click); // @@ -1232,7 +1233,7 @@ namespace Mesen.GUI.Forms // this.mnuRecordMovie.Image = global::Mesen.GUI.Properties.Resources.Record; this.mnuRecordMovie.Name = "mnuRecordMovie"; - this.mnuRecordMovie.Size = new System.Drawing.Size(152, 22); + this.mnuRecordMovie.Size = new System.Drawing.Size(120, 22); this.mnuRecordMovie.Text = "Record..."; this.mnuRecordMovie.Click += new System.EventHandler(this.mnuRecordMovie_Click); // @@ -1240,7 +1241,7 @@ namespace Mesen.GUI.Forms // this.mnuStopMovie.Image = global::Mesen.GUI.Properties.Resources.Stop; this.mnuStopMovie.Name = "mnuStopMovie"; - this.mnuStopMovie.Size = new System.Drawing.Size(152, 22); + this.mnuStopMovie.Size = new System.Drawing.Size(120, 22); this.mnuStopMovie.Text = "Stop"; this.mnuStopMovie.Click += new System.EventHandler(this.mnuStopMovie_Click); // diff --git a/GUI.NET/Forms/frmMain.Options.cs b/GUI.NET/Forms/frmMain.Options.cs index b35b2f44..d83f53d7 100644 --- a/GUI.NET/Forms/frmMain.Options.cs +++ b/GUI.NET/Forms/frmMain.Options.cs @@ -161,6 +161,11 @@ namespace Mesen.GUI.Forms InteropEmu.SetNesModel(ConfigManager.Config.Region); } + private void mnuShowFPS_Click(object sender, EventArgs e) + { + ToggleFps(); + } + private void UpdateEmulationFlags() { ConfigManager.Config.VideoInfo.ShowFPS = mnuShowFPS.Checked;