merged again - fixed unit tests - probably deleted some of your changes

Terminal.Gui/Core/PosDim.cs

@@ -85,7 +85,7 @@ namespace Terminal.Gui {
 
 			public override string ToString ()
 			{
-				return $"PosFactor({factor})";
+				return $"Factor({factor})";
 			}
 
 			public override int GetHashCode () => factor.GetHashCode ();
@@ -135,7 +135,7 @@ namespace Terminal.Gui {
 
 			public override string ToString ()
 			{
-				return $"PosAnchorEnd({n})";
+				return $"AnchorEnd({n})";
 			}
 		}
 
@@ -174,7 +174,7 @@ namespace Terminal.Gui {
 
 			public override string ToString ()
 			{
-				return "PosCenter";
+				return "Center";
 			}
 		}
 
@@ -209,7 +209,7 @@ namespace Terminal.Gui {
 
 			public override string ToString ()
 			{
-				return $"PosAbsolute({n})";
+				return $"Absolute({n})";
 			}
 
 			internal override int Anchor (int width)
@@ -264,7 +264,7 @@ namespace Terminal.Gui {
 
 			public override string ToString ()
 			{
-				return $"PosCombine({left}{(add ? '+' : '-')}{right})";
+				return $"Combine({left}{(add ? '+' : '-')}{right})";
 			}
 
 		}
@@ -345,7 +345,7 @@ namespace Terminal.Gui {
 				case 3: tside = "bottom"; break;
 				default: tside = "unknown"; break;
 				}
-				return $"PosView({tside},{Target.ToString ()})";
+				return $"View({tside},{Target.ToString()})";
 			}
 
 			public override int GetHashCode () => Target.GetHashCode ();
@@ -482,7 +482,7 @@ namespace Terminal.Gui {
 
 			public override string ToString ()
 			{
-				return $"DimFactor({factor},{remaining})";
+				return $"Factor({factor},{remaining})";
 			}
 
 			public override int GetHashCode () => factor.GetHashCode ();
@@ -522,7 +522,7 @@ namespace Terminal.Gui {
 
 			public override string ToString ()
 			{
-				return $"DimAbsolute({n})";
+				return $"Absolute({n})";
 			}
 
 			internal override int Anchor (int width)
@@ -541,7 +541,7 @@ namespace Terminal.Gui {
 
 			public override string ToString ()
 			{
-				return $"DimFill({margin})";
+				return $"Fill({margin})";
 			}
 
 			internal override int Anchor (int width)
@@ -613,7 +613,7 @@ namespace Terminal.Gui {
 
 			public override string ToString ()
 			{
-				return $"DimCombine({left}{(add ? '+' : '-')}{right})";
+				return $"Combine({left}{(add ? '+' : '-')}{right})";
 			}
 
 		}

UnitTests/Core/LayoutTests.cs

@@ -35,53 +35,6 @@ namespace Terminal.Gui.CoreTests {
 			Assert.Throws<InvalidOperationException> (() => root.LayoutSubviews ());
 		}
 
-		[Fact]
-		public void TopologicalSort_Does_Never_Throws_If_Root_Is_Not_Null ()
-		{
-			var root = new View () { Id = "root", Width = 20, Height = 20 };
-			var sub1 = new View () {
-				Id = "sub1",
-				X = Pos.Left (root) + 1,
-				Y = Pos.Top (root) + 1,
-				Width = Dim.Width (root) - 2,
-				Height = Dim.Height (root) - 2
-			};
-			var sub2 = new View () {
-				Id = "sub2",
-				X = Pos.Left (root) + 1,
-				Y = Pos.Top (root) + 1,
-				Width = Dim.Width (root) - 2,
-				Height = Dim.Height (root) - 2
-			};
-			var sub3 = new View () {
-				Id = "sub3",
-				X = Pos.Left (root) + 1,
-				Y = Pos.Top (root) + 1,
-				Width = Dim.Width (root) - 2,
-				Height = Dim.Height (root) - 2
-			};
-			sub2.Add (sub3);
-			sub1.Add (sub2);
-			root.Add (sub1);
-
-			var exception = Record.Exception (root.LayoutSubviews);
-			Assert.Null (exception);
-			Assert.Equal (new Rect (0, 0, 20, 20), root.Frame);
-			Assert.Equal (new Rect (1, 1, 18, 18), sub1.Frame);
-			Assert.Equal (new Rect (1, 1, 18, 18), sub2.Frame);
-			Assert.Equal (new Rect (1, 1, 18, 18), sub3.Frame);
-
-			sub2.Width = Dim.Width (root);
-			exception = Record.Exception (root.LayoutSubviews);
-			Assert.Null (exception);
-			Assert.Equal (new Rect (1, 1, 20, 18), sub2.Frame);
-
-			sub3.Width = Dim.Width (root);
-			exception = Record.Exception (root.LayoutSubviews);
-			Assert.Null (exception);
-			Assert.Equal (new Rect (1, 1, 20, 18), sub3.Frame);
-		}
-
 		[Fact]
 		public void TopologicalSort_Recursive_Ref ()
 		{
@@ -645,10 +598,10 @@ Y
 			Assert.False (view.AutoSize);
 			Assert.Equal (TextDirection.LeftRight_TopBottom, view.TextDirection);
 			Assert.Equal (Rect.Empty, view.Frame);
-			Assert.Equal ("PosAbsolute(0)", view.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view.Y.ToString ());
-			Assert.Equal ("DimAbsolute(0)", view.Width.ToString ());
-			Assert.Equal ("DimAbsolute(0)", view.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view.X.ToString ());
+			Assert.Equal ("Absolute(0)", view.Y.ToString ());
+			Assert.Equal ("Absolute(0)", view.Width.ToString ());
+			Assert.Equal ("Absolute(0)", view.Height.ToString ());
 			var expected = @"
 ┌────────────────────┐
 │                    │
@@ -682,10 +635,10 @@ Y
 			Application.Refresh ();
 
 			Assert.Equal (new Rect (0, 0, 11, 1), view.Frame);
-			Assert.Equal ("PosAbsolute(0)", view.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view.Y.ToString ());
-			Assert.Equal ("DimAbsolute(11)", view.Width.ToString ());
-			Assert.Equal ("DimAbsolute(0)", view.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view.X.ToString ());
+			Assert.Equal ("Absolute(0)", view.Y.ToString ());
+			Assert.Equal ("Absolute(11)", view.Width.ToString ());
+			Assert.Equal ("Absolute(0)", view.Height.ToString ());
 			expected = @"
 ┌────────────────────┐
 │Hello World         │
@@ -719,10 +672,10 @@ Y
 			Application.Refresh ();
 
 			Assert.Equal (new Rect (0, 0, 12, 1), view.Frame);
-			Assert.Equal ("PosAbsolute(0)", view.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view.Y.ToString ());
-			Assert.Equal ("DimAbsolute(11)", view.Width.ToString ());
-			Assert.Equal ("DimAbsolute(0)", view.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view.X.ToString ());
+			Assert.Equal ("Absolute(0)", view.Y.ToString ());
+			Assert.Equal ("Absolute(11)", view.Width.ToString ());
+			Assert.Equal ("Absolute(0)", view.Height.ToString ());
 			expected = @"
 ┌────────────────────┐
 │Hello Worlds        │
@@ -755,10 +708,10 @@ Y
 			Application.Refresh ();
 
 			Assert.Equal (new Rect (0, 0, 11, 12), view.Frame);
-			Assert.Equal ("PosAbsolute(0)", view.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view.Y.ToString ());
-			Assert.Equal ("DimAbsolute(11)", view.Width.ToString ());
-			Assert.Equal ("DimAbsolute(0)", view.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view.X.ToString ());
+			Assert.Equal ("Absolute(0)", view.Y.ToString ());
+			Assert.Equal ("Absolute(11)", view.Width.ToString ());
+			Assert.Equal ("Absolute(0)", view.Height.ToString ());
 			expected = @"
 ┌────────────────────┐
 │H                   │
@@ -792,10 +745,10 @@ Y
 			Application.Refresh ();
 
 			Assert.Equal (new Rect (0, 0, 11, 1), view.Frame);
-			Assert.Equal ("PosAbsolute(0)", view.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view.Y.ToString ());
-			Assert.Equal ("DimAbsolute(11)", view.Width.ToString ());
-			Assert.Equal ("DimAbsolute(1)", view.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view.X.ToString ());
+			Assert.Equal ("Absolute(0)", view.Y.ToString ());
+			Assert.Equal ("Absolute(11)", view.Width.ToString ());
+			Assert.Equal ("Absolute(1)", view.Height.ToString ());
 			expected = @"
 ┌────────────────────┐
 │HelloWorlds         │
@@ -828,10 +781,10 @@ Y
 			Application.Refresh ();
 
 			Assert.Equal (new Rect (0, 0, 11, 1), view.Frame);
-			Assert.Equal ("PosAbsolute(0)", view.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view.Y.ToString ());
-			Assert.Equal ("DimAbsolute(11)", view.Width.ToString ());
-			Assert.Equal ("DimAbsolute(1)", view.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view.X.ToString ());
+			Assert.Equal ("Absolute(0)", view.Y.ToString ());
+			Assert.Equal ("Absolute(11)", view.Width.ToString ());
+			Assert.Equal ("Absolute(1)", view.Height.ToString ());
 			expected = @"
 ┌────────────────────┐
 │Hello World         │
@@ -868,10 +821,10 @@ Y
 			Application.Refresh ();
 
 			Assert.Equal (new Rect (0, 0, 1, 11), view.Frame);
-			Assert.Equal ("PosAbsolute(0)", view.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view.Y.ToString ());
-			Assert.Equal ("DimAbsolute(1)", view.Width.ToString ());
-			Assert.Equal ("DimAbsolute(11)", view.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view.X.ToString ());
+			Assert.Equal ("Absolute(0)", view.Y.ToString ());
+			Assert.Equal ("Absolute(1)", view.Width.ToString ());
+			Assert.Equal ("Absolute(11)", view.Height.ToString ());
 			expected = @"
 ┌────────────────────┐
 │H                   │
@@ -904,10 +857,10 @@ Y
 			Application.Refresh ();
 
 			Assert.Equal (new Rect (0, 0, 1, 12), view.Frame);
-			Assert.Equal ("PosAbsolute(0)", view.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view.Y.ToString ());
-			Assert.Equal ("DimAbsolute(1)", view.Width.ToString ());
-			Assert.Equal ("DimAbsolute(11)", view.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view.X.ToString ());
+			Assert.Equal ("Absolute(0)", view.Y.ToString ());
+			Assert.Equal ("Absolute(1)", view.Width.ToString ());
+			Assert.Equal ("Absolute(11)", view.Height.ToString ());
 			expected = @"
 ┌────────────────────┐
 │H                   │
@@ -968,15 +921,15 @@ Y
 			Assert.Equal (new Size (10, 1), horizontalView.TextFormatter.Size);
 			Assert.Equal (new Size (2, 9), verticalView.TextFormatter.Size);
 			Assert.Equal (new Rect (0, 0, 9, 1), horizontalView.Frame);
-			Assert.Equal ("PosAbsolute(0)", horizontalView.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", horizontalView.Y.ToString ());
-			Assert.Equal ("DimAbsolute(9)", horizontalView.Width.ToString ());
-			Assert.Equal ("DimAbsolute(1)", horizontalView.Height.ToString ());
+			Assert.Equal ("Absolute(0)", horizontalView.X.ToString ());
+			Assert.Equal ("Absolute(0)", horizontalView.Y.ToString ());
+			Assert.Equal ("Absolute(9)", horizontalView.Width.ToString ());
+			Assert.Equal ("Absolute(1)", horizontalView.Height.ToString ());
 			Assert.Equal (new Rect (0, 3, 2, 8), verticalView.Frame);
-			Assert.Equal ("PosAbsolute(0)", verticalView.X.ToString ());
-			Assert.Equal ("PosAbsolute(3)", verticalView.Y.ToString ());
-			Assert.Equal ("DimAbsolute(2)", verticalView.Width.ToString ());
-			Assert.Equal ("DimAbsolute(8)", verticalView.Height.ToString ());
+			Assert.Equal ("Absolute(0)", verticalView.X.ToString ());
+			Assert.Equal ("Absolute(3)", verticalView.Y.ToString ());
+			Assert.Equal ("Absolute(2)", verticalView.Width.ToString ());
+			Assert.Equal ("Absolute(8)", verticalView.Height.ToString ());
 			var expected = @"
 ┌────────────────────┐
 │Finish 終           │
@@ -1011,10 +964,10 @@ Y
 			Assert.True (verticalView.AutoSize);
 			// height was initialized with 8 and is kept as minimum
 			Assert.Equal (new Rect (0, 3, 2, 8), verticalView.Frame);
-			Assert.Equal ("PosAbsolute(0)", verticalView.X.ToString ());
-			Assert.Equal ("PosAbsolute(3)", verticalView.Y.ToString ());
-			Assert.Equal ("DimAbsolute(2)", verticalView.Width.ToString ());
-			Assert.Equal ("DimAbsolute(8)", verticalView.Height.ToString ());
+			Assert.Equal ("Absolute(0)", verticalView.X.ToString ());
+			Assert.Equal ("Absolute(3)", verticalView.Y.ToString ());
+			Assert.Equal ("Absolute(2)", verticalView.Width.ToString ());
+			Assert.Equal ("Absolute(8)", verticalView.Height.ToString ());
 			expected = @"
 ┌────────────────────┐
 │Finish 終           │
@@ -1126,28 +1079,28 @@ Y
 			Assert.False (view5.IsInitialized);
 			Assert.False (view1.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view1.Frame);
-			Assert.Equal ("DimAbsolute(10)", view1.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view1.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view1.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view1.Height.ToString ());
 			Assert.False (view2.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view2.Frame);
-			Assert.Equal ("DimAbsolute(10)", view2.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view2.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view2.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view2.Height.ToString ());
 			Assert.False (view3.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view3.Frame);
-			Assert.Equal ("DimAbsolute(10)", view3.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view3.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view3.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view3.Height.ToString ());
 			Assert.False (view4.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view4.Frame);
-			Assert.Equal ("DimAbsolute(10)", view4.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view4.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view4.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view4.Height.ToString ());
 			Assert.False (view5.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view5.Frame);
-			Assert.Equal ("DimAbsolute(10)", view5.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view5.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view5.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view5.Height.ToString ());
 			Assert.False (view6.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view6.Frame);
-			Assert.Equal ("DimAbsolute(10)", view6.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view6.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view6.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view6.Height.ToString ());
 
 			Application.Begin (Application.Top);
 
@@ -1158,28 +1111,28 @@ Y
 			Assert.True (view5.IsInitialized);
 			Assert.False (view1.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view1.Frame);
-			Assert.Equal ("DimAbsolute(10)", view1.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view1.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view1.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view1.Height.ToString ());
 			Assert.False (view2.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view2.Frame);
-			Assert.Equal ("DimAbsolute(10)", view2.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view2.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view2.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view2.Height.ToString ());
 			Assert.False (view3.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view3.Frame);
-			Assert.Equal ("DimAbsolute(10)", view3.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view3.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view3.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view3.Height.ToString ());
 			Assert.False (view4.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view4.Frame);
-			Assert.Equal ("DimAbsolute(10)", view4.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view4.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view4.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view4.Height.ToString ());
 			Assert.False (view5.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view5.Frame);
-			Assert.Equal ("DimAbsolute(10)", view5.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view5.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view5.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view5.Height.ToString ());
 			Assert.False (view6.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 5), view6.Frame);
-			Assert.Equal ("DimAbsolute(10)", view6.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view6.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view6.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view6.Height.ToString ());
 		}
 
 		[Fact, AutoInitShutdown]
@@ -1218,28 +1171,28 @@ Y
 			Assert.False (view5.IsInitialized);
 			Assert.True (view1.AutoSize);
 			Assert.Equal (new Rect (0, 0, 18, 5), view1.Frame);
-			Assert.Equal ("DimAbsolute(10)", view1.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view1.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view1.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view1.Height.ToString ());
 			Assert.True (view2.AutoSize);
 			Assert.Equal (new Rect (0, 0, 18, 5), view2.Frame);
-			Assert.Equal ("DimAbsolute(10)", view2.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view2.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view2.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view2.Height.ToString ());
 			Assert.True (view3.AutoSize);
 			Assert.Equal (new Rect (0, 0, 18, 5), view3.Frame);
-			Assert.Equal ("DimAbsolute(10)", view3.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view3.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view3.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view3.Height.ToString ());
 			Assert.True (view4.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 17), view4.Frame);
-			Assert.Equal ("DimAbsolute(10)", view4.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view4.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view4.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view4.Height.ToString ());
 			Assert.True (view5.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 17), view5.Frame);
-			Assert.Equal ("DimAbsolute(10)", view5.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view5.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view5.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view5.Height.ToString ());
 			Assert.True (view6.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 17), view6.Frame);
-			Assert.Equal ("DimAbsolute(10)", view6.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view6.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view6.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view6.Height.ToString ());
 
 			Application.Begin (Application.Top);
 
@@ -1250,28 +1203,28 @@ Y
 			Assert.True (view5.IsInitialized);
 			Assert.True (view1.AutoSize);
 			Assert.Equal (new Rect (0, 0, 18, 5), view1.Frame);
-			Assert.Equal ("DimAbsolute(10)", view1.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view1.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view1.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view1.Height.ToString ());
 			Assert.True (view2.AutoSize);
 			Assert.Equal (new Rect (0, 0, 18, 5), view2.Frame);
-			Assert.Equal ("DimAbsolute(10)", view2.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view2.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view2.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view2.Height.ToString ());
 			Assert.True (view3.AutoSize);
 			Assert.Equal (new Rect (0, 0, 18, 5), view3.Frame);
-			Assert.Equal ("DimAbsolute(10)", view3.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view3.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view3.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view3.Height.ToString ());
 			Assert.True (view4.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 17), view4.Frame);
-			Assert.Equal ("DimAbsolute(10)", view4.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view4.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view4.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view4.Height.ToString ());
 			Assert.True (view5.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 17), view5.Frame);
-			Assert.Equal ("DimAbsolute(10)", view5.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view5.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view5.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view5.Height.ToString ());
 			Assert.True (view6.AutoSize);
 			Assert.Equal (new Rect (0, 0, 10, 17), view6.Frame);
-			Assert.Equal ("DimAbsolute(10)", view6.Width.ToString ());
-			Assert.Equal ("DimAbsolute(5)", view6.Height.ToString ());
+			Assert.Equal ("Absolute(10)", view6.Width.ToString ());
+			Assert.Equal ("Absolute(5)", view6.Height.ToString ());
 		}
 
 		[Fact, AutoInitShutdown]
@@ -1290,17 +1243,17 @@ Y
 			Assert.True (view1.AutoSize);
 			Assert.Equal (LayoutStyle.Absolute, view1.LayoutStyle);
 			Assert.Equal (new Rect (0, 0, 18, 1), view1.Frame);
-			Assert.Equal ("PosAbsolute(0)", view1.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view1.Y.ToString ());
-			Assert.Equal ("DimAbsolute(18)", view1.Width.ToString ());
-			Assert.Equal ("DimAbsolute(1)", view1.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view1.X.ToString ());
+			Assert.Equal ("Absolute(0)", view1.Y.ToString ());
+			Assert.Equal ("Absolute(18)", view1.Width.ToString ());
+			Assert.Equal ("Absolute(1)", view1.Height.ToString ());
 			Assert.True (view2.AutoSize);
 			Assert.Equal (LayoutStyle.Absolute, view2.LayoutStyle);
 			Assert.Equal (new Rect (0, 0, 2, 17), view2.Frame);
-			Assert.Equal ("PosAbsolute(0)", view2.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view2.Y.ToString ());
-			Assert.Equal ("DimAbsolute(2)", view2.Width.ToString ());
-			Assert.Equal ("DimAbsolute(17)", view2.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view2.X.ToString ());
+			Assert.Equal ("Absolute(0)", view2.Y.ToString ());
+			Assert.Equal ("Absolute(2)", view2.Width.ToString ());
+			Assert.Equal ("Absolute(17)", view2.Height.ToString ());
 
 			view1.Frame = new Rect (0, 0, 25, 4);
 			bool firstIteration = false;
@@ -1309,10 +1262,10 @@ Y
 			Assert.True (view1.AutoSize);
 			Assert.Equal (LayoutStyle.Absolute, view1.LayoutStyle);
 			Assert.Equal (new Rect (0, 0, 25, 4), view1.Frame);
-			Assert.Equal ("PosAbsolute(0)", view1.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view1.Y.ToString ());
-			Assert.Equal ("DimAbsolute(18)", view1.Width.ToString ());
-			Assert.Equal ("DimAbsolute(1)", view1.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view1.X.ToString ());
+			Assert.Equal ("Absolute(0)", view1.Y.ToString ());
+			Assert.Equal ("Absolute(18)", view1.Width.ToString ());
+			Assert.Equal ("Absolute(1)", view1.Height.ToString ());
 
 			view2.Frame = new Rect (0, 0, 1, 25);
 			Application.RunMainLoopIteration (ref rs, true, ref firstIteration);
@@ -1320,10 +1273,10 @@ Y
 			Assert.True (view2.AutoSize);
 			Assert.Equal (LayoutStyle.Absolute, view2.LayoutStyle);
 			Assert.Equal (new Rect (0, 0, 1, 25), view2.Frame);
-			Assert.Equal ("PosAbsolute(0)", view2.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view2.Y.ToString ());
-			Assert.Equal ("DimAbsolute(2)", view2.Width.ToString ());
-			Assert.Equal ("DimAbsolute(17)", view2.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view2.X.ToString ());
+			Assert.Equal ("Absolute(0)", view2.Y.ToString ());
+			Assert.Equal ("Absolute(2)", view2.Width.ToString ());
+			Assert.Equal ("Absolute(17)", view2.Height.ToString ());
 		}
 
 		[Fact, AutoInitShutdown]
@@ -1338,10 +1291,10 @@ Y
 			Assert.Null (view1.Height);
 			top.Add (view1);
 			Assert.True (view1.IsAdded);
-			Assert.Equal ("PosAbsolute(0)", view1.X.ToString ());
-			Assert.Equal ("PosAbsolute(0)", view1.Y.ToString ());
-			Assert.Equal ("DimAbsolute(0)", view1.Width.ToString ());
-			Assert.Equal ("DimAbsolute(0)", view1.Height.ToString ());
+			Assert.Equal ("Absolute(0)", view1.X.ToString ());
+			Assert.Equal ("Absolute(0)", view1.Y.ToString ());
+			Assert.Equal ("Absolute(0)", view1.Width.ToString ());
+			Assert.Equal ("Absolute(0)", view1.Height.ToString ());
 
 			var view2 = new View () {
 				X = Pos.Center (),
@@ -1350,16 +1303,16 @@ Y
 				Height = Dim.Fill ()
 			};
 			Assert.False (view2.IsAdded);
-			Assert.Equal ("PosCenter", view2.X.ToString ());
-			Assert.Equal ("PosCenter", view2.Y.ToString ());
-			Assert.Equal ("DimFill(0)", view2.Width.ToString ());
-			Assert.Equal ("DimFill(0)", view2.Height.ToString ());
+			Assert.Equal ("Center", view2.X.ToString ());
+			Assert.Equal ("Center", view2.Y.ToString ());
+			Assert.Equal ("Fill(0)", view2.Width.ToString ());
+			Assert.Equal ("Fill(0)", view2.Height.ToString ());
 			top.Add (view2);
 			Assert.True (view2.IsAdded);
-			Assert.Equal ("PosCenter", view2.X.ToString ());
-			Assert.Equal ("PosCenter", view2.Y.ToString ());
-			Assert.Equal ("DimFill(0)", view2.Width.ToString ());
-			Assert.Equal ("DimFill(0)", view2.Height.ToString ());
+			Assert.Equal ("Center", view2.X.ToString ());
+			Assert.Equal ("Center", view2.Y.ToString ());
+			Assert.Equal ("Fill(0)", view2.Width.ToString ());
+			Assert.Equal ("Fill(0)", view2.Height.ToString ());
 		}
 
 		[Fact]
@@ -1445,7 +1398,7 @@ Y
 
 			testView = new View () {
 				AutoSize = false,
-				X = Pos.Left (testView),
+				X = Pos.Left(testView),
 				Y = Pos.Left (testView),
 				Width = 1,
 				Height = 1
@@ -1467,158 +1420,5 @@ Y
 			Assert.Equal (6, testView.Frame.X);
 			Assert.Equal (6, testView.Frame.Y);
 		}
-
-		[Fact]
-		[AutoInitShutdown]
-		public void Y_Center_Minus_Absolute_Inside_Window_Height_Ten ()
-		{
-			var win = new Window ();
-
-			var label = new Label ("This should be the first line.") {
-				TextAlignment = Terminal.Gui.TextAlignment.Centered,
-				ColorScheme = Colors.Menu,
-				Width = Dim.Fill (),
-				X = Pos.Center (),
-				Y = Pos.Center () - 3  // center minus 3 minus two lines top and bottom borders equal to zero (5-3-2=0)
-			};
-
-			var button = new Button ("Press me!") {
-				X = Pos.Center (),
-				Y = Pos.Center ()
-			};
-
-			win.Add (label, button);
-
-			var top = Application.Top;
-			top.Add (win);
-			Application.Begin (top);
-			((FakeDriver)Application.Driver).SetBufferSize (40, 10);
-
-			Assert.True (label.AutoSize);
-			Assert.Equal (new Rect (0, 0, 40, 10), top.Frame);
-			Assert.Equal (new Rect (0, 0, 40, 10), win.Frame);
-			Assert.Equal (new Rect (1, 1, 38, 8), win.Subviews [0].Frame);
-			Assert.Equal ("ContentView()({X=1,Y=1,Width=38,Height=8})", win.Subviews [0].ToString ());
-			Assert.Equal (new Rect (0, 0, 40, 10), new Rect (
-				win.Frame.Left, win.Frame.Top,
-				win.Frame.Right, win.Frame.Bottom));
-			Assert.Equal (new Rect (0, 0, 38, 1), label.Frame);
-			Assert.Equal (new Rect (12, 3, 13, 1), button.Frame);
-			var expected = @"
-┌──────────────────────────────────────┐
-│    This should be the first line.    │
-│                                      │
-│                                      │
-│            [ Press me! ]             │
-│                                      │
-│                                      │
-│                                      │
-│                                      │
-└──────────────────────────────────────┘
-";
-
-			TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-		}
-
-		[Fact]
-		[AutoInitShutdown]
-		public void Y_Center_Minus_Absolute_Inside_Window_Height_Nine ()
-		{
-			var win = new Window ();
-
-			var label = new Label ("This should be the first line.") {
-				TextAlignment = Terminal.Gui.TextAlignment.Centered,
-				ColorScheme = Colors.Menu,
-				Width = Dim.Fill (),
-				X = Pos.Center (),
-				Y = Pos.Center () - 3  // center minus 2 minus two lines top and bottom borders equal to zero (5-3-2=0)
-			};
-
-			var button = new Button ("Press me!") {
-				X = Pos.Center (),
-				Y = Pos.Center ()
-			};
-
-			win.Add (label, button);
-
-			var top = Application.Top;
-			top.Add (win);
-			Application.Begin (top);
-			((FakeDriver)Application.Driver).SetBufferSize (40, 9);
-
-			Assert.True (label.AutoSize);
-			Assert.Equal (new Rect (0, 0, 40, 9), top.Frame);
-			Assert.Equal (new Rect (0, 0, 40, 9), win.Frame);
-			Assert.Equal (new Rect (1, 1, 38, 7), win.Subviews [0].Frame);
-			Assert.Equal ("ContentView()({X=1,Y=1,Width=38,Height=7})", win.Subviews [0].ToString ());
-			Assert.Equal (new Rect (0, 0, 40, 9), new Rect (
-				win.Frame.Left, win.Frame.Top,
-				win.Frame.Right, win.Frame.Bottom));
-			Assert.Equal (new Rect (0, 0, 38, 1), label.Frame);
-			Assert.Equal (new Rect (12, 3, 13, 1), button.Frame);
-			var expected = @"
-┌──────────────────────────────────────┐
-│    This should be the first line.    │
-│                                      │
-│                                      │
-│            [ Press me! ]             │
-│                                      │
-│                                      │
-│                                      │
-└──────────────────────────────────────┘
-";
-
-			TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-		}
-
-		[Fact]
-		[AutoInitShutdown]
-		public void Y_Center_Minus_Absolute_Inside_Window_Height_Eight ()
-		{
-			var win = new Window ();
-
-			var label = new Label ("This should be the first line.") {
-				TextAlignment = Terminal.Gui.TextAlignment.Centered,
-				ColorScheme = Colors.Menu,
-				Width = Dim.Fill (),
-				X = Pos.Center (),
-				Y = Pos.Center () - 2  // center minus 2 minus two lines top and bottom borders equal to zero (4-2-2=0)
-			};
-
-			var button = new Button ("Press me!") {
-				X = Pos.Center (),
-				Y = Pos.Center ()
-			};
-
-			win.Add (label, button);
-
-			var top = Application.Top;
-			top.Add (win);
-			Application.Begin (top);
-			((FakeDriver)Application.Driver).SetBufferSize (40, 8);
-
-			Assert.True (label.AutoSize);
-			Assert.Equal (new Rect (0, 0, 40, 8), top.Frame);
-			Assert.Equal (new Rect (0, 0, 40, 8), win.Frame);
-			Assert.Equal (new Rect (1, 1, 38, 6), win.Subviews [0].Frame);
-			Assert.Equal ("ContentView()({X=1,Y=1,Width=38,Height=6})", win.Subviews [0].ToString ());
-			Assert.Equal (new Rect (0, 0, 40, 8), new Rect (
-				win.Frame.Left, win.Frame.Top,
-				win.Frame.Right, win.Frame.Bottom));
-			Assert.Equal (new Rect (0, 0, 38, 1), label.Frame);
-			Assert.Equal (new Rect (12, 2, 13, 1), button.Frame);
-			var expected = @"
-┌──────────────────────────────────────┐
-│    This should be the first line.    │
-│                                      │
-│            [ Press me! ]             │
-│                                      │
-│                                      │
-│                                      │
-└──────────────────────────────────────┘
-";
-
-			TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-		}
 	}
 }

UnitTests/TopLevels/ToplevelTests.cs

@@ -19,8 +19,8 @@ namespace Terminal.Gui.TopLevelTests {
 			var top = new Toplevel ();
 
 			Assert.Equal (Colors.TopLevel, top.ColorScheme);
-			Assert.Equal ("DimFill(0)", top.Width.ToString ());
-			Assert.Equal ("DimFill(0)", top.Height.ToString ());
+			Assert.Equal ("Fill(0)", top.Width.ToString ());
+			Assert.Equal ("Fill(0)", top.Height.ToString ());
 			Assert.False (top.Running);
 			Assert.False (top.Modal);
 			Assert.Null (top.MenuBar);

UnitTests/Types/DimTests.cs

@@ -37,15 +37,15 @@ namespace Terminal.Gui.TypeTests {
 		public void Sized_SetsValue ()
 		{
 			var dim = Dim.Sized (0);
-			Assert.Equal ("DimAbsolute(0)", dim.ToString ());
+			Assert.Equal ("Absolute(0)", dim.ToString ());
 
 			int testVal = 5;
 			dim = Dim.Sized (testVal);
-			Assert.Equal ($"DimAbsolute({testVal})", dim.ToString ());
+			Assert.Equal ($"Absolute({testVal})", dim.ToString ());
 
 			testVal = -1;
 			dim = Dim.Sized (testVal);
-			Assert.Equal ($"DimAbsolute({testVal})", dim.ToString ());
+			Assert.Equal ($"Absolute({testVal})", dim.ToString ());
 		}
 
 		[Fact]
@@ -155,15 +155,15 @@ namespace Terminal.Gui.TypeTests {
 		{
 			var testMargin = 0;
 			var dim = Dim.Fill ();
-			Assert.Equal ($"DimFill({testMargin})", dim.ToString ());
+			Assert.Equal ($"Fill({testMargin})", dim.ToString ());
 
 			testMargin = 0;
 			dim = Dim.Fill (testMargin);
-			Assert.Equal ($"DimFill({testMargin})", dim.ToString ());
+			Assert.Equal ($"Fill({testMargin})", dim.ToString ());
 
 			testMargin = 5;
 			dim = Dim.Fill (testMargin);
-			Assert.Equal ($"DimFill({testMargin})", dim.ToString ());
+			Assert.Equal ($"Fill({testMargin})", dim.ToString ());
 		}
 
 
@@ -182,13 +182,13 @@ namespace Terminal.Gui.TypeTests {
 		{
 			float f = 0;
 			var dim = Dim.Percent (f);
-			Assert.Equal ($"DimFactor({f / 100:0.###},{false})", dim.ToString ());
+			Assert.Equal ($"Factor({f / 100:0.###},{false})", dim.ToString ());
 			f = 0.5F;
 			dim = Dim.Percent (f);
-			Assert.Equal ($"DimFactor({f / 100:0.###},{false})", dim.ToString ());
+			Assert.Equal ($"Factor({f / 100:0.###},{false})", dim.ToString ());
 			f = 100;
 			dim = Dim.Percent (f);
-			Assert.Equal ($"DimFactor({f / 100:0.###},{false})", dim.ToString ());
+			Assert.Equal ($"Factor({f / 100:0.###},{false})", dim.ToString ());
 		}
 
 		[Fact]
@@ -420,48 +420,48 @@ namespace Terminal.Gui.TypeTests {
 			t.Add (w);
 
 			t.Ready += () => {
-				Assert.Equal ("DimAbsolute(100)", w.Width.ToString ());
-				Assert.Equal ("DimAbsolute(100)", w.Height.ToString ());
+				Assert.Equal ("Absolute(100)", w.Width.ToString ());
+				Assert.Equal ("Absolute(100)", w.Height.ToString ());
 				Assert.Equal (100, w.Frame.Width);
 				Assert.Equal (100, w.Frame.Height);
 
-				Assert.Equal ("DimFactor(0.5,False)", f1.Width.ToString ());
-				Assert.Equal ("DimAbsolute(5)", f1.Height.ToString ());
+				Assert.Equal ("Factor(0.5,False)", f1.Width.ToString ());
+				Assert.Equal ("Absolute(5)", f1.Height.ToString ());
 				Assert.Equal (49, f1.Frame.Width); // 50-1=49
 				Assert.Equal (5, f1.Frame.Height);
 
-				Assert.Equal ("DimFill(0)", f2.Width.ToString ());
-				Assert.Equal ("DimAbsolute(5)", f2.Height.ToString ());
+				Assert.Equal ("Fill(0)", f2.Width.ToString ());
+				Assert.Equal ("Absolute(5)", f2.Height.ToString ());
 				Assert.Equal (49, f2.Frame.Width); // 50-1=49
 				Assert.Equal (5, f2.Frame.Height);
 	
-				Assert.Equal ("DimCombine(DimView(Width,FrameView()({X=0,Y=0,Width=49,Height=5}))-DimAbsolute(2))", v1.Width.ToString ());
-				Assert.Equal ("DimCombine(DimFill(0)-DimAbsolute(2))", v1.Height.ToString ());
+				Assert.Equal ("Combine(DimView(Width,FrameView()({X=0,Y=0,Width=49,Height=5}))-Absolute(2))", v1.Width.ToString ());
+				Assert.Equal ("Combine(Fill(0)-Absolute(2))", v1.Height.ToString ());
 				Assert.Equal (47, v1.Frame.Width); // 49-2=47
 				Assert.Equal (89, v1.Frame.Height); // 98-5-2-2=89
 
-				Assert.Equal ("DimCombine(DimView(Width,FrameView()({X=49,Y=0,Width=49,Height=5}))-DimAbsolute(2))", v2.Width.ToString ());
-				Assert.Equal ("DimCombine(DimFill(0)-DimAbsolute(2))", v2.Height.ToString ());
+				Assert.Equal ("Combine(DimView(Width,FrameView()({X=49,Y=0,Width=49,Height=5}))-Absolute(2))", v2.Width.ToString ());
+				Assert.Equal ("Combine(Fill(0)-Absolute(2))", v2.Height.ToString ());
 				Assert.Equal (47, v2.Frame.Width); // 49-2=47
 				Assert.Equal (89, v2.Frame.Height); // 98-5-2-2=89
 
-				Assert.Equal ("DimFactor(0.1,False)", v3.Width.ToString ());
-				Assert.Equal ("DimFactor(0.1,False)", v3.Height.ToString ());
+				Assert.Equal ("Factor(0.1,False)", v3.Width.ToString ());
+				Assert.Equal ("Factor(0.1,False)", v3.Height.ToString ());
 				Assert.Equal (9, v3.Frame.Width); // 98*10%=9
 				Assert.Equal (9, v3.Frame.Height); // 98*10%=9
 
-				Assert.Equal ("DimAbsolute(50)", v4.Width.ToString ());
-				Assert.Equal ("DimAbsolute(50)", v4.Height.ToString ());
+				Assert.Equal ("Absolute(50)", v4.Width.ToString ());
+				Assert.Equal ("Absolute(50)", v4.Height.ToString ());
 				Assert.Equal (50, v4.Frame.Width);
 				Assert.Equal (50, v4.Frame.Height);
 
-				Assert.Equal ("DimCombine(DimView(Width,Button()({X=2,Y=7,Width=47,Height=89}))-DimView(Width,Button()({X=0,Y=0,Width=9,Height=9})))", v5.Width.ToString ());
-				Assert.Equal ("DimCombine(DimView(Height,Button()({X=2,Y=7,Width=47,Height=89}))-DimView(Height,Button()({X=0,Y=0,Width=9,Height=9})))", v5.Height.ToString ());
+				Assert.Equal ("Combine(DimView(Width,Button()({X=2,Y=7,Width=47,Height=89}))-DimView(Width,Button()({X=0,Y=0,Width=9,Height=9})))", v5.Width.ToString ());
+				Assert.Equal ("Combine(DimView(Height,Button()({X=2,Y=7,Width=47,Height=89}))-DimView(Height,Button()({X=0,Y=0,Width=9,Height=9})))", v5.Height.ToString ());
 				Assert.Equal (38, v5.Frame.Width); // 47-9=38
 				Assert.Equal (80, v5.Frame.Height); // 89-9=80
 
-				Assert.Equal ("DimFactor(0.2,True)", v6.Width.ToString ());
-				Assert.Equal ("DimFactor(0.2,True)", v6.Height.ToString ());
+				Assert.Equal ("Factor(0.2,True)", v6.Width.ToString ());
+				Assert.Equal ("Factor(0.2,True)", v6.Height.ToString ());
 				Assert.Equal (9, v6.Frame.Width); // 47*20%=9
 				Assert.Equal (18, v6.Frame.Height); // 89*20%=18
 
@@ -469,64 +469,64 @@ namespace Terminal.Gui.TypeTests {
 				w.Height = 200;
 				t.LayoutSubviews ();
 
-				Assert.Equal ("DimAbsolute(200)", w.Width.ToString ());
-				Assert.Equal ("DimAbsolute(200)", w.Height.ToString ());
+				Assert.Equal ("Absolute(200)", w.Width.ToString ());
+				Assert.Equal ("Absolute(200)", w.Height.ToString ());
 				Assert.Equal (200, w.Frame.Width);
 				Assert.Equal (200, w.Frame.Height);
 
 				f1.Text = "Frame1";
-				Assert.Equal ("DimFactor(0.5,False)", f1.Width.ToString ());
-				Assert.Equal ("DimAbsolute(5)", f1.Height.ToString ());
-				Assert.Equal (99, f1.Frame.Width); // 100-1=99
+				Assert.Equal ("Factor(0.5,False)", f1.Width.ToString ());
+				Assert.Equal ("Absolute(5)", f1.Height.ToString ());
+				Assert.Equal (49, f1.Frame.Width); // 100*0.5=49
 				Assert.Equal (5, f1.Frame.Height);
 
 				f2.Text = "Frame2";
-				Assert.Equal ("DimFill(0)", f2.Width.ToString ());
-				Assert.Equal ("DimAbsolute(5)", f2.Height.ToString ());
-				Assert.Equal (99, f2.Frame.Width); // 100-1=99
+				Assert.Equal ("Fill(0)", f2.Width.ToString ());
+				Assert.Equal ("Absolute(5)", f2.Height.ToString ());
+				Assert.Equal (49, f2.Frame.Width); // f2.X = Pos.Right(f1), thus 50-1=49
 				Assert.Equal (5, f2.Frame.Height);
 
 				v1.Text = "Button1";
-				Assert.Equal ("DimCombine(DimView(Width,FrameView()({X=0,Y=0,Width=99,Height=5}))-DimAbsolute(2))", v1.Width.ToString ());
-				Assert.Equal ("DimCombine(DimFill(0)-DimAbsolute(2))", v1.Height.ToString ());
-				Assert.Equal (97, v1.Frame.Width); // 99-2=97
-				Assert.Equal (189, v1.Frame.Height); // 198-2-7=189
+				Assert.Equal ("Combine(DimView(Width,FrameView()({X=0,Y=0,Width=49,Height=5}))-Absolute(2))", v1.Width.ToString ());
+				Assert.Equal ("Combine(Fill(0)-Absolute(2))", v1.Height.ToString ());
+				Assert.Equal (47, v1.Frame.Width); // 49-2=47
+				Assert.Equal (89, v1.Frame.Height); // 98-2-7=89
 
 				v2.Text = "Button2";
-				Assert.Equal ("DimCombine(DimView(Width,FrameView()({X=99,Y=0,Width=99,Height=5}))-DimAbsolute(2))", v2.Width.ToString ());
-				Assert.Equal ("DimCombine(DimFill(0)-DimAbsolute(2))", v2.Height.ToString ());
-				Assert.Equal (97, v2.Frame.Width); // 99-2=97
-				Assert.Equal (189, v2.Frame.Height); // 198-2-7=189
+				Assert.Equal ("Combine(DimView(Width,FrameView()({X=49,Y=0,Width=49,Height=5}))-Absolute(2))", v2.Width.ToString ());
+				Assert.Equal ("Combine(Fill(0)-Absolute(2))", v2.Height.ToString ());
+				Assert.Equal (47, v2.Frame.Width); // 49-2=47
+				Assert.Equal (89, v2.Frame.Height); // 98-2-7=89
 
 				v3.Text = "Button3";
-				Assert.Equal ("DimFactor(0.1,False)", v3.Width.ToString ());
-				Assert.Equal ("DimFactor(0.1,False)", v3.Height.ToString ());
-				Assert.Equal (19, v3.Frame.Width); // 198*10%=19 * Percent is related to the super-view if it isn't null otherwise the view width
-				Assert.Equal (19, v3.Frame.Height); // 199*10%=19
+				Assert.Equal ("Factor(0.1,False)", v3.Width.ToString ());
+				Assert.Equal ("Factor(0.1,False)", v3.Height.ToString ());
+				Assert.Equal (9, v3.Frame.Width); // 98*10%=9 * Percent is related to the super-view if it isn't null otherwise the view width
+				Assert.Equal (9, v3.Frame.Height); // 99*10%=9
 
 				v4.Text = "Button4";
 				v4.AutoSize = false;
-				Assert.Equal ("DimAbsolute(50)", v4.Width.ToString ());
-				Assert.Equal ("DimAbsolute(50)", v4.Height.ToString ());
+				Assert.Equal ("Absolute(50)", v4.Width.ToString ());
+				Assert.Equal ("Absolute(50)", v4.Height.ToString ());
 				Assert.Equal (50, v4.Frame.Width);
 				Assert.Equal (50, v4.Frame.Height);
 				v4.AutoSize = true;
-				Assert.Equal ("DimAbsolute(11)", v4.Width.ToString ());
-				Assert.Equal ("DimAbsolute(1)", v4.Height.ToString ());
+				Assert.Equal ("Absolute(11)", v4.Width.ToString ());
+				Assert.Equal ("Absolute(1)", v4.Height.ToString ());
 				Assert.Equal (11, v4.Frame.Width); // 11 is the text length and because is Dim.DimAbsolute
 				Assert.Equal (1, v4.Frame.Height); // 1 because is Dim.DimAbsolute
 
 				v5.Text = "Button5";
-				Assert.Equal ("DimCombine(DimView(Width,Button()({X=2,Y=7,Width=97,Height=189}))-DimView(Width,Button()({X=0,Y=0,Width=19,Height=19})))", v5.Width.ToString ());
-				Assert.Equal ("DimCombine(DimView(Height,Button()({X=2,Y=7,Width=97,Height=189}))-DimView(Height,Button()({X=0,Y=0,Width=19,Height=19})))", v5.Height.ToString ());
-				Assert.Equal (78, v5.Frame.Width); // 97-19=78
-				Assert.Equal (170, v5.Frame.Height); // 189-19=170
+				Assert.Equal ("Combine(DimView(Width,Button()({X=2,Y=7,Width=47,Height=89}))-DimView(Width,Button()({X=0,Y=0,Width=9,Height=9})))", v5.Width.ToString ());
+				Assert.Equal ("Combine(DimView(Height,Button()({X=2,Y=7,Width=47,Height=89}))-DimView(Height,Button()({X=0,Y=0,Width=9,Height=9})))", v5.Height.ToString ());
+				Assert.Equal (38, v5.Frame.Width); // 47-9=38
+				Assert.Equal (80, v5.Frame.Height); // 89-9=80
 
 				v6.Text = "Button6";
-				Assert.Equal ("DimFactor(0.2,True)", v6.Width.ToString ());
-				Assert.Equal ("DimFactor(0.2,True)", v6.Height.ToString ());
-				Assert.Equal (19, v6.Frame.Width); // 99*20%=19
-				Assert.Equal (38, v6.Frame.Height); // 198-7*20=38
+				Assert.Equal ("Factor(0.2,True)", v6.Width.ToString ());
+				Assert.Equal ("Factor(0.2,True)", v6.Height.ToString ());
+				Assert.Equal (9, v6.Frame.Width); // 49*20%=9
+				Assert.Equal (18, v6.Frame.Height); // 98-7*20=18
 			};
 
 			Application.Iteration += () => Application.RequestStop ();
@@ -634,12 +634,12 @@ namespace Terminal.Gui.TypeTests {
 					var label = new Label (field.Text) { X = 0, Y = view.Bounds.Height, Width = 20 };
 					view.Add (label);
 					Assert.Equal ($"Label {count}", label.Text);
-					Assert.Equal ($"PosAbsolute({count})", label.Y.ToString ());
+					Assert.Equal ($"Absolute({count})", label.Y.ToString ());
 
-					Assert.Equal ($"DimAbsolute({count})", view.Height.ToString ());
+					Assert.Equal ($"Absolute({count})", view.Height.ToString ());
 					view.Height += 1;
 					count++;
-					Assert.Equal ($"DimAbsolute({count})", view.Height.ToString ());
+					Assert.Equal ($"Absolute({count})", view.Height.ToString ());
 				}
 			};
 
@@ -1006,18 +1006,18 @@ namespace Terminal.Gui.TypeTests {
 						var label = new Label (field.Text) { X = 0, Y = view.Bounds.Height, Width = 10 };
 						view.Add (label);
 						Assert.Equal ($"Label {count}", label.Text);
-						Assert.Equal ($"PosAbsolute({count + 1})", label.Y.ToString ());
+						Assert.Equal ($"Absolute({count + 1})", label.Y.ToString ());
 						listLabels.Add (label);
 						if (count == 0) {
-							Assert.Equal ($"DimAbsolute({count})", view.Height.ToString ());
+							Assert.Equal ($"Absolute({count})", view.Height.ToString ());
 							view.Height += 2;
 						} else {
-							Assert.Equal ($"DimAbsolute({count + 1})", view.Height.ToString ());
+							Assert.Equal ($"Absolute({count + 1})", view.Height.ToString ());
 							view.Height += 1;
 						}
 						count++;
 					}
-					Assert.Equal ($"DimAbsolute({count + 1})", view.Height.ToString ());
+					Assert.Equal ($"Absolute({count + 1})", view.Height.ToString ());
 				}
 			};
 
@@ -1066,12 +1066,12 @@ namespace Terminal.Gui.TypeTests {
 				var label = new Label (field.Text) { X = 0, Y = view.Bounds.Height, Width = 20 };
 				view.Add (label);
 				Assert.Equal ($"Label {i}", label.Text);
-				Assert.Equal ($"PosAbsolute({i})", label.Y.ToString ());
+				Assert.Equal ($"Absolute({i})", label.Y.ToString ());
 				listLabels.Add (label);
 
-				Assert.Equal ($"DimAbsolute({i})", view.Height.ToString ());
+				Assert.Equal ($"Absolute({i})", view.Height.ToString ());
 				view.Height += 1;
-				Assert.Equal ($"DimAbsolute({i + 1})", view.Height.ToString ());
+				Assert.Equal ($"Absolute({i + 1})", view.Height.ToString ());
 			}
 
 			field.KeyDown += (k) => {
@@ -1079,10 +1079,10 @@ namespace Terminal.Gui.TypeTests {
 					Assert.Equal ($"Label {count - 1}", listLabels [count - 1].Text);
 					view.Remove (listLabels [count - 1]);
 
-					Assert.Equal ($"DimAbsolute({count})", view.Height.ToString ());
+					Assert.Equal ($"Absolute({count})", view.Height.ToString ());
 					view.Height -= 1;
 					count--;
-					Assert.Equal ($"DimAbsolute({count})", view.Height.ToString ());
+					Assert.Equal ($"Absolute({count})", view.Height.ToString ());
 				}
 			};
 
@@ -1125,17 +1125,17 @@ namespace Terminal.Gui.TypeTests {
 				var label = new Label (field.Text) { X = 0, Y = view.Bounds.Height, Width = 10 };
 				view.Add (label);
 				Assert.Equal ($"Label {i}", label.Text);
-				Assert.Equal ($"PosAbsolute({i + 1})", label.Y.ToString ());
+				Assert.Equal ($"Absolute({i + 1})", label.Y.ToString ());
 				listLabels.Add (label);
 
 				if (i == 0) {
-					Assert.Equal ($"DimAbsolute({i})", view.Height.ToString ());
+					Assert.Equal ($"Absolute({i})", view.Height.ToString ());
 					view.Height += 2;
-					Assert.Equal ($"DimAbsolute({i + 2})", view.Height.ToString ());
+					Assert.Equal ($"Absolute({i + 2})", view.Height.ToString ());
 				} else {
-					Assert.Equal ($"DimAbsolute({i + 1})", view.Height.ToString ());
+					Assert.Equal ($"Absolute({i + 1})", view.Height.ToString ());
 					view.Height += 1;
-					Assert.Equal ($"DimAbsolute({i + 2})", view.Height.ToString ());
+					Assert.Equal ($"Absolute({i + 2})", view.Height.ToString ());
 				}
 			}
 
@@ -1149,7 +1149,7 @@ namespace Terminal.Gui.TypeTests {
 						Assert.Equal ($"Label {count - 1}", listLabels [count - 1].Text);
 						view.Remove (listLabels [count - 1]);
 						listLabels.RemoveAt (count - 1);
-						Assert.Equal ($"DimAbsolute({count + 1})", view.Height.ToString ());
+						Assert.Equal ($"Absolute({count + 1})", view.Height.ToString ());
 						view.Height -= 1;
 						count--;
 						if (listLabels.Count > 0)
@@ -1157,7 +1157,7 @@ namespace Terminal.Gui.TypeTests {
 						else
 							field.Text = NStack.ustring.Empty;
 					}
-					Assert.Equal ($"DimAbsolute({count + 1})", view.Height.ToString ());
+					Assert.Equal ($"Absolute({count + 1})", view.Height.ToString ());
 				}
 			};
 

UnitTests/Types/PosTests.cs

@@ -32,11 +32,11 @@ namespace Terminal.Gui.TypeTests {
 		{
 			var n = 0;
 			var pos = Pos.AnchorEnd ();
-			Assert.Equal ($"PosAnchorEnd({n})", pos.ToString ());
+			Assert.Equal ($"AnchorEnd({n})", pos.ToString ());
 
 			n = 5;
 			pos = Pos.AnchorEnd (n);
-			Assert.Equal ($"PosAnchorEnd({n})", pos.ToString ());
+			Assert.Equal ($"AnchorEnd({n})", pos.ToString ());
 		}
 
 		[Fact]
@@ -351,13 +351,13 @@ namespace Terminal.Gui.TypeTests {
 		public void At_SetsValue ()
 		{
 			var pos = Pos.At (0);
-			Assert.Equal ("PosAbsolute(0)", pos.ToString ());
+			Assert.Equal ("Absolute(0)", pos.ToString ());
 
 			pos = Pos.At (5);
-			Assert.Equal ("PosAbsolute(5)", pos.ToString ());
+			Assert.Equal ("Absolute(5)", pos.ToString ());
 
 			pos = Pos.At (-1);
-			Assert.Equal ("PosAbsolute(-1)", pos.ToString ());
+			Assert.Equal ("Absolute(-1)", pos.ToString ());
 		}
 
 		[Fact]
@@ -411,140 +411,140 @@ namespace Terminal.Gui.TypeTests {
 			testInt = 0;
 			testRect = Rect.Empty;
 			pos = Pos.Left (new View ());
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			pos = Pos.Left (new View (testRect));
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testRect = new Rect (1, 2, 3, 4);
 			pos = Pos.Left (new View (testRect));
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			// Pos.Left(win) + 0
 			pos = Pos.Left (new View (testRect)) + testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testInt = 1;
 			// Pos.Left(win) +1
 			pos = Pos.Left (new View (testRect)) + testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testInt = -1;
 			// Pos.Left(win) -1
 			pos = Pos.Left (new View (testRect)) - testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			// Pos.X
 			side = "x";
 			testInt = 0;
 			testRect = Rect.Empty;
 			pos = Pos.X (new View ());
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			pos = Pos.X (new View (testRect));
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testRect = new Rect (1, 2, 3, 4);
 			pos = Pos.X (new View (testRect));
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			// Pos.X(win) + 0
 			pos = Pos.X (new View (testRect)) + testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testInt = 1;
 			// Pos.X(win) +1
 			pos = Pos.X (new View (testRect)) + testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testInt = -1;
 			// Pos.X(win) -1
 			pos = Pos.X (new View (testRect)) - testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			// Pos.Top
 			side = "y";
 			testInt = 0;
 			testRect = Rect.Empty;
 			pos = Pos.Top (new View ());
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			pos = Pos.Top (new View (testRect));
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testRect = new Rect (1, 2, 3, 4);
 			pos = Pos.Top (new View (testRect));
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			// Pos.Top(win) + 0
 			pos = Pos.Top (new View (testRect)) + testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testInt = 1;
 			// Pos.Top(win) +1
 			pos = Pos.Top (new View (testRect)) + testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testInt = -1;
 			// Pos.Top(win) -1
 			pos = Pos.Top (new View (testRect)) - testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			// Pos.Y
 			side = "y";
 			testInt = 0;
 			testRect = Rect.Empty;
 			pos = Pos.Y (new View ());
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			pos = Pos.Y (new View (testRect));
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testRect = new Rect (1, 2, 3, 4);
 			pos = Pos.Y (new View (testRect));
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			// Pos.Y(win) + 0
 			pos = Pos.Y (new View (testRect)) + testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testInt = 1;
 			// Pos.Y(win) +1
 			pos = Pos.Y (new View (testRect)) + testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testInt = -1;
 			// Pos.Y(win) -1
 			pos = Pos.Y (new View (testRect)) - testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			// Pos.Bottom
 			side = "bottom";
 			testRect = Rect.Empty;
 			testInt = 0;
 			pos = Pos.Bottom (new View ());
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			pos = Pos.Bottom (new View (testRect));
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testRect = new Rect (1, 2, 3, 4);
 			pos = Pos.Bottom (new View (testRect));
-			Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			// Pos.Bottom(win) + 0
 			pos = Pos.Bottom (new View (testRect)) + testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testInt = 1;
 			// Pos.Bottom(win) +1
 			pos = Pos.Bottom (new View (testRect)) + testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 
 			testInt = -1;
 			// Pos.Bottom(win) -1
 			pos = Pos.Bottom (new View (testRect)) - testInt;
-			Assert.Equal ($"PosCombine(PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+PosAbsolute(0)){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ());
+			Assert.Equal ($"Combine(Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}}))+Absolute(0)){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ());
 		}
 
 		// See: https://github.com/gui-cs/Terminal.Gui/issues/504
@@ -632,7 +632,7 @@ namespace Terminal.Gui.TypeTests {
 		public void Center_SetsValue ()
 		{
 			var pos = Pos.Center ();
-			Assert.Equal ("PosCenter", pos.ToString ());
+			Assert.Equal ("Center", pos.ToString ());
 		}
 
 		[Fact]
@@ -640,13 +640,13 @@ namespace Terminal.Gui.TypeTests {
 		{
 			float f = 0;
 			var pos = Pos.Percent (f);
-			Assert.Equal ($"PosFactor({f / 100:0.###})", pos.ToString ());
+			Assert.Equal ($"Factor({f / 100:0.###})", pos.ToString ());
 			f = 0.5F;
 			pos = Pos.Percent (f);
-			Assert.Equal ($"PosFactor({f / 100:0.###})", pos.ToString ());
+			Assert.Equal ($"Factor({f / 100:0.###})", pos.ToString ());
 			f = 100;
 			pos = Pos.Percent (f);
-			Assert.Equal ($"PosFactor({f / 100:0.###})", pos.ToString ());
+			Assert.Equal ($"Factor({f / 100:0.###})", pos.ToString ());
 		}
 
 		[Fact]
@@ -881,12 +881,12 @@ namespace Terminal.Gui.TypeTests {
 					var label = new Label (field.Text) { X = 0, Y = field.Y, Width = 20 };
 					view.Add (label);
 					Assert.Equal ($"Label {count}", label.Text);
-					Assert.Equal ($"PosAbsolute({count})", label.Y.ToString ());
+					Assert.Equal ($"Absolute({count})", label.Y.ToString ());
 
-					Assert.Equal ($"PosAbsolute({count})", field.Y.ToString ());
+					Assert.Equal ($"Absolute({count})", field.Y.ToString ());
 					field.Y += 1;
 					count++;
-					Assert.Equal ($"PosAbsolute({count})", field.Y.ToString ());
+					Assert.Equal ($"Absolute({count})", field.Y.ToString ());
 				}
 			};
 
@@ -928,12 +928,12 @@ namespace Terminal.Gui.TypeTests {
 				var label = new Label (field.Text) { X = 0, Y = field.Y, Width = 20 };
 				view.Add (label);
 				Assert.Equal ($"Label {i}", label.Text);
-				Assert.Equal ($"PosAbsolute({i})", field.Y.ToString ());
+				Assert.Equal ($"Absolute({i})", field.Y.ToString ());
 				listLabels.Add (label);
 
-				Assert.Equal ($"PosAbsolute({i})", field.Y.ToString ());
+				Assert.Equal ($"Absolute({i})", field.Y.ToString ());
 				field.Y += 1;
-				Assert.Equal ($"PosAbsolute({i + 1})", field.Y.ToString ());
+				Assert.Equal ($"Absolute({i + 1})", field.Y.ToString ());
 			}
 
 			field.KeyDown += (k) => {
@@ -941,10 +941,10 @@ namespace Terminal.Gui.TypeTests {
 					Assert.Equal ($"Label {count - 1}", listLabels [count - 1].Text);
 					view.Remove (listLabels [count - 1]);
 
-					Assert.Equal ($"PosAbsolute({count})", field.Y.ToString ());
+					Assert.Equal ($"Absolute({count})", field.Y.ToString ());
 					field.Y -= 1;
 					count--;
-					Assert.Equal ($"PosAbsolute({count})", field.Y.ToString ());
+					Assert.Equal ($"Absolute({count})", field.Y.ToString ());
 				}
 			};
 

UnitTests/Views/ScrollBarViewTests.cs

@@ -362,85 +362,85 @@ namespace Terminal.Gui.ViewTests {
 			_hostView.Redraw (_hostView.Bounds);
 			Assert.True (_scrollBar.ShowScrollIndicator);
 			Assert.True (_scrollBar.Visible);
-			Assert.Equal ("DimAbsolute(1)", _scrollBar.Width.ToString ());
+			Assert.Equal ("Absolute(1)", _scrollBar.Width.ToString ());
 			Assert.Equal (1, _scrollBar.Bounds.Width);
-			Assert.Equal ("DimCombine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))",
+			Assert.Equal ("Combine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))",
 				_scrollBar.Height.ToString ());
 			Assert.Equal (24, _scrollBar.Bounds.Height);
 			Assert.True (_scrollBar.OtherScrollBarView.ShowScrollIndicator);
 			Assert.True (_scrollBar.OtherScrollBarView.Visible);
-			Assert.Equal ("DimCombine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))",
+			Assert.Equal ("Combine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))",
 				_scrollBar.OtherScrollBarView.Width.ToString ());
 			Assert.Equal (79, _scrollBar.OtherScrollBarView.Bounds.Width);
-			Assert.Equal ("DimAbsolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ());
+			Assert.Equal ("Absolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ());
 			Assert.Equal (1, _scrollBar.OtherScrollBarView.Bounds.Height);
 
 			_hostView.Lines = 10;
 			_hostView.Redraw (_hostView.Bounds);
 			Assert.False (_scrollBar.ShowScrollIndicator);
 			Assert.False (_scrollBar.Visible);
-			Assert.Equal ("DimAbsolute(1)", _scrollBar.Width.ToString ());
+			Assert.Equal ("Absolute(1)", _scrollBar.Width.ToString ());
 			Assert.Equal (1, _scrollBar.Bounds.Width);
-			Assert.Equal ("DimCombine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))",
+			Assert.Equal ("Combine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))",
 				_scrollBar.Height.ToString ());
 			Assert.Equal (24, _scrollBar.Bounds.Height);
 			Assert.True (_scrollBar.OtherScrollBarView.ShowScrollIndicator);
 			Assert.True (_scrollBar.OtherScrollBarView.Visible);
-			Assert.Equal ("DimCombine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(0))",
+			Assert.Equal ("Combine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(0))",
 				_scrollBar.OtherScrollBarView.Width.ToString ());
 			Assert.Equal (80, _scrollBar.OtherScrollBarView.Bounds.Width);
-			Assert.Equal ("DimAbsolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ());
+			Assert.Equal ("Absolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ());
 			Assert.Equal (1, _scrollBar.OtherScrollBarView.Bounds.Height);
 
 			_hostView.Cols = 60;
 			_hostView.Redraw (_hostView.Bounds);
 			Assert.False (_scrollBar.ShowScrollIndicator);
 			Assert.False (_scrollBar.Visible);
-			Assert.Equal ("DimAbsolute(1)", _scrollBar.Width.ToString ());
+			Assert.Equal ("Absolute(1)", _scrollBar.Width.ToString ());
 			Assert.Equal (1, _scrollBar.Bounds.Width);
-			Assert.Equal ("DimCombine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))",
+			Assert.Equal ("Combine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))",
 				_scrollBar.Height.ToString ());
 			Assert.Equal (24, _scrollBar.Bounds.Height);
 			Assert.False (_scrollBar.OtherScrollBarView.ShowScrollIndicator);
 			Assert.False (_scrollBar.OtherScrollBarView.Visible);
-			Assert.Equal ("DimCombine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(0))",
+			Assert.Equal ("Combine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(0))",
 				_scrollBar.OtherScrollBarView.Width.ToString ());
 			Assert.Equal (80, _scrollBar.OtherScrollBarView.Bounds.Width);
-			Assert.Equal ("DimAbsolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ());
+			Assert.Equal ("Absolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ());
 			Assert.Equal (1, _scrollBar.OtherScrollBarView.Bounds.Height);
 
 			_hostView.Lines = 40;
 			_hostView.Redraw (_hostView.Bounds);
 			Assert.True (_scrollBar.ShowScrollIndicator);
 			Assert.True (_scrollBar.Visible);
-			Assert.Equal ("DimAbsolute(1)", _scrollBar.Width.ToString ());
+			Assert.Equal ("Absolute(1)", _scrollBar.Width.ToString ());
 			Assert.Equal (1, _scrollBar.Bounds.Width);
-			Assert.Equal ("DimCombine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(0))",
+			Assert.Equal ("Combine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(0))",
 				_scrollBar.Height.ToString ());
 			Assert.Equal (25, _scrollBar.Bounds.Height);
 			Assert.False (_scrollBar.OtherScrollBarView.ShowScrollIndicator);
 			Assert.False (_scrollBar.OtherScrollBarView.Visible);
-			Assert.Equal ("DimCombine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(0))",
+			Assert.Equal ("Combine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(0))",
 				_scrollBar.OtherScrollBarView.Width.ToString ());
 			Assert.Equal (80, _scrollBar.OtherScrollBarView.Bounds.Width);
-			Assert.Equal ("DimAbsolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ());
+			Assert.Equal ("Absolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ());
 			Assert.Equal (1, _scrollBar.OtherScrollBarView.Bounds.Height);
 
 			_hostView.Cols = 120;
 			_hostView.Redraw (_hostView.Bounds);
 			Assert.True (_scrollBar.ShowScrollIndicator);
 			Assert.True (_scrollBar.Visible);
-			Assert.Equal ("DimAbsolute(1)", _scrollBar.Width.ToString ());
+			Assert.Equal ("Absolute(1)", _scrollBar.Width.ToString ());
 			Assert.Equal (1, _scrollBar.Bounds.Width);
-			Assert.Equal ("DimCombine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))",
+			Assert.Equal ("Combine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))",
 				_scrollBar.Height.ToString ());
 			Assert.Equal (24, _scrollBar.Bounds.Height);
 			Assert.True (_scrollBar.OtherScrollBarView.ShowScrollIndicator);
 			Assert.True (_scrollBar.OtherScrollBarView.Visible);
-			Assert.Equal ("DimCombine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))",
+			Assert.Equal ("Combine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))",
 				_scrollBar.OtherScrollBarView.Width.ToString ());
 			Assert.Equal (79, _scrollBar.OtherScrollBarView.Bounds.Width);
-			Assert.Equal ("DimAbsolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ());
+			Assert.Equal ("Absolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ());
 			Assert.Equal (1, _scrollBar.OtherScrollBarView.Bounds.Height);
 		}
 

UnitTests/Views/StatusBarTests.cs

@@ -31,7 +31,7 @@ namespace Terminal.Gui.ViewTests {
 			Assert.False (sb.CanFocus);
 			Assert.Equal (Colors.Menu, sb.ColorScheme);
 			Assert.Equal (0, sb.X);
-			Assert.Equal ("PosAnchorEnd(1)", sb.Y.ToString ());
+			Assert.Equal ("AnchorEnd(1)", sb.Y.ToString ());
 			Assert.Equal (Dim.Fill (), sb.Width);
 			Assert.Equal (1, sb.Height);
 

UnitTests/Views/TextViewTests.cs

@@ -1524,8 +1524,8 @@ namespace Terminal.Gui.ViewTests {
 			Assert.True (_textView.AllowsReturn);
 			Assert.Equal (4, _textView.TabWidth);
 			Assert.True (_textView.AllowsTab);
-			Assert.Equal ("DimAbsolute(30)", _textView.Width.ToString ());
-			Assert.Equal ("DimAbsolute(10)", _textView.Height.ToString ());
+			Assert.Equal ("Absolute(30)", _textView.Width.ToString ());
+			Assert.Equal ("Absolute(10)", _textView.Height.ToString ());
 			Assert.False (_textView.WordWrap);
 
 			_textView.WordWrap = true;
@@ -1535,8 +1535,8 @@ namespace Terminal.Gui.ViewTests {
 			Assert.False (_textView.AllowsReturn);
 			Assert.Equal (0, _textView.TabWidth);
 			Assert.False (_textView.AllowsTab);
-			Assert.Equal ("DimAbsolute(30)", _textView.Width.ToString ());
-			Assert.Equal ("DimAbsolute(1)", _textView.Height.ToString ());
+			Assert.Equal ("Absolute(30)", _textView.Width.ToString ());
+			Assert.Equal ("Absolute(1)", _textView.Height.ToString ());
 			Assert.False (_textView.WordWrap);
 
 			_textView.WordWrap = true;
@@ -1546,8 +1546,8 @@ namespace Terminal.Gui.ViewTests {
 			Assert.True (_textView.AllowsReturn);
 			Assert.Equal (4, _textView.TabWidth);
 			Assert.True (_textView.AllowsTab);
-			Assert.Equal ("DimAbsolute(30)", _textView.Width.ToString ());
-			Assert.Equal ("DimAbsolute(10)", _textView.Height.ToString ());
+			Assert.Equal ("Absolute(30)", _textView.Width.ToString ());
+			Assert.Equal ("Absolute(10)", _textView.Height.ToString ());
 			Assert.False (_textView.WordWrap);
 		}