maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix build errors from backport

Browse source
This commit is contained in:
Dustin Howett 2021-08-25 17:11:23 -07:00
parent b25dc74a1d
commit 61292d8cf6
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/buffer/out/ut_textbuffer/TextAttributeTests.cpp
View file

@ -276,9 +276,9 @@ void TextAttributeTests::TestRoundtripDefaultColors()
void TextAttributeTests::TestBoldAsBright()
{
const COLORREF darkBlack = til::at(_colorTable, 0);
const COLORREF brightBlack = til::at(_colorTable, 8);
const COLORREF darkGreen = til::at(_colorTable, 2);
const COLORREF darkBlack = _colorTable[0];
const COLORREF brightBlack = _colorTable[8];
const COLORREF darkGreen = _colorTable[2];
TextAttribute attr{};

2
src/cascadia/TerminalControl/TermControl.cpp
View file

@ -706,7 +706,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
// As of GH#6586, don't start the cursor timer immediately, and
// don't show the cursor initially. We'll show the cursor and start
// the timer when the control is first focused. cursorTimer.Start();
_core.CursorOn(false);
_core->CursorOn(false);
}
else
{

4
src/cascadia/UnitTests_Control/ControlInteractivityTests.cpp
View file

@ -32,8 +32,10 @@ namespace ControlUnitTests
TEST_METHOD(ScrollWithSelection);
TEST_METHOD(TestScrollWithTrackpad);
TEST_METHOD(TestQuickDragOnSelect);
#if 0
TEST_METHOD(PointerClickOutsideActiveRegion);
TEST_METHOD(IncrementCircularBufferWithSelection);
#endif
TEST_CLASS_SETUP(ClassSetup)
{
@ -545,6 +547,7 @@ namespace ControlUnitTests
VERIFY_ARE_EQUAL(expectedAnchor, core->_terminal->GetSelectionAnchor());
}
#if 0 // The test relies on 1.11 changes to the interactivity code.
void ControlInteractivityTests::PointerClickOutsideActiveRegion()
{
// This is a test for GH#10642
@ -710,4 +713,5 @@ namespace ControlUnitTests
// Verify that the selection got reset
VERIFY_IS_FALSE(core->HasSelection());
}
#endif
}