From 13150961cb69065fbe8f80f88168255e04b1f63c Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 2 Oct 2012 00:23:37 +0000 Subject: [PATCH] Controller Config - make input widgets work, also consistent namespace on hotkey dialog (no ((intended)) functional change) --- BizHawk.MultiClient/MainForm.cs | 4 ++-- BizHawk.MultiClient/config/HotkeyWindow.Designer.cs | 2 +- BizHawk.MultiClient/config/HotkeyWindow.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 8d7d16e086..803684de5b 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -1752,8 +1752,8 @@ namespace BizHawk.MultiClient //modals that need to capture input for binding purposes get input, of course 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 (Form.ActiveForm == null && Global.Config.AcceptBackgroundInput) return true; diff --git a/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs b/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs index 49e1c67410..54fdce4312 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs +++ b/BizHawk.MultiClient/config/HotkeyWindow.Designer.cs @@ -1,4 +1,4 @@ -namespace BizHawk.MultiClient.tools +namespace BizHawk.MultiClient { partial class HotkeyWindow { diff --git a/BizHawk.MultiClient/config/HotkeyWindow.cs b/BizHawk.MultiClient/config/HotkeyWindow.cs index 0ca0ac4747..87119dcac0 100644 --- a/BizHawk.MultiClient/config/HotkeyWindow.cs +++ b/BizHawk.MultiClient/config/HotkeyWindow.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace BizHawk.MultiClient.tools +namespace BizHawk.MultiClient { public partial class HotkeyWindow : Form {