Controller Config - make input widgets work, also consistent namespace on hotkey dialog (no ((intended)) functional change)
This commit is contained in:
parent
df039f3b89
commit
13150961cb
|
@ -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;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
namespace BizHawk.MultiClient.tools
|
||||
namespace BizHawk.MultiClient
|
||||
{
|
||||
partial class HotkeyWindow
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue