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: also take vertical scrollbar into account

Browse Source 
Show horizontal scrollbar when console text gets overlapped by the vertical scrollbar.
This commit is contained in:
Kawe Mazidjatari 2024-04-09 16:56:08 +02:00
parent e657d62aee
commit cb0c3ef95b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/thirdparty/imgui/misc/imgui_logger.cpp vendored
View File

@ -765,6 +765,7 @@ void CTextLogger::Render()
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, 0.0f)); ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, 0.0f));
ImGuiWindow* const pWindow = ImGui::GetCurrentWindow(); ImGuiWindow* const pWindow = ImGui::GetCurrentWindow();
const ImGuiStyle& style = ImGui::GetStyle();
const ImGuiID activeID = ImGui::GetActiveID(); const ImGuiID activeID = ImGui::GetActiveID();
const ImGuiID hoveredID = ImGui::GetHoveredID(); const ImGuiID hoveredID = ImGui::GetHoveredID();
@ -878,7 +879,8 @@ void CTextLogger::Render()
// This dummy is here to let Dear ImGui know where the last character of // This dummy is here to let Dear ImGui know where the last character of
// the line had ended, so that it could properly process the horizontal // the line had ended, so that it could properly process the horizontal
// scrollbar // scrollbar
ImGui::Dummy(ImVec2((longest + 2), m_Lines.size() * m_CharAdvance.y)); const float additional = pWindow->ScrollbarY ? style.ScrollbarSize : 0.0f;
ImGui::Dummy(ImVec2(longest + additional, m_Lines.size() * m_CharAdvance.y));
m_bScrolledToStart = ImGui::GetScrollX() == 0.0f; m_bScrolledToStart = ImGui::GetScrollX() == 0.0f;