Skip to content

Commit

Permalink
Revert "Patch fix for #1360 until WriteStream (#780) can be implement…
Browse files Browse the repository at this point in the history
…ed. (#2924)"

This reverts commit 776b9a5.
  • Loading branch information
DHowett committed Oct 4, 2019
1 parent 2f2636f commit 351d326
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 105 deletions.
12 changes: 0 additions & 12 deletions src/cascadia/TerminalCore/Terminal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -416,18 +416,6 @@ void Terminal::_WriteBuffer(const std::wstring_view& stringView)
}
}

// If we're about to try to place the cursor past the right edge of the buffer, move it down a row
// This is another patch that GH#780 should supersede. This is really correcting for other bad situations
// like bisecting (writing only the leading half because there's no room for the trailing) a wide character
// into the buffer. However, it's not really all-up correctable without implementing a full WriteStream here.
// Also, this particular code RIGHT HERE shouldn't need to know anything about the cursor or the cells advanced
// which also will be solved by GH#780 (hopefully).
if (proposedCursorPosition.X > bufferSize.RightInclusive())
{
proposedCursorPosition.X = 0;
proposedCursorPosition.Y++;
}

// If we're about to scroll past the bottom of the buffer, instead cycle the buffer.
const auto newRows = proposedCursorPosition.Y - bufferSize.Height() + 1;
if (newRows > 0)
Expand Down
92 changes: 0 additions & 92 deletions src/cascadia/UnitTests_TerminalCore/TerminalApiTests.cpp

This file was deleted.

1 change: 0 additions & 1 deletion src/cascadia/UnitTests_TerminalCore/UnitTests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<ClCompile Include="precomp.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="TerminalApiTests.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\buffer\out\lib\bufferout.vcxproj">
Expand Down

0 comments on commit 351d326

Please sign in to comment.