Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix clearing marks #17144

Merged
merged 9 commits into from
May 2, 2024
Merged

Fix clearing marks #17144

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9454d15
start with a test
zadjii-msft Apr 26, 2024
3e677cc
actually fix this
zadjii-msft Apr 26, 2024
010e1f6
sure, this seems to work too
zadjii-msft Apr 29, 2024
5e84cde
Merge branch 'main' into dev/migrie/b/17130-clear-marks-2-try-2
zadjii-msft Apr 30, 2024
1a1c633
Revert "sure, this seems to work too"
zadjii-msft May 1, 2024
d40afd8
i know, i'll push right before lunch
zadjii-msft May 2, 2024
257818c
and thats why you always leave a note
zadjii-msft May 2, 2024
29b1b00
rename
zadjii-msft May 2, 2024
a8ecd72
sure
zadjii-msft May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/buffer/out/textBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,14 +1183,14 @@ void TextBuffer::ClearScrollback(const til::CoordType start, const til::CoordTyp
return;
}

ClearMarksInRange(til::point{ 0, start }, til::point{ _width, start + height });

if (height <= 0)
{
_decommit();
zadjii-msft marked this conversation as resolved.
Show resolved Hide resolved
return;
}

ClearMarksInRange(til::point{ 0, 0 }, til::point{ _width, height });

// Our goal is to move the viewport to the absolute start of the underlying memory buffer so that we can
// MEM_DECOMMIT the remaining memory. _firstRow is used to make the TextBuffer behave like a circular buffer.
// The start parameter is relative to the _firstRow. The trick to get the content to the absolute start
Expand Down
Loading