Merge pull request #7903 from spycrab/imgui_np_chat

Add imgui-based Netplay Chat
This commit is contained in:
spycrab 2019-03-23 21:11:33 +01:00 committed by GitHub
commit c89139d75d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 209 additions and 27 deletions

View file

@ -14,8 +14,9 @@ using namespace ciface::ExpressionParser;
bool ControlReference::InputGateOn()
{
return SConfig::GetInstance().m_BackgroundInput || Host_RendererHasFocus() ||
Host_UINeedsControllerState();
return (SConfig::GetInstance().m_BackgroundInput || Host_RendererHasFocus() ||
Host_UINeedsControllerState()) &&
!Host_UIBlocksControllerState();
}
//