Merge pull request #672 from BDisp/negative-coordinates

Allowing negative coordinates for scrolling purpose.

Example/demo.cs

@@ -9,7 +9,6 @@ using System.Reflection;
 using Terminal.Gui;
 
 static class Demo {
-	//class Box10x : View, IScrollView {
 	class Box10x : View {
 		int w = 40;
 		int h = 50;
@@ -49,24 +48,42 @@ static class Demo {
 	}
 
 	class Filler : View {
+		int w = 40;
+		int h = 50;
+
 		public Filler (Rect rect) : base (rect)
 		{
+			w = rect.Width;
+			h = rect.Height;
+		}
+
+		public Size GetContentSize ()
+		{
+			return new Size (w, h);
 		}
 
 		public override void Redraw (Rect bounds)
 		{
 			Driver.SetAttribute (ColorScheme.Focus);
 			var f = Frame;
+			w = 0;
+			h = 0;
 
 			for (int y = 0; y < f.Width; y++) {
 				Move (0, y);
+				var nw = 0;
 				for (int x = 0; x < f.Height; x++) {
 					Rune r;
 					switch (x % 3) {
 					case 0:
-						Driver.AddRune (y.ToString ().ToCharArray (0, 1) [0]);
-						if (y > 9)
-							Driver.AddRune (y.ToString ().ToCharArray (1, 1) [0]);
+						var er = y.ToString ().ToCharArray (0, 1) [0];
+						nw += er.ToString ().Length;
+						Driver.AddRune (er);
+						if (y > 9) {
+							er = y.ToString ().ToCharArray (1, 1) [0];
+							nw += er.ToString ().Length;
+							Driver.AddRune (er);
+						}
 						r = '.';
 						break;
 					case 1:
@@ -77,7 +94,11 @@ static class Demo {
 						break;
 					}
 					Driver.AddRune (r);
+					nw += Rune.RuneLen (r);
 				}
+				if (nw > w)
+					w = nw;
+				h = y + 1;
 			}
 		}
 	}
@@ -118,7 +139,11 @@ static class Demo {
 #if false
 		scrollView.Add (new Box10x (0, 0));
 #else
-		scrollView.Add (new Filler (new Rect (0, 0, 40, 40)));
+		var filler = new Filler (new Rect (0, 0, 40, 40));
+		scrollView.Add (filler);
+		scrollView.DrawContent = (r) => {
+			scrollView.ContentSize = filler.GetContentSize ();
+		};
 #endif
 
 		// This is just to debug the visuals of the scrollview when small

Terminal.Gui/Core/View.cs

@@ -681,8 +681,8 @@ namespace Terminal.Gui {
 
 			// The following ensures that the cursor is always in the screen boundaries.
 			if (clipped) {
-				rrow = Math.Max (0, Math.Min (rrow, Driver.Rows - 1));
-				rcol = Math.Max (0, Math.Min (rcol, Driver.Cols - 1));
+				rrow = Math.Min (rrow, Driver.Rows - 1);
+				rcol = Math.Min (rcol, Driver.Cols - 1);
 			}
 		}
 
@@ -799,8 +799,8 @@ namespace Terminal.Gui {
 		/// This moves the cursor to the specified column and row in the view.
 		/// </summary>
 		/// <returns>The move.</returns>
-		/// <param name="col">Col (view-relative).</param>
-		/// <param name="row">Row (view-relative).</param>
+		/// <param name="col">Col.</param>
+		/// <param name="row">Row.</param>
 		public void Move (int col, int row)
 		{
 			ViewToScreen (col, row, out var rcol, out var rrow);
@@ -977,7 +977,7 @@ namespace Terminal.Gui {
 			if (subviews != null) {
 				foreach (var view in subviews) {
 					if (view.NeedDisplay != null && (!view.NeedDisplay.IsEmpty || view.childNeedsDisplay)) {
-						if (view.Frame.IntersectsWith (clipRect) && view.Frame.IntersectsWith (bounds)) {
+						if (view.Frame.IntersectsWith (clipRect) && (view.Frame.IntersectsWith (bounds) || bounds.X < 0 || bounds.Y < 0)) {
 
 							// FIXED: optimize this by computing the intersection of region and view.Bounds
 							if (view.layoutNeeded)

Terminal.Gui/Views/ScrollView.cs

@@ -142,14 +142,10 @@ namespace Terminal.Gui {
 					var by1 = position * bh / Size;
 					var by2 = (position + bh) * bh / Size;
 
-					for (int y = 0; y < bh; y++) {
-						Move (col, y);
-						if (y < by1 || y > by2)
-							special = Driver.Stipple;
-						else
-							special = Driver.Diamond;
-						Driver.AddRune (special);
-					}
+					Move (col, 0);
+					Driver.AddRune (Driver.UpArrow);
+					Move (col, Bounds.Height - 1);
+					Driver.AddRune (Driver.DownArrow);
 				} else {
 					bh -= 2;
 					var by1 = position * bh / Size;
@@ -202,14 +198,9 @@ namespace Terminal.Gui {
 					var bx1 = position * bw / Size;
 					var bx2 = (position + bw) * bw / Size;
 
-					for (int x = 0; x < bw; x++) {
-						Move (0, x);
-						if (x < bx1 || x > bx2)
-							special = Driver.Stipple;
-						else
-							special = Driver.Diamond;
-						Driver.AddRune (special);
-					}
+					Move (0, row);
+					Driver.AddRune (Driver.LeftArrow);
+					Driver.AddRune (Driver.RightArrow);
 				} else {
 					bw -= 2;
 					var bx1 = position * bw / Size;
@@ -262,33 +253,27 @@ namespace Terminal.Gui {
 			int location = vertical ? me.Y : me.X;
 			int barsize = vertical ? Bounds.Height : Bounds.Width;
 
-			if (barsize < 4) {
-				// Handle scrollbars with no buttons
-				Console.WriteLine ("TODO at ScrollBarView2");
+			barsize -= 2;
+			var pos = Position;
+			if (location == 0) {
+				if (pos > 0)
+					SetPosition (pos - 1);
+			} else if (location == barsize + 1) {
+				if (pos + 1 < Size)
+					SetPosition (pos + 1);
 			} else {
-				barsize -= 2;
-				// Handle scrollbars with arrow buttons
-				var pos = Position;
-				if (location == 0) {
-					if (pos > 0)
-						SetPosition (pos - 1);
-				} else if (location == barsize + 1) {
-					if (pos + 1 <= Size + 2)
-						SetPosition (pos + 1);
-				} else {
-					var b1 = pos * barsize / Size;
-					var b2 = (pos + barsize) * barsize / Size;
-
-					if (b2 == 0 && location == 1 && pos == 0 ||
-						(b2 == barsize && location == barsize) ||
-						(location > b1 && location < b2)) {
-						return true;
-					} else if (location <= barsize) {
-						if (location > 1 && location >= b2)
-							SetPosition (Math.Min (pos + barsize, Size));
-						else if (location <= b2 && pos > 0 || pos > 0)
-							SetPosition (Math.Max (pos - barsize, 0));
-					}
+				var b1 = pos * barsize / Size;
+				var b2 = (pos + barsize) * barsize / Size;
+
+				if (b2 == 0 && location == 1 && pos == 0 ||
+					(b2 == barsize && location == barsize) ||
+					(location > b1 && location < b2)) {
+					return true;
+				} else if (location <= barsize) {
+					if (location > 1 && location >= b2)
+						SetPosition (Math.Min (pos + barsize, Size));
+					else if (location <= b2 && pos > 0 || pos > 0)
+						SetPosition (Math.Max (pos - barsize, 0));
 				}
 			}
 
@@ -501,7 +486,7 @@ namespace Terminal.Gui {
 			OnDrawContent (new Rect (ContentOffset,
 				new Size (Bounds.Width - (ShowVerticalScrollIndicator ? 1 : 0),
 					Bounds.Height - (ShowHorizontalScrollIndicator ? 1 : 0))));
-			contentView.Redraw (contentView.Bounds);
+			contentView.Redraw (contentView.Frame);
 			Driver.Clip = savedClip;
 
 			if (ShowVerticalScrollIndicator) {
@@ -530,7 +515,7 @@ namespace Terminal.Gui {
 		public override void PositionCursor ()
 		{
 			if (InternalSubviews.Count == 0)
-				Driver.Move (0, 0);
+				Move (0, 0);
 			else
 				base.PositionCursor ();
 		}
@@ -571,7 +556,7 @@ namespace Terminal.Gui {
 		public bool ScrollDown (int lines)
 		{
 			var ny = Math.Max (-contentSize.Height, contentOffset.Y - lines);
-			if (ny == contentOffset.Y)
+			if (Math.Abs (ny) == contentSize.Height)
 				return false;
 			ContentOffset = new Point (contentOffset.X, ny);
 			return true;

UICatalog/Scenarios/Scrolling.cs

@@ -8,7 +8,6 @@ namespace UICatalog {
 
 	class Scrolling : Scenario {
 
-		//class Box10x : View, IScrollView {
 		class Box10x : View {
 			int w = 40;
 			int h = 50;
@@ -48,24 +47,42 @@ namespace UICatalog {
 		}
 
 		class Filler : View {
+			int w = 40;
+			int h = 50;
+
 			public Filler (Rect rect) : base (rect)
 			{
+				w = rect.Width;
+				h = rect.Height;
+			}
+
+			public Size GetContentSize ()
+			{
+				return new Size (w, h);
 			}
 
 			public override void Redraw (Rect bounds)
 			{
 				Driver.SetAttribute (ColorScheme.Focus);
 				var f = Frame;
+				w = 0;
+				h = 0;
 
 				for (int y = 0; y < f.Width; y++) {
 					Move (0, y);
+					var nw = 0;
 					for (int x = 0; x < f.Height; x++) {
 						Rune r;
 						switch (x % 3) {
 						case 0:
-							Driver.AddRune (y.ToString ().ToCharArray (0, 1) [0]);
-							if (y > 9)
-								Driver.AddRune (y.ToString ().ToCharArray (1, 1) [0]);
+							var er = y.ToString ().ToCharArray (0, 1) [0];
+							nw += er.ToString ().Length;
+							Driver.AddRune (er);
+							if (y > 9) {
+								er = y.ToString ().ToCharArray (1, 1) [0];
+								nw += er.ToString ().Length;
+								Driver.AddRune (er);
+							}
 							r = '.';
 							break;
 						case 1:
@@ -76,7 +93,11 @@ namespace UICatalog {
 							break;
 						}
 						Driver.AddRune (r);
+						nw += Rune.RuneLen (r);
 					}
+					if (nw > w)
+						w = nw;
+					h = y + 1;
 				}
 			}
 		}
@@ -202,7 +223,11 @@ namespace UICatalog {
 				ShowVerticalScrollIndicator = true,
 				ShowHorizontalScrollIndicator = true
 			};
-			scrollView2.Add (new Filler (new Rect (0, 0, 60, 40)));
+			var filler = new Filler (new Rect (0, 0, 60, 40));
+			scrollView2.Add (filler);
+			scrollView2.DrawContent = (r) => {
+				scrollView2.ContentSize = filler.GetContentSize ();
+			};
 
 			// This is just to debug the visuals of the scrollview when small
 			var scrollView3 = new ScrollView (new Rect (55, 15, 3, 3)) {
@@ -223,7 +248,7 @@ namespace UICatalog {
 			};
 
 			var progress = new ProgressBar ();
-			progress.X = 5;
+			progress.X = Pos.Right (scrollView) + 1;
 			progress.Y = Pos.AnchorEnd (2);
 			progress.Width = 50;
 			bool timer (MainLoop caller)