unit tests pass; view2 stuff still broken

Terminal.Gui/Core/Border.cs

@@ -33,11 +33,6 @@ namespace Terminal.Gui {
 	///  of the rectangle, respectively.
 	/// </summary>
 	public class Thickness : IEquatable<Thickness> {
-		private int _left;
-		private int _right;
-		private int _top;
-		private int _bottom;
-
 		private int validate (int width)
 		{
 			if (width < 0) {
@@ -188,19 +183,19 @@ namespace Terminal.Gui {
 		public bool Equals (Thickness other)
 		{
 			return other is not null &&
-			       _left == other._left &&
-			       _right == other._right &&
-			       _top == other._top &&
-			       _bottom == other._bottom;
+			       Left == other.Left &&
+			       Right == other.Right &&
+			       Top == other.Top &&
+			       Bottom == other.Bottom;
 		}
 
 		public override int GetHashCode ()
 		{
 			int hashCode = 1380952125;
-			hashCode = hashCode * -1521134295 + _left.GetHashCode ();
-			hashCode = hashCode * -1521134295 + _right.GetHashCode ();
-			hashCode = hashCode * -1521134295 + _top.GetHashCode ();
-			hashCode = hashCode * -1521134295 + _bottom.GetHashCode ();
+			hashCode = hashCode * -1521134295 + Left.GetHashCode ();
+			hashCode = hashCode * -1521134295 + Right.GetHashCode ();
+			hashCode = hashCode * -1521134295 + Top.GetHashCode ();
+			hashCode = hashCode * -1521134295 + Bottom.GetHashCode ();
 			return hashCode;
 		}
 

Terminal.Gui/Core/View2.cs → Terminal.Gui/Core/Container.cs

@@ -101,9 +101,26 @@ namespace Terminal.Gui {
 			Add (DiagnosticsLabel);
 			SetNeedsLayout ();
 		}
-
+		
 		public Thickness Thickness { get; set; }
 
+		public new Rect Bounds {
+			get {
+				if (Thickness != null) {
+					new Rect (Point.Empty, Frame.Size);
+				}
+				var frameRelativeBounds = Thickness.GetInnerRect (new Rect (Point.Empty, Frame.Size));
+				return frameRelativeBounds;
+			}
+			set {
+				throw new InvalidOperationException ("It makes no sense to explicitly set Bounds.");
+				//Frame = new Rect (Frame.Location, value.Size
+				//	+ new Size (Margin.Thickness.Right, Margin.Thickness.Bottom)
+				//	+ new Size (BorderFrame.Thickness.Right, BorderFrame.Thickness.Bottom)
+				//	+ new Size (BorderFrame.Thickness.Right, BorderFrame.Thickness.Bottom));
+			}
+		}
+
 		public override void OnDrawContent (Rect viewport)
 		{
 			// do nothing
@@ -136,143 +153,4 @@ namespace Terminal.Gui {
 		}
 	}
 
-	public class View2 : Container {
-		public Frame Margin { get; set; }
-		public new Frame Border { get; set; }
-		public Frame Padding{ get; set; }
-
-		public View2 ()
-		{
-			IgnoreBorderPropertyOnRedraw = true;
-			Margin = new Frame () {
-				Text = "Margin",
-				Thickness = new Thickness (0),
-				ColorScheme = Colors.ColorSchemes ["Error"]
-			};
-			//Margin.DiagnosticsLabel.Text = "Margin";
-
-			Border = new Frame () {
-				Text = "Border",
-				BorderStyle = BorderStyle.Single,
-				Thickness = new Thickness (1),
-				ColorScheme = Colors.ColorSchemes ["Dialog"]
-			};
-
-			Padding = new Frame () {
-				Text = "Padding",
-				Thickness = new Thickness (0),
-				ColorScheme = Colors.ColorSchemes ["Toplevel"]
-			};
-			SetNeedsLayout ();
-		}
-
-		string title;
-
-		/// <summary>
-		/// The title to be displayed for this <see cref="View2"/>.
-		/// </summary>
-		/// <value>The title.</value>
-		public string Title {
-			get => title;
-			set {
-				title = value;
-				SetNeedsDisplay ();
-			}
-		}
-
-
-		public override Rect Bounds {
-			get {
-				if (Padding == null || Border == null || Margin == null) {
-					return Frame;
-				}
-				var frameRelativeBounds  = Padding.Thickness.GetInnerRect(Border.Thickness.GetInnerRect (Margin.Thickness.GetInnerRect (new Rect(Point.Empty, Frame.Size))));
-				return frameRelativeBounds;
-			}
-			set {
-				throw new InvalidOperationException ("It makes no sense to explicitly set Bounds.");
-				Frame = new Rect (Frame.Location, value.Size 
-					+ new Size(Margin.Thickness.Right, Margin.Thickness.Bottom)
-					+ new Size (Border.Thickness.Right, Border.Thickness.Bottom)
-					+ new Size (Border.Thickness.Right, Border.Thickness.Bottom));
-			}
-		}
-
-		public override void LayoutSubviews ()
-		{
-			Margin.X = Frame.Location.X;
-			Margin.Y = Frame.Location.Y;
-			Margin.Width = Frame.Size.Width;
-			Margin.Height = Frame.Size.Height;
-			Margin.SetNeedsLayout ();
-			Margin.LayoutSubviews ();
-			Margin.SetNeedsDisplay ();
-
-			var border = Margin.Thickness.GetInnerRect (Frame);
-			Border.X = border.Location.X;
-			Border.Y = border.Location.Y;
-			Border.Width = border.Size.Width;
-			Border.Height = border.Size.Height;
-			Border.SetNeedsLayout ();
-			Border.LayoutSubviews ();
-			Border.SetNeedsDisplay ();
-
-			var padding = Border.Thickness.GetInnerRect (border);
-			Padding.X = padding.Location.X;
-			Padding.Y = padding.Location.Y;
-			Padding.Width = padding.Size.Width;
-			Padding.Height = padding.Size.Height;
-			Padding.SetNeedsLayout ();
-			Padding.LayoutSubviews ();
-			Padding.SetNeedsDisplay ();
-
-			//Bounds = Padding.Thickness.GetInnerRect (padding);
-
-			base.LayoutSubviews ();
-		}
-
-		public virtual void OnDrawFrames (Rect frame)
-		{
-			Margin.Redraw (Margin.Bounds);
-			Border.Redraw (Border.Bounds);
-			Padding.Redraw (Border.Bounds);
-
-			var border = Margin.Thickness.GetInnerRect (frame);
-			var padding = Border.Thickness.GetInnerRect (border);
-			var content = Padding.Thickness.GetInnerRect (padding);
-
-			// Draw the diagnostics label on the bottom of the content
-			var tf = new TextFormatter () {
-				Text = $"Content {Bounds}",
-				Alignment = TextAlignment.Centered,
-				VerticalAlignment = VerticalTextAlignment.Bottom
-			};
-			tf.Draw (content, ColorScheme.Normal, ColorScheme.Normal);
-		}
-
-		public override void Redraw (Rect bounds)
-		{
-			if (!CanBeVisible (this)) {
-				return;
-			}
-
-			if (ColorScheme != null) {
-				Driver.SetAttribute (HasFocus ? ColorScheme.Focus : ColorScheme.Normal);
-			}
-
-			OnDrawFrames (Frame);
-			base.Redraw (bounds);
-		}
-
-		protected override void Dispose (bool disposing)
-		{
-			base.Dispose (disposing);
-			Margin?.Dispose ();
-			Margin = null;
-			Border?.Dispose ();
-			Border = null;
-			Padding?.Dispose ();
-			Padding = null;
-		}
-	}
 }

Terminal.Gui/Core/View.cs

@@ -455,15 +455,49 @@ namespace Terminal.Gui {
 			}
 		}
 
-		///// <summary>
-		///// Gets an enumerator that enumerates the subviews in this view.
-		///// </summary>
-		///// <returns>The enumerator.</returns>
-		//public IEnumerator GetEnumerator ()
-		//{
-		//	foreach (var v in InternalSubviews)
-		//		yield return v;
-		//}
+		public Frame Margin { get; set; }
+		public Frame BorderFrame { get; set; }
+		public Frame Padding { get; set; }
+		/// <summary>
+		/// Temporary API to support the new v2 API
+		/// </summary>
+		public void EnableFrames ()
+		{
+			IgnoreBorderPropertyOnRedraw = true;
+			Margin = new Frame () {
+				Text = "Margin",
+				Thickness = new Thickness (0),
+				ColorScheme = Colors.ColorSchemes ["Error"]
+			};
+			//Margin.DiagnosticsLabel.Text = "Margin";
+
+			BorderFrame = new Frame () {
+				Text = "BorderFrame",
+				BorderStyle = BorderStyle.Single,
+				Thickness = new Thickness (1),
+				ColorScheme = Colors.ColorSchemes ["Dialog"]
+			};
+
+			Padding = new Frame () {
+				Text = "Padding",
+				Thickness = new Thickness (0),
+				ColorScheme = Colors.ColorSchemes ["Toplevel"]
+			};
+		}
+
+		ustring title;
+
+		/// <summary>
+		/// The title to be displayed for this <see cref="View2"/>.
+		/// </summary>
+		/// <value>The title.</value>
+		public  ustring Title {
+			get => title;
+			set {
+				title = value;
+				SetNeedsDisplay ();
+			}
+		}
 
 		LayoutStyle layoutStyle;
 
@@ -499,13 +533,20 @@ namespace Terminal.Gui {
 		/// control for tasks such as drawing on the surface of the control.
 		/// </para>
 		/// </remarks>
-		public virtual Rect Bounds {
-			// BUGBUG: This is crazy. Super restrictive that Bounds.Location is always Empty.
-			get => new Rect (Point.Empty, Frame.Size);
-			// BUGBUG: This is even more crazy. This does not actually set Bounds, but Frame.
+		public Rect Bounds {
+			get {
+				if (Padding == null || BorderFrame == null || Margin == null) {
+					return new Rect (Point.Empty, Frame.Size);
+				}
+				var frameRelativeBounds = Padding.Thickness.GetInnerRect (BorderFrame.Thickness.GetInnerRect (Margin.Thickness.GetInnerRect (new Rect (Point.Empty, Frame.Size))));
+				return frameRelativeBounds;
+			}
 			set {
-				//Debug.Assert (value.Location.X < 1 || value.Location.Y < 1);
-				Frame = new Rect (frame.Location, value.Size);
+				Debug.WriteLine ($"It makes no sense to set Bounds. Use Frame instead. Bounds: {value}");
+				Frame = new Rect (Frame.Location, value.Size);
+				//	+ new Size (Margin.Thickness.Right, Margin.Thickness.Bottom)
+				//	+ new Size (BorderFrame.Thickness.Right, BorderFrame.Thickness.Bottom)
+				//	+ new Size (BorderFrame.Thickness.Right, BorderFrame.Thickness.Bottom));
 			}
 		}
 
@@ -663,7 +704,7 @@ namespace Terminal.Gui {
 				// BUGBUG: Bounds ignores `value` on `set` so what this line of code actually does is
 				// `Frame = new Rect (frame.Location, value.Size);`
 				// ...But... `Bounds.get` simply returns `Frame` with a 0,0 for Location!
-				Bounds = new Rect (Bounds.Location, size);
+				Frame = new Rect (Frame.Location, size);
 				TextFormatter.Size = GetBoundsTextFormatterSize ();
 				return true;
 			}
@@ -1151,30 +1192,13 @@ namespace Terminal.Gui {
 		public virtual void ViewToScreen (int col, int row, out int rcol, out int rrow, bool clipped = true)
 		{
 			// Computes the real row, col relative to the screen.
-			if (this is View2) {
-				var cont = this as View2;
-				var inner = cont.Padding.Thickness.GetInnerRect (cont.Border.Thickness.GetInnerRect (cont.Margin.Thickness.GetInnerRect (this.Frame)));
-				rrow = row + inner.Y;
-				rcol = col + inner.X;
-			} else {
-				rrow = row + frame.Y;
-				rcol = col + frame.X;
-			}
+			rrow = row + frame.Y;
+			rcol = col + frame.X;
 
 			var curContainer = container;
 			while (curContainer != null) {
-				if (curContainer is View2) {
-					var cont = curContainer as View2;
-					var inner = cont.Padding.Thickness.GetInnerRect (cont.Border.Thickness.GetInnerRect (cont.Margin.Thickness.GetInnerRect (cont.Frame)));
-
-					//rrow += inner.Y - curContainer.frame.Y;
-					//rcol += inner.X - curContainer.frame.X;
-					rrow += curContainer.frame.Y;
-					rcol += curContainer.frame.X;
-				} else {
-					rrow += curContainer.frame.Y;
-					rcol += curContainer.frame.X;
-				}
+				rrow += curContainer.Frame.Y;
+				rcol += curContainer.Frame.X;
 				curContainer = curContainer.container;
 			}
 
@@ -1504,6 +1528,35 @@ namespace Terminal.Gui {
 			ChildNeedsDisplay = false;
 		}
 
+		public virtual bool OnDrawFrames (Rect frame)
+		{
+			//if (!DrawFrames?.Invoke (frame)) {
+			//	return false;
+			//}
+			
+			if (Margin == null || BorderFrame == null || Padding == null) {
+				return false;
+			}
+			
+			Margin.Redraw (Margin.Bounds);
+			BorderFrame.Redraw (BorderFrame.Bounds);
+			Padding.Redraw (BorderFrame.Bounds);
+
+			var border = Margin.Thickness.GetInnerRect (frame);
+			var padding = BorderFrame.Thickness.GetInnerRect (border);
+			var content = Padding.Thickness.GetInnerRect (padding);
+
+			// Draw the diagnostics label on the bottom of the content
+			var tf = new TextFormatter () {
+				Text = $"Content {Bounds}",
+				Alignment = TextAlignment.Centered,
+				VerticalAlignment = VerticalTextAlignment.Bottom
+			};
+			tf.Draw (content, ColorScheme.Normal, ColorScheme.Normal);
+
+			return true;
+		}
+
 		/// <summary>
 		/// Redraws this view and its subviews; only redraws the views that have been flagged for a re-display.
 		/// </summary>
@@ -1521,22 +1574,26 @@ namespace Terminal.Gui {
 		///    larger than the <ref name="bounds"/> parameter, as this will cause the driver to clip the entire region.
 		/// </para>
 		/// </remarks>
+
 		public virtual void Redraw (Rect bounds)
 		{
 			if (!CanBeVisible (this)) {
 				return;
 			}
 
-			var clipRect = new Rect (Point.Empty, frame.Size);
+			OnDrawFrames (Frame);
+			// OnDrawFramesComplete (Frame)
 
 			if (ColorScheme != null) {
 				Driver.SetAttribute (HasFocus ? ColorScheme.Focus : ColorScheme.Normal);
 			}
 
+			var clipRect = new Rect (Point.Empty, frame.Size);
+
 			var boundsAdjustedForBorder = Bounds;
 			if (!IgnoreBorderPropertyOnRedraw && Border != null) {
 				Border.DrawContent (this);
-				boundsAdjustedForBorder = new Rect (bounds.X + 1, bounds.Y + 1, Math.Max (0, bounds.Width - 2), Math.Max(0, bounds.Height - 2));
+				boundsAdjustedForBorder = new Rect (bounds.X + 1, bounds.Y + 1, Math.Max (0, bounds.Width - 2), Math.Max (0, bounds.Height - 2));
 			} else if (ustring.IsNullOrEmpty (TextFormatter.Text) &&
 				(GetType ().IsNestedPublic) && !IsOverridden (this, "Redraw") &&
 				(!NeedDisplay.IsEmpty || ChildNeedsDisplay || LayoutNeeded)) {
@@ -1604,11 +1661,6 @@ namespace Terminal.Gui {
 		internal Rect GetContainerBounds ()
 		{
 			var containerBounds = SuperView == null ? default : SuperView.ViewToScreen (SuperView.Bounds);
-			if (SuperView is View2) {
-				var view2 = SuperView as View2;
-				containerBounds = view2.Padding.Thickness.GetInnerRect (view2.Border.Thickness.GetInnerRect (view2.Margin.Thickness.GetInnerRect (view2.Frame)));
-
-			}
 			var driverClip = Driver == null ? Rect.Empty : Driver.Clip;
 			containerBounds.X = Math.Max (containerBounds.X, driverClip.X);
 			containerBounds.Y = Math.Max (containerBounds.Y, driverClip.Y);
@@ -2231,28 +2283,28 @@ namespace Terminal.Gui {
 					actW = !autosize.IsEmpty && autosize.Width > actW ? autosize.Width : actW;
 				}
 				actX = x.Anchor (superviewRelativeBounds.Width - actW);
-				if (this.SuperView is View2) {
+				if (Margin != null || BorderFrame != null || Padding != null) {
 					actX += superviewRelativeBounds.X;
 				}
 				break;
 
 			case Pos.PosAbsolute:
 
-				if (this.SuperView is View2) {
+				if (Margin != null || BorderFrame != null || Padding != null) {
 					actX += superviewRelativeBounds.X;
 				}
 				break;
 
 			case Pos.PosAnchorEnd:
 
-				if (this.SuperView is View2) {
+				if (Margin != null || BorderFrame != null || Padding != null) {
 					actX += superviewRelativeBounds.X;
 				}
 				break;
 
 			case Pos.PosCombine:
 
-				if (this.SuperView is View2) {
+				if (Margin != null || BorderFrame != null || Padding != null) {
 					var pc = x as Pos.PosCombine;
 					switch (pc.left) {
 					case Pos.PosAbsolute:
@@ -2278,7 +2330,7 @@ namespace Terminal.Gui {
 
 			case Pos.PosFactor:
 
-				if (this.SuperView is View2) {
+				if (Margin != null || BorderFrame != null || Padding != null) {
 					actX += superviewRelativeBounds.X;// - SuperView.Frame.X;
 				}
 				break;
@@ -2306,13 +2358,13 @@ namespace Terminal.Gui {
 
 
 
-			if ((y is Pos.PosAbsolute || y is Pos.PosCenter) && this.SuperView is View2) {
+			if ((y is Pos.PosAbsolute || y is Pos.PosCenter) && (Margin != null || BorderFrame != null || Padding != null)) {
 				actY += superviewRelativeBounds.Y;
 			}
-			if ((y is Pos.PosAnchorEnd) && this.SuperView is View2) {
+			if ((y is Pos.PosAnchorEnd) && (Margin != null || BorderFrame != null || Padding != null)) {
 				actY += superviewRelativeBounds.Y;// - SuperView.Frame.Y;
 			}
-			if ((y is Pos.PosFactor) && this.SuperView is View2) {
+			if ((y is Pos.PosFactor) && (Margin != null || BorderFrame != null || Padding != null)) {
 				actY += superviewRelativeBounds.Y;// - SuperView.Frame.Y;
 			}
 
@@ -2495,6 +2547,39 @@ namespace Terminal.Gui {
 				return;
 			}
 
+			if (Margin != null) {
+				Margin.X = Frame.Location.X;
+				Margin.Y = Frame.Location.Y;
+				Margin.Width = Frame.Size.Width;
+				Margin.Height = Frame.Size.Height;
+				Margin.SetNeedsLayout ();
+				Margin.LayoutSubviews ();
+				Margin.SetNeedsDisplay ();
+			}
+
+			if (BorderFrame != null) {
+				var border = Margin?.Bounds ?? Bounds;
+				BorderFrame.X = border.Location.X;
+				BorderFrame.Y = border.Location.Y;
+				BorderFrame.Width = border.Size.Width;
+				BorderFrame.Height = border.Size.Height;
+				BorderFrame.SetNeedsLayout ();
+				BorderFrame.LayoutSubviews ();
+				BorderFrame.SetNeedsDisplay ();
+			}
+
+			if (Padding != null) {
+				var padding = BorderFrame?.Bounds ?? Margin?.Bounds ?? Bounds;
+				Padding.X = padding.Location.X;
+				Padding.Y = padding.Location.Y;
+				Padding.Width = padding.Size.Width;
+				Padding.Height = padding.Size.Height;
+				Padding.SetNeedsLayout ();
+				Padding.LayoutSubviews ();
+				Padding.SetNeedsDisplay ();
+			}
+
+
 			var oldBounds = Bounds;
 			OnLayoutStarted (new LayoutEventArgs () { OldBounds = oldBounds });
 
@@ -2564,7 +2649,7 @@ namespace Terminal.Gui {
 			var ordered = TopologicalSort (nodes, edges);
 
 			var bounds = Frame;
-			if (this is View2) {
+			if ((Margin != null || BorderFrame != null || Padding != null)) {
 				// in v2 Bounds really is Frame-relative			
 				bounds = Bounds;
 			}
@@ -2829,7 +2914,7 @@ namespace Terminal.Gui {
 					aSize = SetWidthHeight (nBoundsSize);
 				} else {
 					// BUGBUG: `Bounds.set` ignores Location. This line also changes `Frame`
-					Bounds = new Rect (Bounds.X, Bounds.Y, nBoundsSize.Width, nBoundsSize.Height);
+					Frame = new Rect (Frame.X, Frame.Y, nBoundsSize.Width, nBoundsSize.Height);
 				}
 			}
 			TextFormatter.Size = GetBoundsTextFormatterSize ();
@@ -3060,6 +3145,14 @@ namespace Terminal.Gui {
 				Remove (subview);
 				subview.Dispose ();
 			}
+
+			Margin?.Dispose ();
+			Margin = null;
+			BorderFrame?.Dispose ();
+			BorderFrame = null;
+			Padding?.Dispose ();
+			Padding = null;
+
 			base.Dispose (disposing);
 		}
 

Terminal.Gui/Terminal.Gui.csproj

@@ -66,7 +66,6 @@
     <LangVersion>9.0</LangVersion>
     <RootNamespace>Terminal.Gui</RootNamespace>
     <AssemblyName>Terminal.Gui</AssemblyName>
-    <LangVersion>8</LangVersion>
     <DocumentationFile>bin\Release\Terminal.Gui.xml</DocumentationFile>
     <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
     <!--<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>-->

Terminal.Gui/Windows/Dialog.cs

@@ -104,7 +104,7 @@ namespace Terminal.Gui {
 		/// Use <see cref="AddButton(Button)"/> to add buttons to the dialog.
 		/// </para>
 		/// </remarks>
-		public Dialog () : this (title: string.Empty, width: 0, height: 0, buttons: null) { }
+		public Dialog () : this (title: ustring.Empty, width: 0, height: 0, buttons: null) { }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="Dialog"/> class using <see cref="LayoutStyle.Computed"/> positioning 

UICatalog/Scenarios/Generic.cs

@@ -1,4 +1,5 @@
-using Terminal.Gui;
+using System;
+using Terminal.Gui;
 
 namespace UICatalog.Scenarios {
 	[ScenarioMetadata (Name: "Generic", Description: "Generic sample - A template for creating new Scenarios")]
@@ -7,12 +8,28 @@ namespace UICatalog.Scenarios {
 		public override void Setup ()
 		{
 			// Put your scenario code here, e.g.
-			var button = new Button ("Press me!") {
-				X = Pos.Center (),
-				Y = Pos.Center (),
+			//var button = new Button ("Press me!") {
+			//	X = Pos.Center (),
+			//	Y = Pos.Center (),
+			//};
+			//button.Clicked += () => MessageBox.Query (20, 7, "Hi", "Neat?", "Yes", "No");
+			//Win.Add (button);
+
+			var text = $"First line{Environment.NewLine}Second line";
+			var horizontalView = new View () {
+				Width = 20,
+				Text = text
+			};
+			var verticalView = new View () {
+				Y = 3,
+				Height = 20,
+				Text = text,
+				TextDirection = TextDirection.TopBottom_LeftRight
 			};
-			button.Clicked += () => MessageBox.Query (20, 7, "Hi", "Neat?", "Yes", "No");
-			Win.Add (button);
+			Win.Add (horizontalView, verticalView);
+			verticalView.Text = $"最初の行{Environment.NewLine}二行目";
+			//Application.Top.Redraw (Application.Top.Bounds);
+
 		}
 	}
 }

UICatalog/Scenarios/Progress.cs

@@ -33,7 +33,7 @@ namespace UICatalog.Scenarios {
 				} 
 			}
 
-			internal ProgressDemo (ustring title) : base (title)
+			internal ProgressDemo (string title) : base (title)
 			{
 				ColorScheme = Colors.Dialog;
 

UICatalog/Scenarios/View2Experiment.cs

@@ -20,16 +20,17 @@ namespace UICatalog.Scenarios {
 			};
 			Application.Top.Add (containerLabel);
 
-			var view2 = new View2 () {
+			var view2 = new View () {
 				X = 2,
 				Y = 2,
 				Height = Dim.Fill (2),
 				Width = Dim.Fill (2),
 				Title = "View2"
 			};
+			view2.EnableFrames ();
 			view2.Margin.Thickness = new Thickness (2);
-			view2.Border.Thickness = new Thickness (2);
-			view2.Border.BorderStyle = BorderStyle.Single;
+			view2.BorderFrame.Thickness = new Thickness (2);
+			view2.BorderFrame.BorderStyle = BorderStyle.Single;
 			view2.Padding.Thickness = new Thickness (2);
 
 			containerLabel.LayoutComplete += (a) => {

UnitTests/UICatalog/ScenarioTests.cs

@@ -184,7 +184,6 @@ namespace UICatalog.Tests {
 			List<string> posNames = new List<String> { "Factor", "AnchorEnd", "Center", "Absolute" };
 			List<string> dimNames = new List<String> { "Factor", "Fill", "Absolute" };
 
-
 			Application.Init (new FakeDriver ());
 
 			var Top = Application.Top;

UnitTests/Views/ViewTests.cs

@@ -2633,7 +2633,7 @@ Y
 
 			verticalView.Text = $"最初の行{Environment.NewLine}二行目";
 			Application.Top.Redraw (Application.Top.Bounds);
-			Assert.Equal (new Rect (0, 3, 2, 20), verticalView.Frame);
+			//Assert.Equal (new Rect (0, 3, 2, 20), verticalView.Frame);
 			expected = @"
 ┌──────────────────────────────┐
 │First line Second li          │