R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few console bugs

Browse Source 
* Fix console always reclaiming focus when input field is empty.
* Always clear auto complete vector once item has been selected.
This commit is contained in:
Kawe Mazidjatari 2023-02-05 22:50:11 +01:00
parent ddba8cf9b8
commit d93e5f9d97
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
r5dev/gameui/IConsole.cpp
View File

@ -286,7 +286,7 @@ void CConsole::DrawSurface(void)
ImGui::PushItemWidth(flFooterWidthReserve - 80);
if (ImGui::InputText("##input", m_szInputBuf, IM_ARRAYSIZE(m_szInputBuf), m_nInputFlags, &TextEditCallbackStub, reinterpret_cast<void*>(this)))
{
if (m_nSuggestPos != -1)
if (m_nSuggestPos > -1)
{
BuildInputFromSelected(m_vSuggest[m_nSuggestPos], m_svInputConVar);
m_bModifyInput = true;
@ -440,7 +440,7 @@ void CConsole::SuggestPanel(void)
BuildInputFromSelected(suggest, svConVar);
memmove(m_szInputBuf, svConVar.data(), svConVar.size() + 1);
ResetAutoComplete();
ClearAutoComplete();
// Mutex lock is obtained here are we modify m_vHistory
// which is used in the main and render thread.
@ -481,7 +481,10 @@ bool CConsole::AutoComplete(void)
// Don't suggest if user tries to assign value to ConVar or execute ConCommand.
if (!m_szInputBuf[0] || strstr(m_szInputBuf, ";"))
{
ResetAutoComplete();
if (m_bSuggestActive)
{
ResetAutoComplete();
}
return false;
}
@ -559,9 +562,7 @@ void CConsole::ResetAutoComplete(void)
//-----------------------------------------------------------------------------
void CConsole::ClearAutoComplete(void)
{
m_bCanAutoComplete = false;
m_nSuggestPos = -1;
m_bSuggestUpdate = true;
ResetAutoComplete();
m_vSuggest.clear();
}
@ -969,6 +970,8 @@ int CConsole::TextEditCallback(ImGuiInputTextCallbackData* iData)
{
iData->InsertChars(0, m_svInputConVar.c_str());
m_svInputConVar.clear();
ClearAutoComplete();
}
m_bModifyInput = false;
}