Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix LineCanvas not respecting X and Y of clip bounds

Browse Source
This commit is contained in:
tznind
2023-02-13 01:54:01 +00:00
parent d555576a13
commit 235114e60d
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Terminal.Gui/Core/Graphs/LineCanvas.cs
View File

@@ -65,7 +65,7 @@ namespace Terminal.Gui.Graphs {
for (int x = 0; x < inArea.Width; x++) {
var intersects = lines
.Select (l => l.Intersects (x, y))
.Select (l => l.Intersects (inArea.X + x, inArea.Y + y))
.Where (i => i != null)
.ToArray ();

52
UnitTests/Core/LineCanvasTests.cs
View File

@@ -1,4 +1,7 @@
using Terminal.Gui.Graphs;
using System;
using System.Collections.Generic;
using System.Text;
using Terminal.Gui.Graphs;
using Xunit;
using Xunit.Abstractions;
@@ -129,6 +132,7 @@ namespace Terminal.Gui.CoreTests {
TestHelpers.AssertDriverContentsAre (looksLike, output);
}
[Fact,AutoInitShutdown]
public void TestLineCanvas_Window ()
{
@@ -280,6 +284,52 @@ namespace Terminal.Gui.CoreTests {
TestHelpers.AssertDriverContentsAre (looksLike, output);
}
[Theory, AutoInitShutdown]
[InlineData(0,0,@"
═══
══
═══")]
[InlineData (1, 0,@"
══
═
══")]
[InlineData (2, 0,@"
═
═")]
[InlineData (0, 1,@"
══
═══")]
[InlineData (0, 2,@"
═══")]
public void TestLineCanvasRenderOffset_NoOffset (int xOffset,int yOffset, string expect)
{
var canvas = new LineCanvas ();
canvas.AddLine (new Point (0, 0), 2, Orientation.Horizontal, BorderStyle.Double);
canvas.AddLine (new Point (0, 1), 1, Orientation.Horizontal, BorderStyle.Double);
canvas.AddLine (new Point (0, 2), 2, Orientation.Horizontal, BorderStyle.Double);
var bmp = canvas.GenerateImage (new Rect (xOffset, yOffset, 3, 3));
var actual = BmpToString (bmp);
Assert.Equal (expect.TrimStart (), actual);
}
private string BmpToString (System.Rune? [,] bmp)
{
var sb = new StringBuilder ();
for (int y = 0; y < bmp.GetLength (1); y++) {
for (int x = 0; x < bmp.GetLength (0); x++) {
sb.Append (bmp [y, x]);
}
sb.AppendLine ();
}
return sb.ToString ().TrimEnd ();
}
private View GetCanvas (out LineCanvas canvas)
{
var v = new View {