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

Slightly change execution order in MainForm ctor (fixes #2184)

This commit is contained in:
YoshiRulz 2020-07-01 19:09:33 +10:00
parent 498ba66e8c
commit 07c6063da1
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -291,13 +291,23 @@ namespace BizHawk.Client.EmuHawk
PauseEmulator,
SetMainformMovieInfo);
Icon = Properties.Resources.logo;
MouseClick += MainForm_MouseClick = (sender, e) =>
{
AutohideCursor(false);
if (Config.ShowContextMenu && e.Button == MouseButtons.Right)
{
MainFormContextMenu.Show(PointToScreen(new Point(e.X, e.Y + MainformMenu.Height)));
}
};
MouseMove += MainForm_MouseMove = (sender, e) => AutohideCursor(false);
MainForm_MouseWheel = (sender, e) => MouseWheelTracker += e.Delta;
InitializeComponent();
Icon = Properties.Resources.logo;
SetImages();
GlobalWin.Game = GameInfo.NullInstance;
_throttle = new Throttle();
Emulator = new NullEmulator();
GlobalWin.Tools = new ToolManager(this, Config, Emulator, MovieSession, Game);
@ -371,17 +381,6 @@ namespace BizHawk.Client.EmuHawk
Sound?.StartSound();
};
MouseClick += MainForm_MouseClick = (sender, e) =>
{
AutohideCursor(false);
if (Config.ShowContextMenu && e.Button == MouseButtons.Right)
{
MainFormContextMenu.Show(PointToScreen(new Point(e.X, e.Y + MainformMenu.Height)));
}
};
MouseMove += MainForm_MouseMove = (sender, e) => AutohideCursor(false);
MainForm_MouseWheel = (sender, e) => MouseWheelTracker += e.Delta;
Input.Instance.MainFormInputAllowedCallback = yieldAlt => {
// the main form gets input
if (ActiveForm == this)