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: reset the view to the top if the list was updated

Browse Source 
If you had a list of suggestions, and had an active element halfway through the list, and then update the suggestion list again by changing what's in the input buffer, the view would remain at the old position (displaying whatever is there). This makes sure the view gets reset all the way to the top if the list was updated.
This commit is contained in:
Kawe Mazidjatari 2023-09-17 01:25:44 +02:00
parent 53d981a06d
commit 9aefd6a046
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
r5dev/gameui/IConsole.cpp
View File

@ -460,24 +460,45 @@ void CConsole::SuggestPanel(void)
BuildSummary(svConVar);
}
ImGui::PopID();
// Make sure we bring the currently 'active' item into view.
if (m_bSuggestMoved && bIsIndexActive)
// Update the suggest position
if (m_bSuggestMoved)
{
ImGuiWindow* pWindow = ImGui::GetCurrentWindow();
ImGuiWindow* const pWindow = ImGui::GetCurrentWindow();
ImRect imRect = ImGui::GetCurrentContext()->LastItemData.Rect;
// Reset to keep flag in display.
imRect.Min.x = pWindow->InnerRect.Min.x;
imRect.Max.x = pWindow->InnerRect.Min.x; // Set to Min.x on purpose!
bool bChanged = false;
// Eliminate jiggle when going up/down in the menu.
imRect.Min.y += 1;
imRect.Max.y -= 1;
if (bIsIndexActive) // Bring the 'active' element into view
{
// Reset to keep flag in display.
imRect.Min.x = pWindow->InnerRect.Min.x;
imRect.Max.x = pWindow->InnerRect.Min.x; // Set to Min.x on purpose!
ImGui::ScrollToRect(pWindow, imRect);
m_bSuggestMoved = false;
// Eliminate jiggle when going up/down in the menu.
imRect.Min.y += 1;
imRect.Max.y -= 1;
bChanged = true;
}
else if (m_nSuggestPos == -1) // Reset position; -1 = no active element.
{
imRect.Min.x = 0;
imRect.Max.x = 0;
imRect.Min.y = 0;
imRect.Max.y = 0;
bChanged = true;
}
if (bChanged)
{
ImGui::ScrollToRect(pWindow, imRect);
}
m_bSuggestMoved = true;
}
}