Merge pull request #810 from BDisp/pos-dim-validation

Fixes #731. Pos and Dim validation.

Author: tig

Terminal.Gui/Core/View.cs

@@ -434,6 +434,10 @@ public Rect Bounds {
 		public Pos X {
 			get => x;
 			set {
+				if (!ValidatePosDim (x, value)) {
+					throw new ArgumentException ();
+				}
+
 				x = value;
 				SetNeedsLayout ();
 				SetNeedsDisplay (frame);
@@ -450,6 +454,10 @@ public Pos X {
 		public Pos Y {
 			get => y;
 			set {
+				if (!ValidatePosDim (y, value)) {
+					throw new ArgumentException ();
+				}
+
 				y = value;
 				SetNeedsLayout ();
 				SetNeedsDisplay (frame);
@@ -468,6 +476,10 @@ public Pos Y {
 		public Dim Width {
 			get => width;
 			set {
+				if (!ValidatePosDim (width, value)) {
+					throw new ArgumentException ();
+				}
+
 				width = value;
 				SetNeedsLayout ();
 				SetNeedsDisplay (frame);
@@ -482,12 +494,29 @@ public Dim Width {
 		public Dim Height {
 			get => height;
 			set {
+				if (!ValidatePosDim (height, value)) {
+					throw new ArgumentException ();
+				}
+
 				height = value;
 				SetNeedsLayout ();
 				SetNeedsDisplay (frame);
 			}
 		}
 
+		bool ValidatePosDim (object oldvalue, object newValue)
+		{
+			if (!IsInitialized || layoutStyle == LayoutStyle.Absolute || oldvalue == null || oldvalue.GetType () == newValue.GetType () || this is Toplevel) {
+				return true;
+			}
+			if (layoutStyle == LayoutStyle.Computed) {
+				if (oldvalue.GetType () != newValue.GetType () && !(newValue is Pos.PosAbsolute || newValue is Dim.DimAbsolute)) {
+					return true;
+				}
+			}
+			return false;
+		}
+
 		/// <summary>
 		/// Returns the container for this view, or null if this view has not been added to a container.
 		/// </summary>

Terminal.Gui/Views/StatusBar.cs

@@ -88,13 +88,18 @@ public StatusBar (StatusItem [] items) : base ()
 			CanFocus = false;
 			ColorScheme = Colors.Menu;
 			X = 0;
-			Y = SuperView != null ? SuperView.Frame.Height - 1 : Pos.AnchorEnd (1);
 			Width = Dim.Fill ();
 			Height = 1;
 
+			Initialized += StatusBar_Initialized;
 			Application.Resized += Application_Resized ();
 		}
 
+		private void StatusBar_Initialized (object sender, EventArgs e)
+		{
+			Y = SuperView.Frame.Height - 1;
+		}
+
 		private Action<Application.ResizedEventArgs> Application_Resized ()
 		{
 			return delegate {

UnitTests/DimTests.cs

@@ -233,6 +233,91 @@ public void Percent_ThrowsOnIvalid ()
 			Assert.Throws<ArgumentException> (() => dim = Dim.Percent (1000001));
 		}
 
+		[Fact]
+		public void Dim_Validation_Throws_If_NewValue_Is_DimAbsolute_And_OldValue_Is_Another_Type ()
+		{
+			Application.Init (new FakeDriver (), new NetMainLoop (() => FakeConsole.ReadKey (true)));
+
+			var t = Application.Top;
+
+			var w = new Window ("w") {
+				Width = Dim.Fill (0),
+				Height = Dim.Sized (10)
+			};
+			var v = new View ("v") {
+				Width = Dim.Width (w) - 2,
+				Height = Dim.Percent (10)
+			};
+
+			w.Add (v);
+			t.Add (w);
+
+			t.Ready += () => {
+				Assert.Equal (2, w.Width = 2);
+				Assert.Equal (2, w.Height = 2);
+				Assert.Throws<ArgumentException> (() => v.Width = 2);
+				Assert.Throws<ArgumentException> (() => v.Height = 2);
+			};
+
+			Application.Iteration += () => Application.RequestStop ();
+
+			Application.Run ();
+			Application.Shutdown ();
+		}
+
+		[Fact]
+		public void Dim_Validation_Do_Not_Throws_If_NewValue_Is_DimAbsolute_And_OldValue_Is_Null ()
+		{
+			Application.Init (new FakeDriver (), new NetMainLoop (() => FakeConsole.ReadKey (true)));
+
+			var t = Application.Top;
+
+			var w = new Window (new Rect (1, 2, 4, 5), "w");
+			t.Add (w);
+
+			t.Ready += () => {
+				Assert.Equal (3, w.Width = 3);
+				Assert.Equal (4, w.Height = 4);
+			};
+
+			Application.Iteration += () => Application.RequestStop ();
+
+			Application.Run ();
+			Application.Shutdown ();
+		}
+
+		[Fact]
+		public void Dim_Validation_Do_Not_Throws_If_NewValue_Is_DimAbsolute_And_OldValue_Is_Another_Type_After_Sets_To_LayoutStyle_Absolute ()
+		{
+			Application.Init (new FakeDriver (), new NetMainLoop (() => FakeConsole.ReadKey (true)));
+
+			var t = Application.Top;
+
+			var w = new Window ("w") {
+				Width = Dim.Fill (0),
+				Height = Dim.Sized (10)
+			};
+			var v = new View ("v") {
+				Width = Dim.Width (w) - 2,
+				Height = Dim.Percent (10)
+			};
+
+			w.Add (v);
+			t.Add (w);
+
+			t.Ready += () => {
+				v.LayoutStyle = LayoutStyle.Absolute;
+				Assert.Equal (2, v.Width = 2);
+				Assert.Equal (2, v.Height = 2);
+			};
+
+			Application.Iteration += () => Application.RequestStop ();
+
+			Application.Run ();
+			Application.Shutdown ();
+		}
+
+
 		// TODO: Test operators
 	}
 }

UnitTests/PosTests.cs

@@ -371,6 +371,91 @@ public void Percent_ThrowsOnIvalid ()
 			Assert.Throws<ArgumentException> (() => pos = Pos.Percent (1000001));
 		}
 
+		[Fact]
+		public void Pos_Validation_Throws_If_NewValue_Is_PosAbsolute_And_OldValue_Is_Another_Type ()
+		{
+			Application.Init (new FakeDriver (), new NetMainLoop (() => FakeConsole.ReadKey (true)));
+
+			var t = Application.Top;
+
+			var w = new Window ("w") {
+				X = Pos.Left (t) + 2,
+				Y = Pos.At (2)
+			};
+			var v = new View ("v") {
+				X = Pos.Center (),
+				Y = Pos.Percent (10)
+			};
+
+			w.Add (v);
+			t.Add (w);
+
+			t.Ready += () => {
+				Assert.Equal (2, w.X = 2);
+				Assert.Equal (2, w.Y = 2);
+				Assert.Throws<ArgumentException> (() => v.X = 2);
+				Assert.Throws<ArgumentException> (() => v.Y = 2);
+			};
+
+			Application.Iteration += () => Application.RequestStop ();
+
+			Application.Run ();
+			Application.Shutdown ();
+		}
+
+		[Fact]
+		public void Pos_Validation_Do_Not_Throws_If_NewValue_Is_PosAbsolute_And_OldValue_Is_Null ()
+		{
+			Application.Init (new FakeDriver (), new NetMainLoop (() => FakeConsole.ReadKey (true)));
+
+			var t = Application.Top;
+
+			var w = new Window (new Rect (1, 2, 4, 5), "w");
+			t.Add (w);
+
+			t.Ready += () => {
+				Assert.Equal (2, w.X = 2);
+				Assert.Equal (2, w.Y = 2);
+			};
+
+			Application.Iteration += () => Application.RequestStop ();
+
+			Application.Run ();
+			Application.Shutdown ();
+
+		}
+
+		[Fact]
+		public void Pos_Validation_Do_Not_Throws_If_NewValue_Is_PosAbsolute_And_OldValue_Is_Another_Type_After_Sets_To_LayoutStyle_Absolute ()
+		{
+			Application.Init (new FakeDriver (), new NetMainLoop (() => FakeConsole.ReadKey (true)));
+
+			var t = Application.Top;
+
+			var w = new Window ("w") {
+				X = Pos.Left (t) + 2,
+				Y = Pos.At (2)
+			};
+			var v = new View ("v") {
+				X = Pos.Center (),
+				Y = Pos.Percent (10)
+			};
+
+			w.Add (v);
+			t.Add (w);
+
+			t.Ready += () => {
+				v.LayoutStyle = LayoutStyle.Absolute;
+				Assert.Equal (2, v.X = 2);
+				Assert.Equal (2, v.Y = 2);
+			};
+
+			Application.Iteration += () => Application.RequestStop ();
+
+			Application.Run ();
+			Application.Shutdown ();
+		}
+
 		// TODO: Test PosCombine