Fixes 2343 - LineCanvas not respecting X and Y of clip bounds

Terminal.Gui/Core/Graphs/LineCanvas.cs

@@ -11,10 +11,10 @@ namespace Terminal.Gui.Graphs {
 	/// </summary>
 	public class LineCanvas {
 
-		
+
 		private List<StraightLine> lines = new List<StraightLine> ();
 
-		Dictionary<IntersectionRuneType, IntersectionRuneResolver> runeResolvers = new Dictionary<IntersectionRuneType, IntersectionRuneResolver> { 
+		Dictionary<IntersectionRuneType, IntersectionRuneResolver> runeResolvers = new Dictionary<IntersectionRuneType, IntersectionRuneResolver> {
 			{IntersectionRuneType.ULCorner,new ULIntersectionRuneResolver()},
 			{IntersectionRuneType.URCorner,new URIntersectionRuneResolver()},
 			{IntersectionRuneType.LLCorner,new LLIntersectionRuneResolver()},
@@ -65,7 +65,7 @@ public void AddLine (Point from, int length, Orientation orientation, BorderStyl
 				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 ();
 
@@ -100,15 +100,14 @@ public void Draw (View view, Rect bounds)
 			}
 		}
 
-		private abstract class IntersectionRuneResolver
-		{
+		private abstract class IntersectionRuneResolver {
 			readonly Rune round;
 			readonly Rune doubleH;
 			readonly Rune doubleV;
 			readonly Rune doubleBoth;
 			readonly Rune normal;
 
-			public IntersectionRuneResolver(Rune round, Rune doubleH, Rune doubleV, Rune doubleBoth, Rune normal)
+			public IntersectionRuneResolver (Rune round, Rune doubleH, Rune doubleV, Rune doubleBoth, Rune normal)
 			{
 				this.round = round;
 				this.doubleH = doubleH;
@@ -121,93 +120,87 @@ public IntersectionRuneResolver(Rune round, Rune doubleH, Rune doubleV, Rune dou
 			{
 				var useRounded = intersects.Any (i => i.Line.Style == BorderStyle.Rounded && i.Line.Length != 0);
 
-				bool doubleHorizontal = intersects.Any(l=>l.Line.Orientation == Orientation.Horizontal && l.Line.Style == BorderStyle.Double);
-				bool doubleVertical = intersects.Any(l=>l.Line.Orientation == Orientation.Vertical && l.Line.Style == BorderStyle.Double);
+				bool doubleHorizontal = intersects.Any (l => l.Line.Orientation == Orientation.Horizontal && l.Line.Style == BorderStyle.Double);
+				bool doubleVertical = intersects.Any (l => l.Line.Orientation == Orientation.Vertical && l.Line.Style == BorderStyle.Double);
 
 
-				if(doubleHorizontal)
-				{
-						return doubleVertical ? doubleBoth : doubleH;
+				if (doubleHorizontal) {
+					return doubleVertical ? doubleBoth : doubleH;
 				}
-
-				if(doubleVertical)
-				{
+
+				if (doubleVertical) {
 					return doubleV;
 				}
 
 				return useRounded ? round : normal;
 			}
 		}
 
-		private class ULIntersectionRuneResolver : IntersectionRuneResolver 
-		{
-			public ULIntersectionRuneResolver() :
-				base('╭','╒','╓','╔','┌')
+		private class ULIntersectionRuneResolver : IntersectionRuneResolver {
+			public ULIntersectionRuneResolver () :
+				base ('╭', '╒', '╓', '╔', '┌')
 			{
-				
+
 			}
 		}
-		private class URIntersectionRuneResolver : IntersectionRuneResolver 
-		{
+		private class URIntersectionRuneResolver : IntersectionRuneResolver {
 
-			public URIntersectionRuneResolver() :
-				base('╮','╕','╖','╗','┐')
+			public URIntersectionRuneResolver () :
+				base ('╮', '╕', '╖', '╗', '┐')
 			{
-				
+
 			}
 		}
-		private class LLIntersectionRuneResolver : IntersectionRuneResolver 
-		{
+		private class LLIntersectionRuneResolver : IntersectionRuneResolver {
 
-			public LLIntersectionRuneResolver() :
-				base('╰','╘','╙','╚','└')
+			public LLIntersectionRuneResolver () :
+				base ('╰', '╘', '╙', '╚', '└')
 			{
-				
+
 			}
 		}
-		private class LRIntersectionRuneResolver : IntersectionRuneResolver 
-		{
-			public LRIntersectionRuneResolver() :
-				base('╯','╛','╜','╝','┘')
+		private class LRIntersectionRuneResolver : IntersectionRuneResolver {
+			public LRIntersectionRuneResolver () :
+				base ('╯', '╛', '╜', '╝', '┘')
 			{
-				
+
 			}
 		}
 
-		private class TopTeeIntersectionRuneResolver : IntersectionRuneResolver 
-		{
-			public TopTeeIntersectionRuneResolver():
-				base('┬','╤','╥','╦','┬'){
-					
-				}
+		private class TopTeeIntersectionRuneResolver : IntersectionRuneResolver {
+			public TopTeeIntersectionRuneResolver () :
+				base ('┬', '╤', '╥', '╦', '┬')
+			{
+
+			}
 		}
-		private class LeftTeeIntersectionRuneResolver : IntersectionRuneResolver 
-		{
-			public LeftTeeIntersectionRuneResolver():
-				base('├','╞','╟','╠','├'){
-					
-				}
+		private class LeftTeeIntersectionRuneResolver : IntersectionRuneResolver {
+			public LeftTeeIntersectionRuneResolver () :
+				base ('├', '╞', '╟', '╠', '├')
+			{
+
+			}
 		}
-		private class RightTeeIntersectionRuneResolver : IntersectionRuneResolver 
-		{
-			public RightTeeIntersectionRuneResolver():
-				base('┤','╡','╢','╣','┤'){
-					
-				}
+		private class RightTeeIntersectionRuneResolver : IntersectionRuneResolver {
+			public RightTeeIntersectionRuneResolver () :
+				base ('┤', '╡', '╢', '╣', '┤')
+			{
+
+			}
 		}
-		private class BottomTeeIntersectionRuneResolver : IntersectionRuneResolver 
-		{
-			public BottomTeeIntersectionRuneResolver():
-				base('┴','╧','╨','╩','┴'){
-					
-				}
+		private class BottomTeeIntersectionRuneResolver : IntersectionRuneResolver {
+			public BottomTeeIntersectionRuneResolver () :
+				base ('┴', '╧', '╨', '╩', '┴')
+			{
+
+			}
 		}
-		private class CrosshairIntersectionRuneResolver : IntersectionRuneResolver 
-		{
-			public CrosshairIntersectionRuneResolver():
-				base('┼','╪','╫','╬','┼'){
-					
-				}
+		private class CrosshairIntersectionRuneResolver : IntersectionRuneResolver {
+			public CrosshairIntersectionRuneResolver () :
+				base ('┼', '╪', '╫', '╬', '┼')
+			{
+
+			}
 		}
 
 		private Rune? GetRuneForIntersects (ConsoleDriver driver, IntersectionDefinition [] intersects)
@@ -217,7 +210,7 @@ public CrosshairIntersectionRuneResolver():
 
 			var runeType = GetRuneTypeForIntersects (intersects);
 
-			if(runeResolvers.ContainsKey (runeType)) {
+			if (runeResolvers.ContainsKey (runeType)) {
 				return runeResolvers [runeType].GetRuneForIntersects (driver, intersects);
 			}
 
@@ -228,13 +221,13 @@ public CrosshairIntersectionRuneResolver():
 			// TODO: maybe make these resolvers to for simplicity?
 			// or for dotted lines later on or that kind of thing?
 			switch (runeType) {
-			case IntersectionRuneType.None: 
+			case IntersectionRuneType.None:
 				return null;
-			case IntersectionRuneType.Dot: 
+			case IntersectionRuneType.Dot:
 				return (Rune)'.';
-			case IntersectionRuneType.HLine: 
+			case IntersectionRuneType.HLine:
 				return useDouble ? driver.HDLine : driver.HLine;
-			case IntersectionRuneType.VLine: 
+			case IntersectionRuneType.VLine:
 				return useDouble ? driver.VDLine : driver.VLine;
 			default: throw new Exception ("Could not find resolver or switch case for " + nameof (runeType) + ":" + runeType);
 			}
@@ -243,7 +236,7 @@ public CrosshairIntersectionRuneResolver():
 
 		private IntersectionRuneType GetRuneTypeForIntersects (IntersectionDefinition [] intersects)
 		{
-			if(intersects.All(i=>i.Line.Length == 0)) {
+			if (intersects.All (i => i.Line.Length == 0)) {
 				return IntersectionRuneType.Dot;
 			}
 

UnitTests/Core/LineCanvasTests.cs

@@ -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;
 
@@ -57,7 +60,7 @@ public void TestLineCanvas_Horizontal_Double ()
 		}
 
 		[InlineData (BorderStyle.Single)]
-		[InlineData(BorderStyle.Rounded)]
+		[InlineData (BorderStyle.Rounded)]
 		[Theory, AutoInitShutdown]
 		public void TestLineCanvas_Vertical (BorderStyle style)
 		{
@@ -93,7 +96,7 @@ public void TestLineCanvas_Vertical_Double ()
 		/// Not when they terminate adjacent to one another.
 		/// </summary>
 		[Fact, AutoInitShutdown]
-		public void TestLineCanvas_Corner_NoOverlap()
+		public void TestLineCanvas_Corner_NoOverlap ()
 		{
 			var v = GetCanvas (out var canvas);
 			canvas.AddLine (new Point (0, 0), 1, Orientation.Horizontal, BorderStyle.Single);
@@ -127,13 +130,14 @@ public void TestLineCanvas_Corner_Correct ()
 │
 │";
 			TestHelpers.AssertDriverContentsAre (looksLike, output);
-		
+
 		}
-		[Fact,AutoInitShutdown]
+
+		[Fact, AutoInitShutdown]
 		public void TestLineCanvas_Window ()
 		{
 			var v = GetCanvas (out var canvas);
-			
+
 			// outer box
 			canvas.AddLine (new Point (0, 0), 9, Orientation.Horizontal, BorderStyle.Single);
 			canvas.AddLine (new Point (9, 0), 4, Orientation.Vertical, BorderStyle.Single);
@@ -168,10 +172,10 @@ public void TestLineCanvas_Window_Rounded ()
 
 			// outer box
 			canvas.AddLine (new Point (0, 0), 9, Orientation.Horizontal, BorderStyle.Rounded);
-			
+
 			// BorderStyle.Single is ignored because corner overlaps with the above line which is Rounded
 			// this results in a rounded corner being used.
-			canvas.AddLine (new Point (9, 0), 4, Orientation.Vertical, BorderStyle.Single); 
+			canvas.AddLine (new Point (9, 0), 4, Orientation.Vertical, BorderStyle.Single);
 			canvas.AddLine (new Point (9, 4), -9, Orientation.Horizontal, BorderStyle.Rounded);
 			canvas.AddLine (new Point (0, 4), -4, Orientation.Vertical, BorderStyle.Single);
 
@@ -220,8 +224,8 @@ public void TestLineCanvas_Window_Double ()
 
 
 		[Theory, AutoInitShutdown]
-		[InlineData(BorderStyle.Single)]
-		[InlineData(BorderStyle.Rounded)]
+		[InlineData (BorderStyle.Single)]
+		[InlineData (BorderStyle.Rounded)]
 		public void TestLineCanvas_Window_DoubleTop_SingleSides (BorderStyle thinStyle)
 		{
 			var v = GetCanvas (out var canvas);
@@ -233,7 +237,7 @@ public void TestLineCanvas_Window_DoubleTop_SingleSides (BorderStyle thinStyle)
 			canvas.AddLine (new Point (0, 4), -4, Orientation.Vertical, thinStyle);
 
 
-			canvas.AddLine (new Point (5, 0), 4, Orientation.Vertical,thinStyle);
+			canvas.AddLine (new Point (5, 0), 4, Orientation.Vertical, thinStyle);
 			canvas.AddLine (new Point (0, 2), 9, Orientation.Horizontal, BorderStyle.Double);
 
 			v.Redraw (v.Bounds);
@@ -250,17 +254,17 @@ public void TestLineCanvas_Window_DoubleTop_SingleSides (BorderStyle thinStyle)
 		}
 
 		[Theory, AutoInitShutdown]
-		[InlineData(BorderStyle.Single)]
-		[InlineData(BorderStyle.Rounded)]
+		[InlineData (BorderStyle.Single)]
+		[InlineData (BorderStyle.Rounded)]
 		public void TestLineCanvas_Window_SingleTop_DoubleSides (BorderStyle thinStyle)
 		{
 			var v = GetCanvas (out var canvas);
 
 			// outer box
 			canvas.AddLine (new Point (0, 0), 9, Orientation.Horizontal, thinStyle);
 			canvas.AddLine (new Point (9, 0), 4, Orientation.Vertical, BorderStyle.Double);
-			canvas.AddLine (new Point (9, 4), -9, Orientation.Horizontal,thinStyle);
-			canvas.AddLine (new Point (0, 4), -4, Orientation.Vertical,  BorderStyle.Double);
+			canvas.AddLine (new Point (9, 4), -9, Orientation.Horizontal, thinStyle);
+			canvas.AddLine (new Point (0, 4), -4, Orientation.Vertical, BorderStyle.Double);
 
 
 			canvas.AddLine (new Point (5, 0), 4, Orientation.Vertical, BorderStyle.Double);
@@ -280,6 +284,52 @@ public void TestLineCanvas_Window_SingleTop_DoubleSides (BorderStyle thinStyle)
 			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 {
@@ -288,8 +338,8 @@ private View GetCanvas (out LineCanvas canvas)
 				Bounds = new Rect (0, 0, 10, 5)
 			};
 
-			var canvasCopy = canvas =  new LineCanvas ();
-			v.DrawContentComplete += (r)=> canvasCopy.Draw (v, v.Bounds);
+			var canvasCopy = canvas = new LineCanvas ();
+			v.DrawContentComplete += (r) => canvasCopy.Draw (v, v.Bounds);
 
 			return v;
 		}