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

Controller Config - some tweaks, but input widgets aren't working, dont' know why

This commit is contained in:
adelikat 2012-10-01 01:55:08 +00:00
parent 388f62f140
commit 6e7a906cf5
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.MultiClient/config/ControllerConfig.cs
View File

@ -38,6 +38,18 @@ namespace BizHawk.MultiClient
SetAutoTab(true); SetAutoTab(true);
} }
protected override void OnShown(EventArgs e)
{
Input.Instance.EnableIgnoreModifiers = true;
base.OnShown(e);
}
protected override void OnClosed(EventArgs e)
{
base.OnClosed(e);
Input.Instance.EnableIgnoreModifiers = false;
}
private void SetAutoTab(bool setting) private void SetAutoTab(bool setting)
{ {
foreach (Control control1 in tabControl1.TabPages) foreach (Control control1 in tabControl1.TabPages)

7
BizHawk.MultiClient/config/InputWidget.cs
View File

@ -116,8 +116,11 @@ namespace BizHawk.MultiClient
{ {
Input.Instance.Update(); Input.Instance.Update();
string TempBindingStr = Input.Instance.GetNextPressedButtonOrNull(); string TempBindingStr = Input.Instance.GetNextPressedButtonOrNull();
if (wasPressed != "" && TempBindingStr == wasPressed) return; if (wasPressed != "" && TempBindingStr == wasPressed)
if (TempBindingStr != null) {
return;
}
else if (TempBindingStr != null)
{ {
if (TempBindingStr == "Escape") if (TempBindingStr == "Escape")
{ {