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

Fixed console logger selection while mutating entries bug

Browse Source 
* Fixed bug where attempting to select text, while auto scroll is disabled, and entries are being removed, while entries are also being added, causes the start of the selection to not adjust with the number of lines being removed, which then causes it to move with the deletion.
This commit is contained in:
Kawe Mazidjatari 2022-08-30 22:54:34 +02:00
parent d1d523fd12
commit 45c147087a
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/thirdparty/imgui/include/imgui_logger.h vendored
View File

@ -213,13 +213,15 @@ private:
bool m_bHandleMouseInputs;
bool m_bWithinLoggingRect;
bool m_bShowWhiteSpaces;
float m_flTextStart; // position (in pixels) where a code line starts relative to the left of the TextLogger.
float m_flLineSpacing;
double m_flLastClick;
bool m_bLinesOffsetForward;
int m_nLinesOffsetAmount;
int m_nTabSize;
int m_nLeftMargin;
int m_nColorRangeMin;
int m_nColorRangeMax;
float m_flTextStart; // position (in pixels) where a code line starts relative to the left of the TextLogger.
float m_flLineSpacing;
double m_flLastClick;
uint64_t m_nStartTime;
SelectionMode m_SelectionMode;

47
r5dev/thirdparty/imgui/src/imgui_logger.cpp vendored
View File

@ -31,13 +31,15 @@ CTextLogger::CTextLogger()
, m_bHandleMouseInputs(true)
, m_bWithinLoggingRect(false)
, m_bShowWhiteSpaces(false)
, m_flTextStart(0.0f)
, m_flLineSpacing(1.0f)
, m_flLastClick(-1.0)
, m_bLinesOffsetForward(false)
, m_nLinesOffsetAmount(0)
, m_nTabSize(4)
, m_nLeftMargin(0)
, m_nColorRangeMin(0)
, m_nColorRangeMax(0)
, m_flTextStart(0.0f)
, m_flLineSpacing(1.0f)
, m_flLastClick(-1.0)
, m_nStartTime(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
, m_SelectionMode(SelectionMode::Normal)
{
@ -668,9 +670,38 @@ void CTextLogger::HandleMouseInputs(bool bHoveredScrollbar, bool bActiveScrollba
{
io.WantCaptureMouse = true;
m_State.m_CursorPosition = m_InteractiveEnd = ScreenPosToCoordinates(ImGui::GetMousePos());
SetSelection(m_InteractiveStart, m_InteractiveEnd, m_SelectionMode);
EnsureCursorVisible();
}
// Move start position of the selection when entries have been erased/inserted
if (m_nLinesOffsetAmount && ImGui::IsMouseDown(0))
{
Coordinates newStart;
newStart = m_InteractiveStart;
if (m_bLinesOffsetForward)
{
newStart.m_nLine += m_nLinesOffsetAmount;
if (newStart.m_nLine >= static_cast<int>(m_Lines.size()))
{
newStart.m_nLine = static_cast<int>(m_Lines.size()) - 1;
newStart.m_nColumn = GetLineMaxColumn(newStart.m_nLine);
}
}
else
{
newStart.m_nLine -= m_nLinesOffsetAmount;
if (newStart.m_nLine < 0)
{
newStart.m_nLine = 0;
newStart.m_nColumn = 0;
}
}
m_nLinesOffsetAmount = 0;
m_InteractiveStart = newStart;
}
}
}
}
@ -1328,16 +1359,20 @@ void CTextLogger::MoveSelection(int aLines, bool aForward)
if (aLines < 1)
return;
m_bLinesOffsetForward = aForward;
m_nLinesOffsetAmount = aLines;
if (HasSelection())
{
Coordinates newStart;
Coordinates newEnd;
newStart = m_State.m_SelectionStart;
newEnd = m_State.m_SelectionEnd;
if (aForward)
{
newStart = m_State.m_SelectionStart;
newStart.m_nLine += aLines;
newEnd = m_State.m_SelectionEnd;
newEnd.m_nLine += aLines;
if (newStart.m_nLine >= static_cast<int>(m_Lines.size()))
@ -1353,9 +1388,7 @@ void CTextLogger::MoveSelection(int aLines, bool aForward)
}
else
{
newStart = m_State.m_SelectionStart;
newStart.m_nLine -= aLines;
newEnd = m_State.m_SelectionEnd;
newEnd.m_nLine -= aLines;
if (newStart.m_nLine < 0)