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

Controller Config - make input widgets work, also consistent namespace on hotkey dialog (no ((intended)) functional change)

This commit is contained in:
adelikat 2012-10-02 00:23:37 +00:00
parent df039f3b89
commit 13150961cb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.MultiClient/MainForm.cs
View File

@ -1752,8 +1752,8 @@ namespace BizHawk.MultiClient
//modals that need to capture input for binding purposes get input, of course //modals that need to capture input for binding purposes get input, of course
if (Form.ActiveForm is InputConfig) return true; if (Form.ActiveForm is InputConfig) return true;
if (Form.ActiveForm is tools.HotkeyWindow) return true; if (Form.ActiveForm is HotkeyWindow) return true;
if (Form.ActiveForm is ControllerConfig) return true;
//if no form is active on this process, then the background input setting applies //if no form is active on this process, then the background input setting applies
if (Form.ActiveForm == null && Global.Config.AcceptBackgroundInput) return true; if (Form.ActiveForm == null && Global.Config.AcceptBackgroundInput) return true;

2
BizHawk.MultiClient/config/HotkeyWindow.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace BizHawk.MultiClient.tools namespace BizHawk.MultiClient
{ {
partial class HotkeyWindow partial class HotkeyWindow
{ {

2
BizHawk.MultiClient/config/HotkeyWindow.cs
View File

@ -7,7 +7,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
namespace BizHawk.MultiClient.tools namespace BizHawk.MultiClient
{ {
public partial class HotkeyWindow : Form public partial class HotkeyWindow : Form
{ {