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

add advanced config option that will remove the "Mixed" key priority when clicking the statubar icon or pressing hte hotkey

This commit is contained in:
adelikat 2020-09-13 12:23:15 -05:00
parent 40fe4b3022
commit 5c5438ea18
5 changed files with 569 additions and 546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.Common/config/Config.cs
View File

@ -56,6 +56,8 @@ namespace BizHawk.Client.Common
// General Client Settings // General Client Settings
public int InputHotkeyOverrideOptions { get; set; } public int InputHotkeyOverrideOptions { get; set; }
public bool NoMixedInputHokeyOverride { get; set; }
public bool StackOSDMessages { get; set; } = true; public bool StackOSDMessages { get; set; } = true;
public ZoomFactors TargetZoomFactors { get; set; } = new ZoomFactors(); public ZoomFactors TargetZoomFactors { get; set; } = new ZoomFactors();

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

@ -2419,7 +2419,7 @@ namespace BizHawk.Client.EmuHawk
Config.InputHotkeyOverrideOptions = 2; Config.InputHotkeyOverrideOptions = 2;
break; break;
case 2: case 2:
Config.InputHotkeyOverrideOptions = 0; Config.InputHotkeyOverrideOptions = Config.NoMixedInputHokeyOverride ? 1 : 0;
break; break;
} }

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

@ -2770,6 +2770,11 @@ namespace BizHawk.Client.EmuHawk
Config.InputHotkeyOverrideOptions = 0; Config.InputHotkeyOverrideOptions = 0;
} }
if (Config.NoMixedInputHokeyOverride && Config.InputHotkeyOverrideOptions == 0)
{
Config.InputHotkeyOverrideOptions = 1;
}
UpdateKeyPriorityIcon(); UpdateKeyPriorityIcon();
switch (Config.InputHotkeyOverrideOptions) switch (Config.InputHotkeyOverrideOptions)
{ {

1104
src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2
src/BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs
View File

@ -82,6 +82,7 @@ namespace BizHawk.Client.EmuHawk
LuaDuringTurboCheckbox.Checked = _config.RunLuaDuringTurbo; LuaDuringTurboCheckbox.Checked = _config.RunLuaDuringTurbo;
cbMoviesOnDisk.Checked = _config.Movies.MoviesOnDisk; cbMoviesOnDisk.Checked = _config.Movies.MoviesOnDisk;
cbSkipWaterboxIntegrityChecks.Checked = _config.SkipWaterboxIntegrityChecks; cbSkipWaterboxIntegrityChecks.Checked = _config.SkipWaterboxIntegrityChecks;
NoMixedKeyPriorityCheckBox.Checked = _config.NoMixedInputHokeyOverride;
switch (_config.HostInputMethod) switch (_config.HostInputMethod)
{ {
@ -133,6 +134,7 @@ namespace BizHawk.Client.EmuHawk
_config.RunLuaDuringTurbo = LuaDuringTurboCheckbox.Checked; _config.RunLuaDuringTurbo = LuaDuringTurboCheckbox.Checked;
_config.Movies.MoviesOnDisk = cbMoviesOnDisk.Checked; _config.Movies.MoviesOnDisk = cbMoviesOnDisk.Checked;
_config.SkipWaterboxIntegrityChecks = cbSkipWaterboxIntegrityChecks.Checked; _config.SkipWaterboxIntegrityChecks = cbSkipWaterboxIntegrityChecks.Checked;
_config.NoMixedInputHokeyOverride = NoMixedKeyPriorityCheckBox.Checked;
var prevLuaEngine = _config.LuaEngine; var prevLuaEngine = _config.LuaEngine;
if (LuaInterfaceRadio.Checked) if (LuaInterfaceRadio.Checked)