edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 09:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8637 from Robyt3/UI-Input-Console-Activation-Fix

Browse source 
Fix text input rapidly activated/deactivated when closing console
This commit is contained in:
Jupeyy 2024-07-23 11:29:40 +00:00 committed by GitHub
parent b7e1af4bbe 8b3e686fdb
commit fe2843bb31
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/game/client/components/console.cpp
View file

@ -857,13 +857,18 @@ CGameConsole::~CGameConsole()
m_pConsoleLogger->OnConsoleDeletion(); m_pConsoleLogger->OnConsoleDeletion();
} }
CGameConsole::CInstance *CGameConsole::CurrentConsole() CGameConsole::CInstance *CGameConsole::ConsoleForType(int ConsoleType)
{ {
if(m_ConsoleType == CONSOLETYPE_REMOTE) if(ConsoleType == CONSOLETYPE_REMOTE)
return &m_RemoteConsole; return &m_RemoteConsole;
return &m_LocalConsole; return &m_LocalConsole;
} }
CGameConsole::CInstance *CGameConsole::CurrentConsole()
{
return ConsoleForType(m_ConsoleType);
}
void CGameConsole::OnReset() void CGameConsole::OnReset()
{ {
m_RemoteConsole.Reset(); m_RemoteConsole.Reset();
@ -972,7 +977,6 @@ void CGameConsole::OnRender()
if(m_ConsoleState == CONSOLE_CLOSING) if(m_ConsoleState == CONSOLE_CLOSING)
{ {
m_ConsoleState = CONSOLE_CLOSED; m_ConsoleState = CONSOLE_CLOSED;
pConsole->m_Input.Deactivate();
pConsole->m_BacklogLastActiveLine = -1; pConsole->m_BacklogLastActiveLine = -1;
} }
else if(m_ConsoleState == CONSOLE_OPENING) else if(m_ConsoleState == CONSOLE_OPENING)
@ -1135,7 +1139,10 @@ void CGameConsole::OnRender()
// render console input (wrap line) // render console input (wrap line)
pConsole->m_Input.SetHidden(m_ConsoleType == CONSOLETYPE_REMOTE && Client()->State() == IClient::STATE_ONLINE && !Client()->RconAuthed() && (pConsole->m_UserGot || !pConsole->m_UsernameReq)); pConsole->m_Input.SetHidden(m_ConsoleType == CONSOLETYPE_REMOTE && Client()->State() == IClient::STATE_ONLINE && !Client()->RconAuthed() && (pConsole->m_UserGot || !pConsole->m_UsernameReq));
pConsole->m_Input.Activate(EInputPriority::CONSOLE); // Ensure that the input is active if(m_ConsoleState == CONSOLE_OPEN)
{
pConsole->m_Input.Activate(EInputPriority::CONSOLE); // Ensure that the input is active
}
const CUIRect InputCursorRect = {x, y + FONT_SIZE, 0.0f, 0.0f}; const CUIRect InputCursorRect = {x, y + FONT_SIZE, 0.0f, 0.0f};
const bool WasChanged = pConsole->m_Input.WasChanged(); const bool WasChanged = pConsole->m_Input.WasChanged();
const bool WasCursorChanged = pConsole->m_Input.WasCursorChanged(); const bool WasCursorChanged = pConsole->m_Input.WasCursorChanged();
@ -1463,6 +1470,7 @@ void CGameConsole::Toggle(int Type)
} }
else else
{ {
ConsoleForType(Type)->m_Input.Deactivate();
Input()->MouseModeRelative(); Input()->MouseModeRelative();
Ui()->SetEnabled(true); Ui()->SetEnabled(true);
m_pClient->OnRelease(); m_pClient->OnRelease();

1
src/game/client/components/console.h
View file

@ -146,6 +146,7 @@ class CGameConsole : public CComponent
CInstance m_LocalConsole; CInstance m_LocalConsole;
CInstance m_RemoteConsole; CInstance m_RemoteConsole;
CInstance *ConsoleForType(int ConsoleType);
CInstance *CurrentConsole(); CInstance *CurrentConsole();
int m_ConsoleType; int m_ConsoleType;