diff --git a/Terminal.Gui/Core/PosDim.cs b/Terminal.Gui/Core/PosDim.cs index 696607696..0c9278359 100644 --- a/Terminal.Gui/Core/PosDim.cs +++ b/Terminal.Gui/Core/PosDim.cs @@ -85,7 +85,7 @@ namespace Terminal.Gui { public override string ToString () { - return $"Factor({factor})"; + return $"PosFactor({factor})"; } public override int GetHashCode () => factor.GetHashCode (); @@ -135,7 +135,7 @@ namespace Terminal.Gui { public override string ToString () { - return $"AnchorEnd({n})"; + return $"PosAnchorEnd({n})"; } } @@ -174,7 +174,7 @@ namespace Terminal.Gui { public override string ToString () { - return "Center"; + return "PosCenter"; } } @@ -209,7 +209,7 @@ namespace Terminal.Gui { public override string ToString () { - return $"Absolute({n})"; + return $"PosAbsolute({n})"; } internal override int Anchor (int width) @@ -264,7 +264,7 @@ namespace Terminal.Gui { public override string ToString () { - return $"Combine({left}{(add ? '+' : '-')}{right})"; + return $"PosCombine({left}{(add ? '+' : '-')}{right})"; } } @@ -345,7 +345,7 @@ namespace Terminal.Gui { case 3: tside = "bottom"; break; default: tside = "unknown"; break; } - return $"View({tside},{Target.ToString()})"; + return $"PosView({tside},{Target.ToString ()})"; } public override int GetHashCode () => Target.GetHashCode (); @@ -482,7 +482,7 @@ namespace Terminal.Gui { public override string ToString () { - return $"Factor({factor},{remaining})"; + return $"DimFactor({factor},{remaining})"; } public override int GetHashCode () => factor.GetHashCode (); @@ -522,7 +522,7 @@ namespace Terminal.Gui { public override string ToString () { - return $"Absolute({n})"; + return $"DimAbsolute({n})"; } internal override int Anchor (int width) @@ -541,7 +541,7 @@ namespace Terminal.Gui { public override string ToString () { - return $"Fill({margin})"; + return $"DimFill({margin})"; } internal override int Anchor (int width) @@ -613,7 +613,7 @@ namespace Terminal.Gui { public override string ToString () { - return $"Combine({left}{(add ? '+' : '-')}{right})"; + return $"DimCombine({left}{(add ? '+' : '-')}{right})"; } } diff --git a/UnitTests/Core/LayoutTests.cs b/UnitTests/Core/LayoutTests.cs index cf6cffe6c..0c103d23a 100644 --- a/UnitTests/Core/LayoutTests.cs +++ b/UnitTests/Core/LayoutTests.cs @@ -598,10 +598,10 @@ Y Assert.False (view.AutoSize); Assert.Equal (TextDirection.LeftRight_TopBottom, view.TextDirection); Assert.Equal (Rect.Empty, view.Frame); - 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 ()); + 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 ()); var expected = @" ┌────────────────────┐ │ │ @@ -635,10 +635,10 @@ Y Application.Refresh (); Assert.Equal (new Rect (0, 0, 11, 1), view.Frame); - 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 ()); + 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 ()); expected = @" ┌────────────────────┐ │Hello World │ @@ -672,10 +672,10 @@ Y Application.Refresh (); Assert.Equal (new Rect (0, 0, 12, 1), view.Frame); - 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 ()); + 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 ()); expected = @" ┌────────────────────┐ │Hello Worlds │ @@ -708,10 +708,10 @@ Y Application.Refresh (); Assert.Equal (new Rect (0, 0, 11, 12), view.Frame); - 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 ()); + 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 ()); expected = @" ┌────────────────────┐ │H │ @@ -745,10 +745,10 @@ Y Application.Refresh (); Assert.Equal (new Rect (0, 0, 11, 1), view.Frame); - 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 ()); + 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 ()); expected = @" ┌────────────────────┐ │HelloWorlds │ @@ -781,10 +781,10 @@ Y Application.Refresh (); Assert.Equal (new Rect (0, 0, 11, 1), view.Frame); - 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 ()); + 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 ()); expected = @" ┌────────────────────┐ │Hello World │ @@ -821,10 +821,10 @@ Y Application.Refresh (); Assert.Equal (new Rect (0, 0, 1, 11), view.Frame); - 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 ()); + 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 ()); expected = @" ┌────────────────────┐ │H │ @@ -857,10 +857,10 @@ Y Application.Refresh (); Assert.Equal (new Rect (0, 0, 1, 12), view.Frame); - 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 ()); + 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 ()); expected = @" ┌────────────────────┐ │H │ @@ -921,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 ("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 ("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 (new Rect (0, 3, 2, 8), verticalView.Frame); - 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 ()); + 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 ()); var expected = @" ┌────────────────────┐ │Finish 終 │ @@ -964,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 ("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 ()); + 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 ()); expected = @" ┌────────────────────┐ │Finish 終 │ @@ -1079,28 +1079,28 @@ Y Assert.False (view5.IsInitialized); Assert.False (view1.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view1.Frame); - Assert.Equal ("Absolute(10)", view1.Width.ToString ()); - Assert.Equal ("Absolute(5)", view1.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view1.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view1.Height.ToString ()); Assert.False (view2.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view2.Frame); - Assert.Equal ("Absolute(10)", view2.Width.ToString ()); - Assert.Equal ("Absolute(5)", view2.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view2.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view2.Height.ToString ()); Assert.False (view3.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view3.Frame); - Assert.Equal ("Absolute(10)", view3.Width.ToString ()); - Assert.Equal ("Absolute(5)", view3.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view3.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view3.Height.ToString ()); Assert.False (view4.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view4.Frame); - Assert.Equal ("Absolute(10)", view4.Width.ToString ()); - Assert.Equal ("Absolute(5)", view4.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view4.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view4.Height.ToString ()); Assert.False (view5.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view5.Frame); - Assert.Equal ("Absolute(10)", view5.Width.ToString ()); - Assert.Equal ("Absolute(5)", view5.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view5.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view5.Height.ToString ()); Assert.False (view6.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view6.Frame); - Assert.Equal ("Absolute(10)", view6.Width.ToString ()); - Assert.Equal ("Absolute(5)", view6.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view6.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view6.Height.ToString ()); Application.Begin (Application.Top); @@ -1111,28 +1111,28 @@ Y Assert.True (view5.IsInitialized); Assert.False (view1.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view1.Frame); - Assert.Equal ("Absolute(10)", view1.Width.ToString ()); - Assert.Equal ("Absolute(5)", view1.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view1.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view1.Height.ToString ()); Assert.False (view2.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view2.Frame); - Assert.Equal ("Absolute(10)", view2.Width.ToString ()); - Assert.Equal ("Absolute(5)", view2.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view2.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view2.Height.ToString ()); Assert.False (view3.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view3.Frame); - Assert.Equal ("Absolute(10)", view3.Width.ToString ()); - Assert.Equal ("Absolute(5)", view3.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view3.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view3.Height.ToString ()); Assert.False (view4.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view4.Frame); - Assert.Equal ("Absolute(10)", view4.Width.ToString ()); - Assert.Equal ("Absolute(5)", view4.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view4.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view4.Height.ToString ()); Assert.False (view5.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view5.Frame); - Assert.Equal ("Absolute(10)", view5.Width.ToString ()); - Assert.Equal ("Absolute(5)", view5.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view5.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view5.Height.ToString ()); Assert.False (view6.AutoSize); Assert.Equal (new Rect (0, 0, 10, 5), view6.Frame); - Assert.Equal ("Absolute(10)", view6.Width.ToString ()); - Assert.Equal ("Absolute(5)", view6.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view6.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view6.Height.ToString ()); } [Fact, AutoInitShutdown] @@ -1171,28 +1171,28 @@ Y Assert.False (view5.IsInitialized); Assert.True (view1.AutoSize); Assert.Equal (new Rect (0, 0, 18, 5), view1.Frame); - Assert.Equal ("Absolute(10)", view1.Width.ToString ()); - Assert.Equal ("Absolute(5)", view1.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view1.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view1.Height.ToString ()); Assert.True (view2.AutoSize); Assert.Equal (new Rect (0, 0, 18, 5), view2.Frame); - Assert.Equal ("Absolute(10)", view2.Width.ToString ()); - Assert.Equal ("Absolute(5)", view2.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view2.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view2.Height.ToString ()); Assert.True (view3.AutoSize); Assert.Equal (new Rect (0, 0, 18, 5), view3.Frame); - Assert.Equal ("Absolute(10)", view3.Width.ToString ()); - Assert.Equal ("Absolute(5)", view3.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view3.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view3.Height.ToString ()); Assert.True (view4.AutoSize); Assert.Equal (new Rect (0, 0, 10, 17), view4.Frame); - Assert.Equal ("Absolute(10)", view4.Width.ToString ()); - Assert.Equal ("Absolute(5)", view4.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view4.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view4.Height.ToString ()); Assert.True (view5.AutoSize); Assert.Equal (new Rect (0, 0, 10, 17), view5.Frame); - Assert.Equal ("Absolute(10)", view5.Width.ToString ()); - Assert.Equal ("Absolute(5)", view5.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view5.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view5.Height.ToString ()); Assert.True (view6.AutoSize); Assert.Equal (new Rect (0, 0, 10, 17), view6.Frame); - Assert.Equal ("Absolute(10)", view6.Width.ToString ()); - Assert.Equal ("Absolute(5)", view6.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view6.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view6.Height.ToString ()); Application.Begin (Application.Top); @@ -1203,28 +1203,28 @@ Y Assert.True (view5.IsInitialized); Assert.True (view1.AutoSize); Assert.Equal (new Rect (0, 0, 18, 5), view1.Frame); - Assert.Equal ("Absolute(10)", view1.Width.ToString ()); - Assert.Equal ("Absolute(5)", view1.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view1.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view1.Height.ToString ()); Assert.True (view2.AutoSize); Assert.Equal (new Rect (0, 0, 18, 5), view2.Frame); - Assert.Equal ("Absolute(10)", view2.Width.ToString ()); - Assert.Equal ("Absolute(5)", view2.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view2.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view2.Height.ToString ()); Assert.True (view3.AutoSize); Assert.Equal (new Rect (0, 0, 18, 5), view3.Frame); - Assert.Equal ("Absolute(10)", view3.Width.ToString ()); - Assert.Equal ("Absolute(5)", view3.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view3.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view3.Height.ToString ()); Assert.True (view4.AutoSize); Assert.Equal (new Rect (0, 0, 10, 17), view4.Frame); - Assert.Equal ("Absolute(10)", view4.Width.ToString ()); - Assert.Equal ("Absolute(5)", view4.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view4.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view4.Height.ToString ()); Assert.True (view5.AutoSize); Assert.Equal (new Rect (0, 0, 10, 17), view5.Frame); - Assert.Equal ("Absolute(10)", view5.Width.ToString ()); - Assert.Equal ("Absolute(5)", view5.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view5.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view5.Height.ToString ()); Assert.True (view6.AutoSize); Assert.Equal (new Rect (0, 0, 10, 17), view6.Frame); - Assert.Equal ("Absolute(10)", view6.Width.ToString ()); - Assert.Equal ("Absolute(5)", view6.Height.ToString ()); + Assert.Equal ("DimAbsolute(10)", view6.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", view6.Height.ToString ()); } [Fact, AutoInitShutdown] @@ -1243,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 ("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.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.True (view2.AutoSize); Assert.Equal (LayoutStyle.Absolute, view2.LayoutStyle); Assert.Equal (new Rect (0, 0, 2, 17), view2.Frame); - 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 ()); + 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 ()); view1.Frame = new Rect (0, 0, 25, 4); bool firstIteration = false; @@ -1262,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 ("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.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 ()); view2.Frame = new Rect (0, 0, 1, 25); Application.RunMainLoopIteration (ref rs, true, ref firstIteration); @@ -1273,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 ("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 ()); + 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 ()); } [Fact, AutoInitShutdown] @@ -1291,10 +1291,10 @@ Y Assert.Null (view1.Height); top.Add (view1); Assert.True (view1.IsAdded); - 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 ()); + 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 ()); var view2 = new View () { X = Pos.Center (), @@ -1303,16 +1303,16 @@ Y Height = Dim.Fill () }; Assert.False (view2.IsAdded); - 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 ()); + 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 ()); top.Add (view2); Assert.True (view2.IsAdded); - 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 ()); + 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 ()); } [Fact] diff --git a/UnitTests/TopLevels/ToplevelTests.cs b/UnitTests/TopLevels/ToplevelTests.cs index 1be120dea..69b5f88ea 100644 --- a/UnitTests/TopLevels/ToplevelTests.cs +++ b/UnitTests/TopLevels/ToplevelTests.cs @@ -19,8 +19,8 @@ namespace Terminal.Gui.TopLevelTests { var top = new Toplevel (); Assert.Equal (Colors.TopLevel, top.ColorScheme); - Assert.Equal ("Fill(0)", top.Width.ToString ()); - Assert.Equal ("Fill(0)", top.Height.ToString ()); + Assert.Equal ("DimFill(0)", top.Width.ToString ()); + Assert.Equal ("DimFill(0)", top.Height.ToString ()); Assert.False (top.Running); Assert.False (top.Modal); Assert.Null (top.MenuBar); diff --git a/UnitTests/Types/DimTests.cs b/UnitTests/Types/DimTests.cs index 5a98d5db9..5062fe83c 100644 --- a/UnitTests/Types/DimTests.cs +++ b/UnitTests/Types/DimTests.cs @@ -37,15 +37,15 @@ namespace Terminal.Gui.TypeTests { public void Sized_SetsValue () { var dim = Dim.Sized (0); - Assert.Equal ("Absolute(0)", dim.ToString ()); + Assert.Equal ("DimAbsolute(0)", dim.ToString ()); int testVal = 5; dim = Dim.Sized (testVal); - Assert.Equal ($"Absolute({testVal})", dim.ToString ()); + Assert.Equal ($"DimAbsolute({testVal})", dim.ToString ()); testVal = -1; dim = Dim.Sized (testVal); - Assert.Equal ($"Absolute({testVal})", dim.ToString ()); + Assert.Equal ($"DimAbsolute({testVal})", dim.ToString ()); } [Fact] @@ -155,15 +155,15 @@ namespace Terminal.Gui.TypeTests { { var testMargin = 0; var dim = Dim.Fill (); - Assert.Equal ($"Fill({testMargin})", dim.ToString ()); + Assert.Equal ($"DimFill({testMargin})", dim.ToString ()); testMargin = 0; dim = Dim.Fill (testMargin); - Assert.Equal ($"Fill({testMargin})", dim.ToString ()); + Assert.Equal ($"DimFill({testMargin})", dim.ToString ()); testMargin = 5; dim = Dim.Fill (testMargin); - Assert.Equal ($"Fill({testMargin})", dim.ToString ()); + Assert.Equal ($"DimFill({testMargin})", dim.ToString ()); } @@ -182,13 +182,13 @@ namespace Terminal.Gui.TypeTests { { float f = 0; var dim = Dim.Percent (f); - Assert.Equal ($"Factor({f / 100:0.###},{false})", dim.ToString ()); + Assert.Equal ($"DimFactor({f / 100:0.###},{false})", dim.ToString ()); f = 0.5F; dim = Dim.Percent (f); - Assert.Equal ($"Factor({f / 100:0.###},{false})", dim.ToString ()); + Assert.Equal ($"DimFactor({f / 100:0.###},{false})", dim.ToString ()); f = 100; dim = Dim.Percent (f); - Assert.Equal ($"Factor({f / 100:0.###},{false})", dim.ToString ()); + Assert.Equal ($"DimFactor({f / 100:0.###},{false})", dim.ToString ()); } [Fact] @@ -420,48 +420,48 @@ namespace Terminal.Gui.TypeTests { t.Add (w); t.Ready += () => { - Assert.Equal ("Absolute(100)", w.Width.ToString ()); - Assert.Equal ("Absolute(100)", w.Height.ToString ()); + Assert.Equal ("DimAbsolute(100)", w.Width.ToString ()); + Assert.Equal ("DimAbsolute(100)", w.Height.ToString ()); Assert.Equal (100, w.Frame.Width); Assert.Equal (100, w.Frame.Height); - Assert.Equal ("Factor(0.5,False)", f1.Width.ToString ()); - Assert.Equal ("Absolute(5)", f1.Height.ToString ()); + Assert.Equal ("DimFactor(0.5,False)", f1.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", f1.Height.ToString ()); Assert.Equal (49, f1.Frame.Width); // 50-1=49 Assert.Equal (5, f1.Frame.Height); - Assert.Equal ("Fill(0)", f2.Width.ToString ()); - Assert.Equal ("Absolute(5)", f2.Height.ToString ()); + Assert.Equal ("DimFill(0)", f2.Width.ToString ()); + Assert.Equal ("DimAbsolute(5)", f2.Height.ToString ()); Assert.Equal (49, f2.Frame.Width); // 50-1=49 Assert.Equal (5, f2.Frame.Height); - 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 ("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 (47, v1.Frame.Width); // 49-2=47 Assert.Equal (89, v1.Frame.Height); // 98-5-2-2=89 - 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 ("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 (47, v2.Frame.Width); // 49-2=47 Assert.Equal (89, v2.Frame.Height); // 98-5-2-2=89 - Assert.Equal ("Factor(0.1,False)", v3.Width.ToString ()); - Assert.Equal ("Factor(0.1,False)", v3.Height.ToString ()); + Assert.Equal ("DimFactor(0.1,False)", v3.Width.ToString ()); + Assert.Equal ("DimFactor(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 ("Absolute(50)", v4.Width.ToString ()); - Assert.Equal ("Absolute(50)", v4.Height.ToString ()); + Assert.Equal ("DimAbsolute(50)", v4.Width.ToString ()); + Assert.Equal ("DimAbsolute(50)", v4.Height.ToString ()); Assert.Equal (50, v4.Frame.Width); Assert.Equal (50, v4.Frame.Height); - 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 ("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 (38, v5.Frame.Width); // 47-9=38 Assert.Equal (80, v5.Frame.Height); // 89-9=80 - Assert.Equal ("Factor(0.2,True)", v6.Width.ToString ()); - Assert.Equal ("Factor(0.2,True)", v6.Height.ToString ()); + Assert.Equal ("DimFactor(0.2,True)", v6.Width.ToString ()); + Assert.Equal ("DimFactor(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,62 +469,62 @@ namespace Terminal.Gui.TypeTests { w.Height = 200; t.LayoutSubviews (); - Assert.Equal ("Absolute(200)", w.Width.ToString ()); - Assert.Equal ("Absolute(200)", w.Height.ToString ()); + Assert.Equal ("DimAbsolute(200)", w.Width.ToString ()); + Assert.Equal ("DimAbsolute(200)", w.Height.ToString ()); Assert.Equal (200, w.Frame.Width); Assert.Equal (200, w.Frame.Height); f1.Text = "Frame1"; - Assert.Equal ("Factor(0.5,False)", f1.Width.ToString ()); - Assert.Equal ("Absolute(5)", f1.Height.ToString ()); + 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 (5, f1.Frame.Height); f2.Text = "Frame2"; - Assert.Equal ("Fill(0)", f2.Width.ToString ()); - Assert.Equal ("Absolute(5)", f2.Height.ToString ()); + 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 (5, f2.Frame.Height); v1.Text = "Button1"; - Assert.Equal ("Combine(DimView(Width,FrameView()({X=0,Y=0,Width=99,Height=5}))-Absolute(2))", v1.Width.ToString ()); - Assert.Equal ("Combine(Fill(0)-Absolute(2))", v1.Height.ToString ()); + 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 v2.Text = "Button2"; - Assert.Equal ("Combine(DimView(Width,FrameView()({X=99,Y=0,Width=99,Height=5}))-Absolute(2))", v2.Width.ToString ()); - Assert.Equal ("Combine(Fill(0)-Absolute(2))", v2.Height.ToString ()); + 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 v3.Text = "Button3"; - Assert.Equal ("Factor(0.1,False)", v3.Width.ToString ()); - Assert.Equal ("Factor(0.1,False)", v3.Height.ToString ()); + 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 v4.Text = "Button4"; v4.AutoSize = false; - Assert.Equal ("Absolute(50)", v4.Width.ToString ()); - Assert.Equal ("Absolute(50)", v4.Height.ToString ()); + Assert.Equal ("DimAbsolute(50)", v4.Width.ToString ()); + Assert.Equal ("DimAbsolute(50)", v4.Height.ToString ()); Assert.Equal (50, v4.Frame.Width); Assert.Equal (50, v4.Frame.Height); v4.AutoSize = true; - Assert.Equal ("Absolute(11)", v4.Width.ToString ()); - Assert.Equal ("Absolute(1)", v4.Height.ToString ()); + Assert.Equal ("DimAbsolute(11)", v4.Width.ToString ()); + Assert.Equal ("DimAbsolute(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 ("Combine(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 ("Combine(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 ("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 v6.Text = "Button6"; - Assert.Equal ("Factor(0.2,True)", v6.Width.ToString ()); - Assert.Equal ("Factor(0.2,True)", v6.Height.ToString ()); + 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 }; @@ -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 ($"Absolute({count})", label.Y.ToString ()); + Assert.Equal ($"PosAbsolute({count})", label.Y.ToString ()); - Assert.Equal ($"Absolute({count})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({count})", view.Height.ToString ()); view.Height += 1; count++; - Assert.Equal ($"Absolute({count})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({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 ($"Absolute({count + 1})", label.Y.ToString ()); + Assert.Equal ($"PosAbsolute({count + 1})", label.Y.ToString ()); listLabels.Add (label); if (count == 0) { - Assert.Equal ($"Absolute({count})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({count})", view.Height.ToString ()); view.Height += 2; } else { - Assert.Equal ($"Absolute({count + 1})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({count + 1})", view.Height.ToString ()); view.Height += 1; } count++; } - Assert.Equal ($"Absolute({count + 1})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({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 ($"Absolute({i})", label.Y.ToString ()); + Assert.Equal ($"PosAbsolute({i})", label.Y.ToString ()); listLabels.Add (label); - Assert.Equal ($"Absolute({i})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({i})", view.Height.ToString ()); view.Height += 1; - Assert.Equal ($"Absolute({i + 1})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({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 ($"Absolute({count})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({count})", view.Height.ToString ()); view.Height -= 1; count--; - Assert.Equal ($"Absolute({count})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({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 ($"Absolute({i + 1})", label.Y.ToString ()); + Assert.Equal ($"PosAbsolute({i + 1})", label.Y.ToString ()); listLabels.Add (label); if (i == 0) { - Assert.Equal ($"Absolute({i})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({i})", view.Height.ToString ()); view.Height += 2; - Assert.Equal ($"Absolute({i + 2})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({i + 2})", view.Height.ToString ()); } else { - Assert.Equal ($"Absolute({i + 1})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({i + 1})", view.Height.ToString ()); view.Height += 1; - Assert.Equal ($"Absolute({i + 2})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({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 ($"Absolute({count + 1})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({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 ($"Absolute({count + 1})", view.Height.ToString ()); + Assert.Equal ($"DimAbsolute({count + 1})", view.Height.ToString ()); } }; diff --git a/UnitTests/Types/PosTests.cs b/UnitTests/Types/PosTests.cs index 44b43dd7d..1a63dc854 100644 --- a/UnitTests/Types/PosTests.cs +++ b/UnitTests/Types/PosTests.cs @@ -32,11 +32,11 @@ namespace Terminal.Gui.TypeTests { { var n = 0; var pos = Pos.AnchorEnd (); - Assert.Equal ($"AnchorEnd({n})", pos.ToString ()); + Assert.Equal ($"PosAnchorEnd({n})", pos.ToString ()); n = 5; pos = Pos.AnchorEnd (n); - Assert.Equal ($"AnchorEnd({n})", pos.ToString ()); + Assert.Equal ($"PosAnchorEnd({n})", pos.ToString ()); } [Fact] @@ -351,13 +351,13 @@ namespace Terminal.Gui.TypeTests { public void At_SetsValue () { var pos = Pos.At (0); - Assert.Equal ("Absolute(0)", pos.ToString ()); + Assert.Equal ("PosAbsolute(0)", pos.ToString ()); pos = Pos.At (5); - Assert.Equal ("Absolute(5)", pos.ToString ()); + Assert.Equal ("PosAbsolute(5)", pos.ToString ()); pos = Pos.At (-1); - Assert.Equal ("Absolute(-1)", pos.ToString ()); + Assert.Equal ("PosAbsolute(-1)", pos.ToString ()); } [Fact] @@ -411,140 +411,140 @@ namespace Terminal.Gui.TypeTests { testInt = 0; testRect = Rect.Empty; pos = Pos.Left (new View ()); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); pos = Pos.Left (new View (testRect)); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); testRect = new Rect (1, 2, 3, 4); pos = Pos.Left (new View (testRect)); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); // Pos.Left(win) + 0 pos = Pos.Left (new View (testRect)) + testInt; - 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 ()); + 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 ()); testInt = 1; // Pos.Left(win) +1 pos = Pos.Left (new View (testRect)) + testInt; - 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 ()); + 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 ()); testInt = -1; // Pos.Left(win) -1 pos = Pos.Left (new View (testRect)) - testInt; - 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 ()); + 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 ()); // Pos.X side = "x"; testInt = 0; testRect = Rect.Empty; pos = Pos.X (new View ()); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); pos = Pos.X (new View (testRect)); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); testRect = new Rect (1, 2, 3, 4); pos = Pos.X (new View (testRect)); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); // Pos.X(win) + 0 pos = Pos.X (new View (testRect)) + testInt; - 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 ()); + 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 ()); testInt = 1; // Pos.X(win) +1 pos = Pos.X (new View (testRect)) + testInt; - 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 ()); + 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 ()); testInt = -1; // Pos.X(win) -1 pos = Pos.X (new View (testRect)) - testInt; - 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 ()); + 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 ()); // Pos.Top side = "y"; testInt = 0; testRect = Rect.Empty; pos = Pos.Top (new View ()); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); pos = Pos.Top (new View (testRect)); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); testRect = new Rect (1, 2, 3, 4); pos = Pos.Top (new View (testRect)); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); // Pos.Top(win) + 0 pos = Pos.Top (new View (testRect)) + testInt; - 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 ()); + 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 ()); testInt = 1; // Pos.Top(win) +1 pos = Pos.Top (new View (testRect)) + testInt; - 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 ()); + 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 ()); testInt = -1; // Pos.Top(win) -1 pos = Pos.Top (new View (testRect)) - testInt; - 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 ()); + 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 ()); // Pos.Y side = "y"; testInt = 0; testRect = Rect.Empty; pos = Pos.Y (new View ()); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); pos = Pos.Y (new View (testRect)); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); testRect = new Rect (1, 2, 3, 4); pos = Pos.Y (new View (testRect)); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); // Pos.Y(win) + 0 pos = Pos.Y (new View (testRect)) + testInt; - 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 ()); + 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 ()); testInt = 1; // Pos.Y(win) +1 pos = Pos.Y (new View (testRect)) + testInt; - 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 ()); + 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 ()); testInt = -1; // Pos.Y(win) -1 pos = Pos.Y (new View (testRect)) - testInt; - 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 ()); + 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 ()); // Pos.Bottom side = "bottom"; testRect = Rect.Empty; testInt = 0; pos = Pos.Bottom (new View ()); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); pos = Pos.Bottom (new View (testRect)); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); testRect = new Rect (1, 2, 3, 4); pos = Pos.Bottom (new View (testRect)); - Assert.Equal ($"Combine(View({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}Absolute({testInt}))", pos.ToString ()); + Assert.Equal ($"PosCombine(PosView({side},View()({{X={testRect.X},Y={testRect.Y},Width={testRect.Width},Height={testRect.Height}}})){(testInt < 0 ? '-' : '+')}PosAbsolute({testInt}))", pos.ToString ()); // Pos.Bottom(win) + 0 pos = Pos.Bottom (new View (testRect)) + testInt; - 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 ()); + 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 ()); testInt = 1; // Pos.Bottom(win) +1 pos = Pos.Bottom (new View (testRect)) + testInt; - 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 ()); + 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 ()); testInt = -1; // Pos.Bottom(win) -1 pos = Pos.Bottom (new View (testRect)) - testInt; - 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 ()); + 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 ()); } // 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 ("Center", pos.ToString ()); + Assert.Equal ("PosCenter", pos.ToString ()); } [Fact] @@ -640,13 +640,13 @@ namespace Terminal.Gui.TypeTests { { float f = 0; var pos = Pos.Percent (f); - Assert.Equal ($"Factor({f / 100:0.###})", pos.ToString ()); + Assert.Equal ($"PosFactor({f / 100:0.###})", pos.ToString ()); f = 0.5F; pos = Pos.Percent (f); - Assert.Equal ($"Factor({f / 100:0.###})", pos.ToString ()); + Assert.Equal ($"PosFactor({f / 100:0.###})", pos.ToString ()); f = 100; pos = Pos.Percent (f); - Assert.Equal ($"Factor({f / 100:0.###})", pos.ToString ()); + Assert.Equal ($"PosFactor({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 ($"Absolute({count})", label.Y.ToString ()); + Assert.Equal ($"PosAbsolute({count})", label.Y.ToString ()); - Assert.Equal ($"Absolute({count})", field.Y.ToString ()); + Assert.Equal ($"PosAbsolute({count})", field.Y.ToString ()); field.Y += 1; count++; - Assert.Equal ($"Absolute({count})", field.Y.ToString ()); + Assert.Equal ($"PosAbsolute({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 ($"Absolute({i})", field.Y.ToString ()); + Assert.Equal ($"PosAbsolute({i})", field.Y.ToString ()); listLabels.Add (label); - Assert.Equal ($"Absolute({i})", field.Y.ToString ()); + Assert.Equal ($"PosAbsolute({i})", field.Y.ToString ()); field.Y += 1; - Assert.Equal ($"Absolute({i + 1})", field.Y.ToString ()); + Assert.Equal ($"PosAbsolute({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 ($"Absolute({count})", field.Y.ToString ()); + Assert.Equal ($"PosAbsolute({count})", field.Y.ToString ()); field.Y -= 1; count--; - Assert.Equal ($"Absolute({count})", field.Y.ToString ()); + Assert.Equal ($"PosAbsolute({count})", field.Y.ToString ()); } }; diff --git a/UnitTests/Views/ScrollBarViewTests.cs b/UnitTests/Views/ScrollBarViewTests.cs index 8a22ca13c..39ccd3bf9 100644 --- a/UnitTests/Views/ScrollBarViewTests.cs +++ b/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 ("Absolute(1)", _scrollBar.Width.ToString ()); + Assert.Equal ("DimAbsolute(1)", _scrollBar.Width.ToString ()); Assert.Equal (1, _scrollBar.Bounds.Width); - Assert.Equal ("Combine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))", + Assert.Equal ("DimCombine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))", _scrollBar.Height.ToString ()); Assert.Equal (24, _scrollBar.Bounds.Height); Assert.True (_scrollBar.OtherScrollBarView.ShowScrollIndicator); Assert.True (_scrollBar.OtherScrollBarView.Visible); - Assert.Equal ("Combine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))", + Assert.Equal ("DimCombine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))", _scrollBar.OtherScrollBarView.Width.ToString ()); Assert.Equal (79, _scrollBar.OtherScrollBarView.Bounds.Width); - Assert.Equal ("Absolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ()); + Assert.Equal ("DimAbsolute(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 ("Absolute(1)", _scrollBar.Width.ToString ()); + Assert.Equal ("DimAbsolute(1)", _scrollBar.Width.ToString ()); Assert.Equal (1, _scrollBar.Bounds.Width); - Assert.Equal ("Combine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))", + Assert.Equal ("DimCombine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))", _scrollBar.Height.ToString ()); Assert.Equal (24, _scrollBar.Bounds.Height); Assert.True (_scrollBar.OtherScrollBarView.ShowScrollIndicator); Assert.True (_scrollBar.OtherScrollBarView.Visible); - Assert.Equal ("Combine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(0))", + Assert.Equal ("DimCombine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(0))", _scrollBar.OtherScrollBarView.Width.ToString ()); Assert.Equal (80, _scrollBar.OtherScrollBarView.Bounds.Width); - Assert.Equal ("Absolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ()); + Assert.Equal ("DimAbsolute(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 ("Absolute(1)", _scrollBar.Width.ToString ()); + Assert.Equal ("DimAbsolute(1)", _scrollBar.Width.ToString ()); Assert.Equal (1, _scrollBar.Bounds.Width); - Assert.Equal ("Combine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))", + Assert.Equal ("DimCombine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))", _scrollBar.Height.ToString ()); Assert.Equal (24, _scrollBar.Bounds.Height); Assert.False (_scrollBar.OtherScrollBarView.ShowScrollIndicator); Assert.False (_scrollBar.OtherScrollBarView.Visible); - Assert.Equal ("Combine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(0))", + Assert.Equal ("DimCombine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(0))", _scrollBar.OtherScrollBarView.Width.ToString ()); Assert.Equal (80, _scrollBar.OtherScrollBarView.Bounds.Width); - Assert.Equal ("Absolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ()); + Assert.Equal ("DimAbsolute(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 ("Absolute(1)", _scrollBar.Width.ToString ()); + Assert.Equal ("DimAbsolute(1)", _scrollBar.Width.ToString ()); Assert.Equal (1, _scrollBar.Bounds.Width); - Assert.Equal ("Combine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(0))", + Assert.Equal ("DimCombine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(0))", _scrollBar.Height.ToString ()); Assert.Equal (25, _scrollBar.Bounds.Height); Assert.False (_scrollBar.OtherScrollBarView.ShowScrollIndicator); Assert.False (_scrollBar.OtherScrollBarView.Visible); - Assert.Equal ("Combine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(0))", + Assert.Equal ("DimCombine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(0))", _scrollBar.OtherScrollBarView.Width.ToString ()); Assert.Equal (80, _scrollBar.OtherScrollBarView.Bounds.Width); - Assert.Equal ("Absolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ()); + Assert.Equal ("DimAbsolute(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 ("Absolute(1)", _scrollBar.Width.ToString ()); + Assert.Equal ("DimAbsolute(1)", _scrollBar.Width.ToString ()); Assert.Equal (1, _scrollBar.Bounds.Width); - Assert.Equal ("Combine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))", + Assert.Equal ("DimCombine(DimView(Height,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))", _scrollBar.Height.ToString ()); Assert.Equal (24, _scrollBar.Bounds.Height); Assert.True (_scrollBar.OtherScrollBarView.ShowScrollIndicator); Assert.True (_scrollBar.OtherScrollBarView.Visible); - Assert.Equal ("Combine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-Absolute(1))", + Assert.Equal ("DimCombine(DimView(Width,HostView()({X=0,Y=0,Width=80,Height=25}))-DimAbsolute(1))", _scrollBar.OtherScrollBarView.Width.ToString ()); Assert.Equal (79, _scrollBar.OtherScrollBarView.Bounds.Width); - Assert.Equal ("Absolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ()); + Assert.Equal ("DimAbsolute(1)", _scrollBar.OtherScrollBarView.Height.ToString ()); Assert.Equal (1, _scrollBar.OtherScrollBarView.Bounds.Height); } diff --git a/UnitTests/Views/StatusBarTests.cs b/UnitTests/Views/StatusBarTests.cs index c90f9105f..0247f53bc 100644 --- a/UnitTests/Views/StatusBarTests.cs +++ b/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 ("AnchorEnd(1)", sb.Y.ToString ()); + Assert.Equal ("PosAnchorEnd(1)", sb.Y.ToString ()); Assert.Equal (Dim.Fill (), sb.Width); Assert.Equal (1, sb.Height); diff --git a/UnitTests/Views/TextViewTests.cs b/UnitTests/Views/TextViewTests.cs index 981ff2d14..455296478 100644 --- a/UnitTests/Views/TextViewTests.cs +++ b/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 ("Absolute(30)", _textView.Width.ToString ()); - Assert.Equal ("Absolute(10)", _textView.Height.ToString ()); + Assert.Equal ("DimAbsolute(30)", _textView.Width.ToString ()); + Assert.Equal ("DimAbsolute(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 ("Absolute(30)", _textView.Width.ToString ()); - Assert.Equal ("Absolute(1)", _textView.Height.ToString ()); + Assert.Equal ("DimAbsolute(30)", _textView.Width.ToString ()); + Assert.Equal ("DimAbsolute(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 ("Absolute(30)", _textView.Width.ToString ()); - Assert.Equal ("Absolute(10)", _textView.Height.ToString ()); + Assert.Equal ("DimAbsolute(30)", _textView.Width.ToString ()); + Assert.Equal ("DimAbsolute(10)", _textView.Height.ToString ()); Assert.False (_textView.WordWrap); }