Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-01 16:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolving merge conflicts.

Browse Source
This commit is contained in:
BDisp
2023-03-03 17:55:22 +00:00
parent 487e03a0a1 02791bce1b
commit de5b2f5594
17 changed files with 72 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
UnitTests/Core/BorderTests.cs
View File

@@ -230,7 +230,7 @@ namespace Terminal.Gui.CoreTests {
var rune = (Rune)driver.Contents [r, c, 0];
if (r == frame.Y - drawMarginFrame || r == frame.Bottom + drawMarginFrame - 1
|| c == frame.X - drawMarginFrame || c == frame.Right + drawMarginFrame - 1) {
Assert.Equal (Color.BrightGreen, color.Background);
Assert.Equal (Color.Black, color.Background); // because of #2345 - Border: can't change border color in window by Border.BorderBrush.
} else {
Assert.Equal (Color.Black, color.Background);
}
@@ -464,7 +464,7 @@ namespace Terminal.Gui.CoreTests {
var rune = (Rune)driver.Contents [r, c, 0];
if (r == frame.Y + sumThickness.Top || r == frame.Bottom - sumThickness.Bottom - 1
|| c == frame.X + sumThickness.Left || c == frame.Right - sumThickness.Right - 1) {
Assert.Equal (Color.BrightGreen, color.Background);
Assert.Equal (Color.Black, color.Background); // because of #2345 - Border: can't change border color in window by Border.BorderBrush.
} else {
Assert.Equal (Color.Black, color.Background);
}