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

Support for drawing at an offset within client area

Browse Source
This commit is contained in:
Thomas
2023-02-13 22:08:05 +00:00
parent aa4e125b67
commit 90a6c2c34c
2 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,15 +79,20 @@ namespace Terminal.Gui.Graphs {
}
/// <summary>
/// Draws all the lines that lie within the <paramref name="bounds"/> onto
/// the <paramref name="view"/> client area. This method should be called from
/// Draws all the lines that lie within the <paramref name="sourceRect"/> onto
/// the <paramref name="view"/> client area at given <paramref name="drawOffset"/>.
/// This method should be called from
/// <see cref="View.Redraw(Rect)"/>.
/// </summary>
/// <param name="view"></param>
/// <param name="bounds"></param>
public void Draw (View view, Rect bounds)
/// <param name="sourceRect">The area of the canvas to draw.</param>
/// <param name="drawOffset">The point within the client area of
/// <paramref name="view"/> to draw at.</param>
public void Draw (View view, Rect sourceRect, Point? drawOffset = null)
{
var runes = GenerateImage (bounds);
var offset = drawOffset ?? Point.Empty;
var runes = GenerateImage (sourceRect);
var runeRows = runes.GetLength (0);
var runeCols = runes.GetLength (1);
@@ -97,7 +102,7 @@ namespace Terminal.Gui.Graphs {
var rune = runes [y, x];
if (rune.HasValue) {
view.AddRune (bounds.X + x, bounds.Y + y, rune.Value);
view.AddRune (offset.X + x, offset.Y + y, rune.Value);
}
}
}

40
UnitTests/Core/LineCanvasTests.cs
View File

@@ -285,32 +285,30 @@ namespace Terminal.Gui.CoreTests {
}
[Fact, AutoInitShutdown]
public void TestLineCanvas_PositiveLocation ()
public void TestLineCanvas_LeaveMargin_Top1_Left1 ()
{
var x = 1;
var y = 1;
var v = GetCanvas (out var canvas, x, y);
// Draw at 1,1 within client area of View (i.e. leave a top and left margin of 1)
var v = GetCanvas (out var canvas, 1, 1);
// outer box
canvas.AddLine (new Point (x, y), 9, Orientation.Horizontal, BorderStyle.Single);
canvas.AddLine (new Point (x + 9, y + 0), 4, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (x + 9, y + 4), -9, Orientation.Horizontal, BorderStyle.Single);
canvas.AddLine (new Point (x + 0, y + 4), -4, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (0, 0), 8, Orientation.Horizontal, BorderStyle.Single);
canvas.AddLine (new Point (8, 0), 3, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (8, 3), -8, Orientation.Horizontal, BorderStyle.Single);
canvas.AddLine (new Point (0, 3), -3, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (x + 5, y + 0), 4, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (x + 0, y + 2), 9, Orientation.Horizontal, BorderStyle.Single);
canvas.AddLine (new Point (5, 0), 3, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (0, 2), 8, Orientation.Horizontal, BorderStyle.Single);
v.Redraw (v.Bounds);
string looksLike =
@"
┌────┬───┐
│ │ │
├────┼───┤
│ │ │
└────┴───┘";
@"
┌────┬──┐
│ │ │
├────┼──┤
└────┴──┘
";
TestHelpers.AssertDriverContentsAre (looksLike, output);
}
@@ -364,19 +362,19 @@ namespace Terminal.Gui.CoreTests {
/// at <see cref="View.DrawContentComplete"/> time.
/// </summary>
/// <param name="canvas">The <see cref="LineCanvas"/> you can draw into.</param>
/// <param name="offsetX">How far to offset the <see cref="View.Bounds"/> in X</param>
/// <param name="offsetX">How far to offset the <see cref="View.Bounds"/> in Y</param>
/// <param name="offsetX">How far to offset drawing in X</param>
/// <param name="offsetY">How far to offset drawing in Y</param>
/// <returns></returns>
private View GetCanvas (out LineCanvas canvas, int offsetX = 0, int offsetY = 0)
{
var v = new View {
Width = 10,
Height = 5,
Bounds = new Rect (offsetX, offsetY, 10, 5)
Bounds = new Rect (0, 0, 10, 5)
};
var canvasCopy = canvas = new LineCanvas ();
v.DrawContentComplete += (r) => canvasCopy.Draw (v, v.Bounds);
v.DrawContentComplete += (r) => canvasCopy.Draw (v, v.Bounds, new Point(offsetX,offsetY));
return v;
}