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

CConsole: Fix reset hack and optimize

Browse Source 
Don't update the view once we already found the 'active' object, or if we are at the park position (-1). This fixes the hack of having to have CConsole::m_bSuggestMoved to be true all the time.
This commit is contained in:
Kawe Mazidjatari 2023-09-17 01:37:01 +02:00
parent 9aefd6a046
commit fc845d355f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
r5dev/gameui/IConsole.cpp
View File

@ -395,6 +395,8 @@ void CConsole::SuggestPanel(void)
ImGui::Begin("##suggest", nullptr, m_nSuggestFlags);
ImGui::PushAllowKeyboardFocus(false);
bool bViewChanged = false;
for (size_t i = 0, ns = m_vSuggest.size(); i < ns; i++)
{
const CSuggest& suggest = m_vSuggest[i];
@ -464,13 +466,11 @@ void CConsole::SuggestPanel(void)
ImGui::PopID();
// Update the suggest position
if (m_bSuggestMoved)
if (m_bSuggestMoved && !bViewChanged)
{
ImGuiWindow* const pWindow = ImGui::GetCurrentWindow();
ImRect imRect = ImGui::GetCurrentContext()->LastItemData.Rect;
bool bChanged = false;
if (bIsIndexActive) // Bring the 'active' element into view
{
// Reset to keep flag in display.
@ -481,7 +481,7 @@ void CConsole::SuggestPanel(void)
imRect.Min.y += 1;
imRect.Max.y -= 1;
bChanged = true;
bViewChanged = true;
}
else if (m_nSuggestPos == -1) // Reset position; -1 = no active element.
{
@ -490,18 +490,21 @@ void CConsole::SuggestPanel(void)
imRect.Min.y = 0;
imRect.Max.y = 0;
bChanged = true;
bViewChanged = true;
}
if (bChanged)
if (bViewChanged)
{
ImGui::ScrollToRect(pWindow, imRect);
}
m_bSuggestMoved = true;
}
}
if (bViewChanged)
{
m_bSuggestMoved = false;
}
ImGui::PopAllowKeyboardFocus();
ImGui::End();
}
@ -587,6 +590,7 @@ bool CConsole::AutoComplete(void)
void CConsole::ResetAutoComplete(void)
{
m_bSuggestActive = false;
m_bSuggestMoved = true;
m_nSuggestPos = -1;
}