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

ImGui: properly attach autocomplete suggest window to console

Browse Source 
Make sure the autocomplete suggest window is always behind the console window with nothing in between. Previously, the server browser or modal panel ended up between the autocomplete suggest window and console window if the console was focused after the browser was invoked and moved partially on top of the console.
This commit is contained in:
Kawe Mazidjatari 2024-03-07 22:35:13 +01:00
parent 17385d6f1d
commit 8912ceb30c
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gameui/IConsole.cpp
View File

@ -193,6 +193,8 @@ bool CConsole::DrawSurface(void)
return false;
}
m_mainWindow = ImGui::GetCurrentWindow();
const ImGuiStyle& style = ImGui::GetStyle();
const ImVec2 fontSize = ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, -1.0f, "#", nullptr, nullptr);
@ -218,8 +220,7 @@ bool CConsole::DrawSurface(void)
///////////////////////////////////////////////////////////////////////
if (!m_colorTextLogger.IsScrolledToBottom() && m_scrollBackAmount > 0)
{
ImGuiWindow* const window = ImGui::GetCurrentWindow();
const ImGuiID windowId = window->GetID(m_loggerLabel);
const ImGuiID windowId = m_mainWindow->GetID(m_loggerLabel);
char windowName[128];
snprintf(windowName, sizeof(windowName), "%s/%s_%08X", m_surfaceLabel, m_loggerLabel, windowId);
@ -403,6 +404,15 @@ void CConsole::DrawAutoCompletePanel(void)
ImGui::Begin("##suggest", nullptr, autoCompleteWindowFlags);
ImGui::PushAllowKeyboardFocus(false);
ImGuiWindow* const autocompleteWindow = ImGui::GetCurrentWindow();
// NOTE: this makes sure we always draw this window behind the main console
// window, this is necessary as otherwise if you were to drag another
// window above the console, and then focus on the console again, that
// window will now be in between the console window and the autocomplete
// suggest window.
ImGui::BringWindowToDisplayBehind(autocompleteWindow, m_mainWindow);
for (size_t i = 0, ns = m_vecSuggest.size(); i < ns; i++)
{
const ConAutoCompleteSuggest_s& suggest = m_vecSuggest[i];
@ -477,18 +487,17 @@ void CConsole::DrawAutoCompletePanel(void)
{
if (isIndexActive) // Bring the 'active' element into view
{
ImGuiWindow* const pWindow = ImGui::GetCurrentWindow();
ImRect imRect = ImGui::GetCurrentContext()->LastItemData.Rect;
// Reset to keep flag icon in display.
imRect.Min.x = pWindow->InnerRect.Min.x;
imRect.Max.x = pWindow->InnerRect.Max.x;
imRect.Min.x = autocompleteWindow->InnerRect.Min.x;
imRect.Max.x = autocompleteWindow->InnerRect.Max.x;
// Eliminate jiggle when going up/down in the menu.
imRect.Min.y += 1;
imRect.Max.y -= 1;
ImGui::ScrollToRect(pWindow, imRect);
ImGui::ScrollToRect(autocompleteWindow, imRect);
m_autoCompletePosMoved = false;
}
else if (m_suggestPos == ConAutoCompletePos_e::kPark)

1
src/gameui/IConsole.h
View File

@ -95,6 +95,7 @@ private:
private:
///////////////////////////////////////////////////////////////////////////
ImGuiWindow* m_mainWindow;
const char* m_loggerLabel;
char m_inputTextBuf[512];
char m_summaryTextBuf[256];