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: slightly improve cursor scrolling

Browse Source 
Add +1 on the right to prevent the cursor from getting under the perimeter, also add note for when feedback loop issue is fixed to accommodate for scrollbar when scrolling.
This commit is contained in:
Kawe Mazidjatari 2024-03-07 22:30:00 +01:00
parent 431621a1cc
commit d11718a956
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
r5dev/thirdparty/imgui/misc/imgui_logger.cpp vendored
View File

@ -1507,14 +1507,23 @@ void CTextLogger::EnsureCursorVisible()
const float left = ImCeil(scrollX / m_CharAdvance.x);
const float right = ImCeil((scrollX + width) / m_CharAdvance.x);
//const ImGuiWindow* const window = ImGui::GetCurrentWindow();
// For right offset, +.1f as otherwise it would render right below the
// first pixel making up the right perimeter.
// TODO: when the scrollbar feedback issue is fixed, uncomment the window
// scrollbar check !!!
const float rightOffsetAmount = 3.1f;// window->ScrollbarY ? 3.1f : 1.1f;
const float bottomOffsetAmount = 3.f; // window->ScrollbarX ? 3.f : 2.f;
if (pos.m_nColumn < left)
ImGui::SetScrollX(ImMax(0.0f, (pos.m_nColumn) * m_CharAdvance.x));
if (pos.m_nColumn > right - 3)
ImGui::SetScrollX(ImMax(0.0f, (pos.m_nColumn + 2) * m_CharAdvance.x - width));
if (pos.m_nColumn > right - rightOffsetAmount)
ImGui::SetScrollX(ImMax(0.0f, (pos.m_nColumn + rightOffsetAmount-1.f) * m_CharAdvance.x - width));
if (pos.m_nLine < top)
ImGui::SetScrollY(ImMax(0.0f, (pos.m_nLine) * m_CharAdvance.y));
if (pos.m_nLine > bottom - 3)
ImGui::SetScrollY(ImMax(0.0f, (pos.m_nLine + 2) * m_CharAdvance.y - height));
if (pos.m_nLine > bottom - bottomOffsetAmount)
ImGui::SetScrollY(ImMax(0.0f, (pos.m_nLine + bottomOffsetAmount-1.f) * m_CharAdvance.y - height));
}
int CTextLogger::GetPageSize() const