diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-07-16 10:24:40 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-07-16 10:27:21 -0400 |
| commit | 44307c950888a4942a35b0176e2601c266894983 (patch) | |
| tree | 210fd55431646879e19e5653d69e901c2a5cfdad /Source/Core/InputCommon/ControllerInterface/Device.cpp | |
| parent | ee087f595343ff258ef7a85eea2b59b5ba2790e3 (diff) | |
Host: Add a new "UIHasFocus" hook to determine if the UI has focus
We can't use RendererHasFocus for this purpose because of some issues
with exclusive fullscreen, and the new RendererHasFocus implementation
didn't work for non-Render to Main Window cases, since the renderer
window wasn't managed by wx.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Device.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index 61057c8162..84af8649a8 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp @@ -84,7 +84,7 @@ bool Device::Control::InputGateOn() { if (SConfig::GetInstance().m_BackgroundInput) return true; - else if (Host_RendererHasFocus()) + else if (Host_RendererHasFocus() || Host_UIHasFocus()) return true; else return false; |