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

Clean up `PauseWhenMenuActivated` 

Disabled `Emulation` > `Pause` menu item when this feature is enabled. It would
be possible, though annoying, to have it affect `_wasPaused` instead of the main
`EmulatorPaused` while this feature is enabled.
This commit is contained in:
YoshiRulz 2022-01-16 14:33:15 +10:00
parent 29da927e73
commit 86ce476ad1
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -602,6 +602,7 @@ namespace BizHawk.Client.EmuHawk
private void EmulationMenuItem_DropDownOpened(object sender, EventArgs e)
{
PauseMenuItem.Checked = _didMenuPause ? _wasPaused : EmulatorPaused;
PauseMenuItem.Enabled = !Config.PauseWhenMenuActivated;
SoftResetMenuItem.Enabled = Emulator.ControllerDefinition.BoolButtons.Contains("Reset")
&& !MovieSession.Movie.IsPlaying();
@ -2143,9 +2144,7 @@ namespace BizHawk.Client.EmuHawk
private void MainFormContextMenu_Opening(object sender, System.ComponentModel.CancelEventArgs e)
{
_wasPaused = EmulatorPaused;
_didMenuPause = true;
PauseEmulator();
MaybePauseFromMenuOpened();
OpenRomContextMenuItem.Visible = Emulator.IsNull() || _inFullscreen;
@ -2242,12 +2241,7 @@ namespace BizHawk.Client.EmuHawk
}
private void MainFormContextMenu_Closing(object sender, ToolStripDropDownClosingEventArgs e)
{
if (!_wasPaused)
{
UnpauseEmulator();
}
}
=> MaybeUnpauseFromMenuClosed();
private void DisplayConfigMenuItem_Click(object sender, EventArgs e)
{
@ -2460,28 +2454,12 @@ namespace BizHawk.Client.EmuHawk
private void MainForm_Activated(object sender, EventArgs e)
{
if (!Config.RunInBackground)
{
if (!_wasPaused)
{
UnpauseEmulator();
}
_wasPaused = false;
}
if (!Config.RunInBackground) MaybeUnpauseFromMenuClosed();
}
private void MainForm_Deactivate(object sender, EventArgs e)
{
if (!Config.RunInBackground)
{
if (EmulatorPaused)
{
_wasPaused = true;
}
PauseEmulator();
}
if (!Config.RunInBackground) MaybePauseFromMenuOpened();
}
private void TimerMouseIdle_Tick(object sender, EventArgs e)
@ -2537,23 +2515,19 @@ namespace BizHawk.Client.EmuHawk
public void MaybePauseFromMenuOpened()
{
if (Config.PauseWhenMenuActivated)
{
if (!Config.PauseWhenMenuActivated) return;
_wasPaused = EmulatorPaused;
_didMenuPause = true;
PauseEmulator();
}
_didMenuPause = true; // overwrites value set during PauseEmulator call
}
private void MainformMenu_MenuDeactivate(object sender, EventArgs e) => MaybeUnpauseFromMenuClosed();
public void MaybeUnpauseFromMenuClosed()
{
if (!_wasPaused)
{
if (_wasPaused || !Config.PauseWhenMenuActivated) return;
UnpauseEmulator();
}
}
private static void FormDragEnter(object sender, DragEventArgs e)
{

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

@ -789,6 +789,7 @@ namespace BizHawk.Client.EmuHawk
private set
{
_didMenuPause = false; // overwritten where relevant
if (_emulatorPaused && !value) // Unpausing
{
InitializeFpsData();