empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Focus: Fixed bug where the Mesen window was sometimes considered as "in the background" when it wasn't.

Browse source
This commit is contained in:
Souryo 2016-05-22 19:28:28 -04:00
parent f3b4d0266a
commit 2b440f2374
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GUI.NET/Forms/frmMain.Designer.cs generated
View file

@ -172,8 +172,6 @@ namespace Mesen.GUI.Forms
this.menuStrip.Size = new System.Drawing.Size(304, 26);
this.menuStrip.TabIndex = 0;
this.menuStrip.Text = "menuStrip1";
this.menuStrip.MenuActivate += new System.EventHandler(this.menuStrip_MenuActivate);
this.menuStrip.MenuDeactivate += new System.EventHandler(this.menuStrip_MenuDeactivate);
this.menuStrip.VisibleChanged += new System.EventHandler(this.menuStrip_VisibleChanged);
//
// mnuFile

18
GUI.NET/Forms/frmMain.cs
View file

@ -30,7 +30,6 @@ namespace Mesen.GUI.Forms
private bool _customSize = false;
private bool _fullscreenMode = false;
private double _regularScale = ConfigManager.Config.VideoInfo.VideoScale;
private bool _menuOpened = false;
public frmMain(string[] args)
{
@ -413,8 +412,11 @@ namespace Mesen.GUI.Forms
}
}
if(_menuOpened) {
hasFocus = false;
foreach(ToolStripItem item in menuStrip.Items) {
if(item.Pressed || item.Selected) {
hasFocus = false;
break;
}
}
InteropEmu.SetFlag(EmulationFlags.InBackground, !hasFocus);
@ -1137,16 +1139,6 @@ namespace Mesen.GUI.Forms
CheckForUpdates(true);
}
private void menuStrip_MenuActivate(object sender, EventArgs e)
{
_menuOpened = true;
}
private void menuStrip_MenuDeactivate(object sender, EventArgs e)
{
_menuOpened = false;
}
private void InitializeVsSystemMenu()
{
sepVsSystem.Visible = InteropEmu.IsVsSystem();