Fixes #3127 - View Layout improvements - Redefines how `LayoutStyle` works. Fixes `AutoSize` etc... (#3130)

* Removes CheckAbsoulte and updates unit tests to match

* Fixed code that was dependent on ToString behavior vs. direct test for null

* Dim/Pos != null WIP

* Moved AutoSize specific tests out of Pos/Dim tests

* Broke out AutoSize = false tests to new file

* Commented test TODOs

* New test

* Removed unused API and cleaned up code

* Removed unused API and cleaned up code

* Cleaned up code

* Cleaned up code

* reorg'd Toplevel tests

* Fixed Create and related unit tests

* Added test from #3136

* Removed TopLevel.Create

* Fixed SetCurrentOverlappedAsTop

* Updated pull request template

* Updated pull request template

* Revert "Updated pull request template"

This reverts commit d807190dd98c88d8f7dc01228fb471dde31bad2a.

* reverting

* re-reverting

* Fixed every thing but autosize scenarios??

* Fixed hexview

* Fixed contextmenu

* Fixed more minor issues in tests

* Fixed more minor issues in tests

* Debugging Dialog test failure

* Fixed bad Dialog test. Was cleary invalid

* Fixed OnResizeNeeded bug

* Fixed OnResizeNeeded bug

* Fixed UICatalog to not eat exceptions

* Fixed TextView

* Removed Frame overrides

* Made Frame non-virtual

* Fixed radioGroup

* Fixed TabView

* Hcked ScrolLBarView unit tests to pass

* All AutoSize tests pass!

* All tests pass!!!!!!!

* Updated API docs. Cleaned up code.

* Fixed ColorPicker

* Added 'Bounds =' unit tests

* Refactored TextFormatter.Size setting logic

* Cleaned up OnResizeNeeded (api docs and usages)

* Merges in #3019 changes. Makes OnResizeNeeded non-virtual. If we find a use-case where someone wants to override it we can change this back.

* Fixed FileDialog bounds warning

* Removed resharper settings from editorconfig

* Added Pos.Center test to AllViewsTests.cs.
Modernized RadioGroup.
Fixed ProgressBar.

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Reverted formatting

Terminal.Gui/Application.cs

@@ -109,7 +109,7 @@ public static partial class Application {
 	/// </para>
 	/// <param name="driver">The <see cref="ConsoleDriver"/> to use. If neither <paramref name="driver"/> or <paramref name="driverName"/> are specified the default driver for the platform will be used.</param>
 	/// <param name="driverName">The short name (e.g. "net", "windows", "ansi", "fake", or "curses") of the <see cref="ConsoleDriver"/> to use. If neither <paramref name="driver"/> or <paramref name="driverName"/> are specified the default driver for the platform will be used.</param>
-	public static void Init (ConsoleDriver driver = null, string driverName = null) => InternalInit (Toplevel.Create, driver, driverName);
+	public static void Init (ConsoleDriver driver = null, string driverName = null) => InternalInit (() => new Toplevel (), driver, driverName);
 
 	internal static bool _initialized = false;
 	internal static int _mainThreadId = -1;
@@ -194,6 +194,10 @@ public static partial class Application {
 
 		Top = topLevelFactory ();
 		Current = Top;
+
+		// Ensure Top's layout is up to date.
+		Current.SetRelativeLayout (Driver.Bounds);
+
 		_cachedSupportedCultures = GetSupportedCultures ();
 		_mainThreadId = Thread.CurrentThread.ManagedThreadId;
 		_initialized = true;
@@ -397,9 +401,9 @@ public static partial class Application {
 			MoveCurrent (Current);
 		}
 
-		if (Toplevel.LayoutStyle == LayoutStyle.Computed) {
-			Toplevel.SetRelativeLayout (new Rect (0, 0, Driver.Cols, Driver.Rows));
-		}
+		//if (Toplevel.LayoutStyle == LayoutStyle.Computed) {
+		Toplevel.SetRelativeLayout (Driver.Bounds);
+		//}
 		Toplevel.LayoutSubviews ();
 		Toplevel.PositionToplevels ();
 		Toplevel.FocusFirst ();
@@ -443,7 +447,7 @@ public static partial class Application {
 	/// platform will be used (<see cref="WindowsDriver"/>, <see cref="CursesDriver"/>, or <see cref="NetDriver"/>).
 	/// Must be <see langword="null"/> if <see cref="Init"/> has already been called. 
 	/// </param>
-	public static void Run<T> (Func<Exception, bool> errorHandler = null, ConsoleDriver driver = null) where T : Toplevel, new ()
+	public static void Run<T> (Func<Exception, bool> errorHandler = null, ConsoleDriver driver = null) where T : Toplevel, new()
 	{
 		if (_initialized) {
 			if (Driver != null) {
@@ -710,7 +714,7 @@ public static partial class Application {
 					&& (Driver.Cols != state.Toplevel.Frame.Width || Driver.Rows != state.Toplevel.Frame.Height)
 					&& (state.Toplevel.NeedsDisplay || state.Toplevel.SubViewNeedsDisplay || state.Toplevel.LayoutNeeded)) {
 
-			state.Toplevel.Clear (new Rect (Point.Empty, new Size (Driver.Cols, Driver.Rows)));
+			state.Toplevel.Clear (Driver.Bounds);
 		}
 
 		if (state.Toplevel.NeedsDisplay ||
@@ -1334,7 +1338,8 @@ public static partial class Application {
 	/// <summary>
 	/// Alternative key to navigate forwards through views. Ctrl+Tab is the primary key.
 	/// </summary>
-	[SerializableConfigurationProperty (Scope = typeof (SettingsScope))] [JsonConverter (typeof (KeyJsonConverter))]
+	[SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+	[JsonConverter (typeof (KeyJsonConverter))]
 	public static Key AlternateForwardKey {
 		get => _alternateForwardKey;
 		set {
@@ -1358,7 +1363,8 @@ public static partial class Application {
 	/// <summary>
 	/// Alternative key to navigate backwards through views. Shift+Ctrl+Tab is the primary key.
 	/// </summary>
-	[SerializableConfigurationProperty (Scope = typeof (SettingsScope))] [JsonConverter (typeof (KeyJsonConverter))]
+	[SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+	[JsonConverter (typeof (KeyJsonConverter))]
 	public static Key AlternateBackwardKey {
 		get => _alternateBackwardKey;
 		set {
@@ -1382,7 +1388,8 @@ public static partial class Application {
 	/// <summary>
 	/// Gets or sets the key to quit the application.
 	/// </summary>
-	[SerializableConfigurationProperty (Scope = typeof (SettingsScope))] [JsonConverter (typeof (KeyJsonConverter))]
+	[SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+	[JsonConverter (typeof (KeyJsonConverter))]
 	public static Key QuitKey {
 		get => _quitKey;
 		set {

Terminal.Gui/ConsoleDrivers/ConsoleDriver.cs

@@ -62,7 +62,7 @@ public abstract class ConsoleDriver {
 		get => _cols;
 		internal set {
 			_cols = value;
-			ClearContents();
+			ClearContents ();
 		}
 	}
 
@@ -73,7 +73,7 @@ public abstract class ConsoleDriver {
 		get => _rows;
 		internal set {
 			_rows = value;
-			ClearContents();
+			ClearContents ();
 		}
 	}
 
@@ -552,6 +552,11 @@ public abstract class ConsoleDriver {
 	/// </summary>
 	public static DiagnosticFlags Diagnostics { get; set; }
 
+	/// <summary>
+	/// Gets the dimensions of the terminal.
+	/// </summary>
+	public Rect Bounds => new Rect (0, 0, Cols, Rows);
+
 	/// <summary>
 	/// Suspends the application (e.g. on Linux via SIGTSTP) and upon resume, resets the console driver.
 	/// </summary>

Terminal.Gui/Text/Autocomplete/AppendAutocomplete.cs

@@ -83,6 +83,7 @@ namespace Terminal.Gui {
 		public override void GenerateSuggestions (AutocompleteContext context)
 		{
 			if (_suspendSuggestions) {
+				_suspendSuggestions = false;
 				return;
 			}
 			base.GenerateSuggestions (context);

Terminal.Gui/Text/Autocomplete/PopupAutocomplete.cs

@@ -23,17 +23,6 @@ namespace Terminal.Gui {
 				WantMousePositionReports = true;
 			}
 
-			public override Rect Frame {
-				get => base.Frame;
-				set {
-					base.Frame = value;
-					X = value.X;
-					Y = value.Y;
-					Width = value.Width;
-					Height = value.Height;
-				}
-			}
-
 			public override void OnDrawContent (Rect contentArea)
 			{
 				if (autocomplete.LastPopupPos == null) {

Terminal.Gui/Text/TextFormatter.cs

@@ -50,23 +50,50 @@ namespace Terminal.Gui {
 		Justified
 	}
 
-	/// TextDirection  [H] = Horizontal  [V] = Vertical
-	/// =============
-	/// LeftRight_TopBottom [H] Normal
-	/// TopBottom_LeftRight [V] Normal
-	/// 
-	/// RightLeft_TopBottom [H] Invert Text
-	/// TopBottom_RightLeft [V] Invert Lines
-	/// 
-	/// LeftRight_BottomTop [H] Invert Lines
-	/// BottomTop_LeftRight [V] Invert Text
-	/// 
-	/// RightLeft_BottomTop [H] Invert Text + Invert Lines
-	/// BottomTop_RightLeft [V] Invert Text + Invert Lines
-	///
 	/// <summary>
 	/// Text direction enumeration, controls how text is displayed.
 	/// </summary>
+	/// <remarks>
+	/// <para>TextDirection  [H] = Horizontal  [V] = Vertical</para>
+	/// <table>
+	///   <tr>
+	///     <th>TextDirection</th>
+	///     <th>Description</th>
+	///   </tr>
+	///   <tr>
+	///     <td>LeftRight_TopBottom [H]</td>
+	///     <td>Normal</td>
+	///   </tr>
+	///   <tr>
+	///     <td>TopBottom_LeftRight [V]</td>
+	///     <td>Normal</td>
+	///   </tr>
+	///   <tr>
+	///     <td>RightLeft_TopBottom [H]</td>
+	///     <td>Invert Text</td>
+	///   </tr>
+	///   <tr>
+	///     <td>TopBottom_RightLeft [V]</td>
+	///     <td>Invert Lines</td>
+	///   </tr>
+	///   <tr>
+	///     <td>LeftRight_BottomTop [H]</td>
+	///     <td>Invert Lines</td>
+	///   </tr>
+	///   <tr>
+	///     <td>BottomTop_LeftRight [V]</td>
+	///     <td>Invert Text</td>
+	///   </tr>
+	///   <tr>
+	///     <td>RightLeft_BottomTop [H]</td>
+	///     <td>Invert Text + Invert Lines</td>
+	///   </tr>
+	///   <tr>
+	///     <td>BottomTop_RightLeft [V]</td>
+	///     <td>Invert Text + Invert Lines</td>
+	///   </tr>
+	/// </table>
+	/// </remarks>
 	public enum TextDirection {
 		/// <summary>
 		/// Normal horizontal direction.
@@ -1075,7 +1102,7 @@ namespace Terminal.Gui {
 				_text = EnableNeedsFormat (value);
 
 				if ((AutoSize && Alignment != TextAlignment.Justified && VerticalAlignment != VerticalTextAlignment.Justified) || (textWasNull && Size.IsEmpty)) {
-					Size = CalcRect (0, 0, _text, _textDirection, TabWidth).Size;
+					Size = CalcRect (0, 0, _text, Direction, TabWidth).Size;
 				}
 
 				//if (_text != null && _text.GetRuneCount () > 0 && (Size.Width == 0 || Size.Height == 0 || Size.Width != _text.GetColumns ())) {
@@ -1087,20 +1114,22 @@ namespace Terminal.Gui {
 		}
 
 		/// <summary>
-		/// Used by <see cref="Text"/> to resize the view's <see cref="View.Bounds"/> with the <see cref="Size"/>.
-		/// Setting <see cref="AutoSize"/> to true only work if the <see cref="View.Width"/> and <see cref="View.Height"/> are null or
-		///   <see cref="LayoutStyle.Absolute"/> values and doesn't work with <see cref="LayoutStyle.Computed"/> layout,
-		///   to avoid breaking the <see cref="Pos"/> and <see cref="Dim"/> settings.
+		/// Gets or sets whether the <see cref="Size"/> should be automatically changed to fit the <see cref="Text"/>.
 		/// </summary>
 		/// <remarks>
-		///   Auto size is ignored if the <see cref="TextAlignment.Justified"/> and <see cref="VerticalTextAlignment.Justified"/> are used.
+		/// <para>
+		/// Used by <see cref="View.AutoSize"/> to resize the view's <see cref="View.Bounds"/> to fit <see cref="Size"/>.
+		/// </para>
+		/// <para>
+		/// AutoSize is ignored if <see cref="TextAlignment.Justified"/> and <see cref="VerticalTextAlignment.Justified"/> are used.
+		/// </para>
 		/// </remarks>
 		public bool AutoSize {
 			get => _autoSize;
 			set {
 				_autoSize = EnableNeedsFormat (value);
 				if (_autoSize && Alignment != TextAlignment.Justified && VerticalAlignment != VerticalTextAlignment.Justified) {
-					Size = CalcRect (0, 0, Text, _textDirection, TabWidth).Size;
+					Size = CalcRect (0, 0, _text, Direction, TabWidth).Size;
 				}
 			}
 		}
@@ -1140,7 +1169,12 @@ namespace Terminal.Gui {
 		/// <value>The text vertical alignment.</value>
 		public TextDirection Direction {
 			get => _textDirection;
-			set => _textDirection = EnableNeedsFormat (value);
+			set {
+				_textDirection = EnableNeedsFormat (value);
+				if (AutoSize && Alignment != TextAlignment.Justified && VerticalAlignment != VerticalTextAlignment.Justified) {
+					Size = CalcRect (0, 0, Text, Direction, TabWidth).Size;
+				}
+			}
 		}
 
 		/// <summary>
@@ -1204,7 +1238,7 @@ namespace Terminal.Gui {
 		}
 
 		/// <summary>
-		/// Allows word wrap the to fit the available container width.
+		/// Gets or sets whether word wrap will be used to fit <see cref="Text"/> to <see cref="Size"/>.
 		/// </summary>
 		public bool WordWrap {
 			get => _wordWrap;
@@ -1212,16 +1246,16 @@ namespace Terminal.Gui {
 		}
 
 		/// <summary>
-		/// Gets or sets the size of the area the text will be constrained to when formatted.
+		/// Gets or sets the size <see cref="Text"/> will be constrained to when formatted.
 		/// </summary>
 		/// <remarks>
-		/// Does not return the size the formatted text; just the value that was set.
+		/// Does not return the size of the formatted text but the size that will be used to constrain the text when formatted.
 		/// </remarks>
 		public Size Size {
 			get => _size;
 			set {
 				if (AutoSize && Alignment != TextAlignment.Justified && VerticalAlignment != VerticalTextAlignment.Justified) {
-					_size = EnableNeedsFormat (CalcRect (0, 0, Text, _textDirection, TabWidth).Size);
+					_size = EnableNeedsFormat (CalcRect (0, 0, Text, Direction, TabWidth).Size);
 				} else {
 					_size = EnableNeedsFormat (value);
 				}
@@ -1291,7 +1325,7 @@ namespace Terminal.Gui {
 					NeedsFormat = false;
 					return _lines;
 				}
-				
+
 				if (NeedsFormat) {
 					var shown_text = _text;
 					if (FindHotKey (_text, HotKeySpecifier, true, out _hotKeyPos, out var newHotKey)) {
@@ -1300,7 +1334,7 @@ namespace Terminal.Gui {
 						shown_text = ReplaceHotKeyWithTag (shown_text, _hotKeyPos);
 					}
 
-					if (IsVerticalDirection (_textDirection)) {
+					if (IsVerticalDirection (Direction)) {
 						var colsWidth = GetSumMaxCharWidth (shown_text, 0, 1, TabWidth);
 						_lines = Format (shown_text, Size.Height, VerticalAlignment == VerticalTextAlignment.Justified, Size.Width > colsWidth && WordWrap,
 							PreserveTrailingSpaces, TabWidth, Direction, MultiLine);
@@ -1325,11 +1359,16 @@ namespace Terminal.Gui {
 		}
 
 		/// <summary>
-		/// Gets or sets whether the <see cref="TextFormatter"/> needs to format the text when <see cref="Draw(Rect, Attribute, Attribute, Rect, bool, ConsoleDriver)"/> is called.
-		/// If it is <c>false</c> when Draw is called, the Draw call will be faster.
+		/// Gets or sets whether the <see cref="TextFormatter"/> needs to format the text. 
 		/// </summary>
 		/// <remarks>
 		/// <para>
+		/// If <c>false</c> when Draw is called, the Draw call will be faster.
+		/// </para>
+		/// <para>
+		/// Used by <see cref="Draw(Rect, Attribute, Attribute, Rect, bool, ConsoleDriver)"/>
+		/// </para>
+		/// <para>
 		/// This is set to true when the properties of <see cref="TextFormatter"/> are set.
 		/// </para>
 		/// </remarks>
@@ -1400,7 +1439,7 @@ namespace Terminal.Gui {
 			// Use "Lines" to ensure a Format (don't use "lines"))
 
 			var linesFormated = Lines;
-			switch (_textDirection) {
+			switch (Direction) {
 			case TextDirection.TopBottom_RightLeft:
 			case TextDirection.LeftRight_BottomTop:
 			case TextDirection.RightLeft_BottomTop:
@@ -1409,7 +1448,7 @@ namespace Terminal.Gui {
 				break;
 			}
 
-			var isVertical = IsVerticalDirection (_textDirection);
+			var isVertical = IsVerticalDirection (Direction);
 			var maxBounds = bounds;
 			if (driver != null) {
 				maxBounds = containerBounds == default
@@ -1441,7 +1480,7 @@ namespace Terminal.Gui {
 
 				var runes = _lines [line].ToRunes ();
 
-				switch (_textDirection) {
+				switch (Direction) {
 				case TextDirection.RightLeft_BottomTop:
 				case TextDirection.RightLeft_TopBottom:
 				case TextDirection.BottomTop_LeftRight:
@@ -1454,7 +1493,7 @@ namespace Terminal.Gui {
 
 				int x, y;
 				// Horizontal Alignment
-				if (_textAlignment == TextAlignment.Right || (_textAlignment == TextAlignment.Justified && !IsLeftToRight (_textDirection))) {
+				if (_textAlignment == TextAlignment.Right || (_textAlignment == TextAlignment.Justified && !IsLeftToRight (Direction))) {
 					if (isVertical) {
 						var runesWidth = GetSumMaxCharWidth (Lines, line, TabWidth);
 						x = bounds.Right - runesWidth;
@@ -1487,7 +1526,7 @@ namespace Terminal.Gui {
 				}
 
 				// Vertical Alignment
-				if (_textVerticalAlignment == VerticalTextAlignment.Bottom || (_textVerticalAlignment == VerticalTextAlignment.Justified && !IsTopToBottom (_textDirection))) {
+				if (_textVerticalAlignment == VerticalTextAlignment.Bottom || (_textVerticalAlignment == VerticalTextAlignment.Justified && !IsTopToBottom (Direction))) {
 					if (isVertical) {
 						y = bounds.Bottom - runes.Length;
 					} else {

Terminal.Gui/View/Frame.cs

@@ -58,7 +58,7 @@ namespace Terminal.Gui {
 		/// <inheritdoc/>
 		public override Rect FrameToScreen ()
 		{
-			// Frames are *Children* of a View, not SubViews. Thus View.FramToScreen will not work.
+			// Frames are *Children* of a View, not SubViews. Thus View.FrameToScreen will not work.
 			// To get the screen-relative coordinates of a Frame, we need to know who
 			// the Parent is
 			var ret = Parent?.Frame ?? Frame;

Terminal.Gui/View/SuperViewChangedEventArgs.cs

@@ -1,33 +1,34 @@
 using System;
 
-namespace Terminal.Gui {
+namespace Terminal.Gui;
+
+/// <summary>
+/// Args for events where the <see cref="View.SuperView"/> of a <see cref="View"/> is changed
+/// (e.g. <see cref="View.Removed"/> / <see cref="View.Added"/> events).
+/// </summary>
+public class SuperViewChangedEventArgs : EventArgs {
 	/// <summary>
-	/// Args for events where the <see cref="View.SuperView"/> of a <see cref="View"/> is changed
-	/// (e.g. <see cref="View.Removed"/> / <see cref="View.Added"/> events).
+	/// Creates a new instance of the <see cref="SuperViewChangedEventArgs"/> class.
 	/// </summary>
-	public class SuperViewChangedEventArgs : EventArgs
+	/// <param name="parent"></param>
+	/// <param name="child"></param>
+	public SuperViewChangedEventArgs (View parent, View child)
 	{
-		/// <summary>
-		/// Creates a new instance of the <see cref="SuperViewChangedEventArgs"/> class.
-		/// </summary>
-		/// <param name="parent"></param>
-		/// <param name="child"></param>
-		public SuperViewChangedEventArgs (View parent, View child)
-		{
-			Parent = parent;
-			Child = child;
-		}
+		Parent = parent;
+		Child = child;
+	}
 
-		/// <summary>
-		/// The parent.  For <see cref="View.Removed"/> this is the old
-		/// parent (new parent now being null).  For <see cref="View.Added"/>
-		/// it is the new parent to whom view now belongs.
-		/// </summary>
-		public View Parent { get; }
+	// TODO: Parent is the wrong name. It should be SuperView.
+	/// <summary>
+	/// The parent.  For <see cref="View.Removed"/> this is the old
+	/// parent (new parent now being null).  For <see cref="View.Added"/>
+	/// it is the new parent to whom view now belongs.
+	/// </summary>
+	public View Parent { get; }
 
-		/// <summary>
-		/// The view that is having it's <see cref="View.SuperView"/> changed
-		/// </summary>
-		public View Child { get; }
-	}
-}
+	// TODO: Child is the wrong name. It should be View.
+	/// <summary>
+	/// The view that is having it's <see cref="View.SuperView"/> changed
+	/// </summary>
+	public View Child { get; }
+}

Terminal.Gui/View/View.cs

@@ -1,315 +1,137 @@
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 
 namespace Terminal.Gui;
 
 #region API Docs
 /// <summary>
-/// View is the base class for all views on the screen and represents a visible element that can render itself and 
+/// View is the base class for all views on the screen and represents a visible element that can render itself and
 /// contains zero or more nested views, called SubViews. View provides basic functionality for layout, positioning,
 /// and drawing. In addition, View provides keyboard and mouse event handling.
 /// </summary>
 /// <remarks>
 /// <list type="table">
-///	<listheader>
-///	<term>Term</term><description>Definition</description>
-///	</listheader>
-///	<item>
-///	<term>SubView</term><description>A View that is contained in another view and will be rendered as part of the containing view's ContentArea. 
-/// SubViews are added to another view via the <see cref="View.Add(View)"/>` method. A View may only be a SubView of a single View. </description>
-///	</item>
-///	<item>
-///		<term>SuperView</term><description>The View that is a container for SubViews.</description>
-///	</item>
+///         <listheader>
+///                 <term>Term</term><description>Definition</description>
+///         </listheader>
+///         <item>
+///                 <term>SubView</term>
+///                 <description>
+///                 A View that is contained in another view and will be rendered as part of the containing view's
+///                 ContentArea.
+///                 SubViews are added to another view via the <see cref="View.Add(View)"/>` method. A View may only be a
+///                 SubView of a single View.
+///                 </description>
+///         </item>
+///         <item>
+///                 <term>SuperView</term><description>The View that is a container for SubViews.</description>
+///         </item>
 /// </list>
 /// <para>
 /// Focus is a concept that is used to describe which View is currently receiving user input. Only Views that are
 /// <see cref="Enabled"/>, <see cref="Visible"/>, and <see cref="CanFocus"/> will receive focus.
 /// </para>
 /// <para>
-///    Views that are focusable should implement the <see cref="PositionCursor"/> to make sure that
-///    the cursor is placed in a location that makes sense. Unix terminals do not have
-///    a way of hiding the cursor, so it can be distracting to have the cursor left at
-///    the last focused view. So views should make sure that they place the cursor
-///    in a visually sensible place.
+/// Views that are focusable should implement the <see cref="PositionCursor"/> to make sure that
+/// the cursor is placed in a location that makes sense. Unix terminals do not have
+/// a way of hiding the cursor, so it can be distracting to have the cursor left at
+/// the last focused view. So views should make sure that they place the cursor
+/// in a visually sensible place.
 /// </para>
 /// <para>
-///    The View defines the base functionality for user interface elements in Terminal.Gui. Views
-///    can contain one or more subviews, can respond to user input and render themselves on the screen.
+/// The View defines the base functionality for user interface elements in Terminal.Gui. Views
+/// can contain one or more subviews, can respond to user input and render themselves on the screen.
 /// </para>
 /// <para>
-///    Views supports two layout styles: <see cref="LayoutStyle.Absolute"/> or <see cref="LayoutStyle.Computed"/>. 
-///    The choice as to which layout style is used by the View 
-///    is determined when the View is initialized. To create a View using Absolute layout, call a constructor that takes a
-///    Rect parameter to specify the absolute position and size (the View.<see cref="View.Frame "/>). To create a View 
-///    using Computed layout use a constructor that does not take a Rect parameter and set the X, Y, Width and Height 
-///    properties on the view. Both approaches use coordinates that are relative to the container they are being added to. 
+/// View supports two layout styles: <see cref="LayoutStyle.Absolute"/> or <see cref="LayoutStyle.Computed"/>.
+/// The style is determined by the values of <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and
+/// <see cref="Height"/>.
+/// If any of these is set to non-absolute <see cref="Pos"/> or <see cref="Dim"/> object,
+/// then the layout style is <see cref="LayoutStyle.Computed"/>. Otherwise it is <see cref="LayoutStyle.Absolute"/>.
 /// </para>
 /// <para>
-///    To switch between Absolute and Computed layout, use the <see cref="LayoutStyle"/> property. 
+/// To create a View using Absolute layout, call a constructor that takes a
+/// Rect parameter to specify the absolute position and size or simply set <see cref="View.Frame "/>). To create a View
+/// using Computed layout use a constructor that does not take a Rect parameter and set the X, Y, Width and Height
+/// properties on the view to non-absolute values. Both approaches use coordinates that are relative to the
+/// <see cref="Bounds"/> of the <see cref="SuperView"/> the View is added to.
 /// </para>
 /// <para>
-///    Computed layout is more flexible and supports dynamic console apps where controls adjust layout
-///    as the terminal resizes or other Views change size or position. The X, Y, Width and Height 
-///    properties are Dim and Pos objects that dynamically update the position of a view.
-///    The X and Y properties are of type <see cref="Pos"/>
-///    and you can use either absolute positions, percentages or anchor
-///    points. The Width and Height properties are of type
-///    <see cref="Dim"/> and can use absolute position,
-///    percentages and anchors. These are useful as they will take
-///    care of repositioning views when view's frames are resized or
-///    if the terminal size changes.
+/// Computed layout is more flexible and supports dynamic console apps where controls adjust layout
+/// as the terminal resizes or other Views change size or position. The
+/// <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and
+/// <see cref="Height"/> properties are <see cref="Dim"/> and <see cref="Pos"/> objects that dynamically update the
+/// position of a view.
+/// The X and Y properties are of type <see cref="Pos"/>
+/// and you can use either absolute positions, percentages, or anchor
+/// points. The Width and Height properties are of type
+/// <see cref="Dim"/> and can use absolute position,
+/// percentages, and anchors. These are useful as they will take
+/// care of repositioning views when view's frames are resized or
+/// if the terminal size changes.
 /// </para>
 /// <para>
-///    Absolute layout requires specifying coordinates and sizes of Views explicitly, and the
-///    View will typically stay in a fixed position and size. To change the position and size use the
-///    <see cref="Frame"/> property.
+/// Absolute layout requires specifying coordinates and sizes of Views explicitly, and the
+/// View will typically stay in a fixed position and size. To change the position and size use the
+/// <see cref="Frame"/> property.
 /// </para>
 /// <para>
-///    Subviews (child views) can be added to a View by calling the <see cref="Add(View)"/> method. 
-///    The container of a View can be accessed with the <see cref="SuperView"/> property.
+/// Subviews (child views) can be added to a View by calling the <see cref="Add(View)"/> method.
+/// The container of a View can be accessed with the <see cref="SuperView"/> property.
 /// </para>
 /// <para>
-///    To flag a region of the View's <see cref="Bounds"/> to be redrawn call <see cref="SetNeedsDisplay(Rect)"/>. 
-///    To flag the entire view for redraw call <see cref="SetNeedsDisplay()"/>.
+/// To flag a region of the View's <see cref="Bounds"/> to be redrawn call <see cref="SetNeedsDisplay(Rect)"/>.
+/// To flag the entire view for redraw call <see cref="SetNeedsDisplay()"/>.
 /// </para>
 /// <para>
-///    The <see cref="LayoutSubviews"/> method is invoked when the size or layout of a view has
-///    changed. The default processing system will keep the size and dimensions
-///    for views that use the <see cref="LayoutStyle.Absolute"/>, and will recompute the
-///    frames for the vies that use <see cref="LayoutStyle.Computed"/>.
+/// The <see cref="LayoutSubviews"/> method is invoked when the size or layout of a view has
+/// changed. The default processing system will keep the size and dimensions
+/// for views that use the <see cref="LayoutStyle.Absolute"/>, and will recompute the
+/// frames for the vies that use <see cref="LayoutStyle.Computed"/>.
 /// </para>
 /// <para>
-///    Views have a <see cref="ColorScheme"/> property that defines the default colors that subviews
-///    should use for rendering. This ensures that the views fit in the context where
-///    they are being used, and allows for themes to be plugged in. For example, the
-///    default colors for windows and Toplevels uses a blue background, while it uses
-///    a white background for dialog boxes and a red background for errors.
+/// Views have a <see cref="ColorScheme"/> property that defines the default colors that subviews
+/// should use for rendering. This ensures that the views fit in the context where
+/// they are being used, and allows for themes to be plugged in. For example, the
+/// default colors for windows and Toplevels uses a blue background, while it uses
+/// a white background for dialog boxes and a red background for errors.
 /// </para>
 /// <para>
-///    Subclasses should not rely on <see cref="ColorScheme"/> being
-///    set at construction time. If a <see cref="ColorScheme"/> is not set on a view, the view will inherit the
-///    value from its <see cref="SuperView"/> and the value might only be valid once a view has been
-///    added to a SuperView. 
+/// Subclasses should not rely on <see cref="ColorScheme"/> being
+/// set at construction time. If a <see cref="ColorScheme"/> is not set on a view, the view will inherit the
+/// value from its <see cref="SuperView"/> and the value might only be valid once a view has been
+/// added to a SuperView.
 /// </para>
 /// <para>
-///    By using  <see cref="ColorScheme"/> applications will work both
-///    in color as well as black and white displays.
+/// By using  <see cref="ColorScheme"/> applications will work both
+/// in color as well as black and white displays.
 /// </para>
 /// <para>
-///     Views can also opt-in to more sophisticated initialization
-///     by implementing overrides to <see cref="ISupportInitialize.BeginInit"/> and
-///     <see cref="ISupportInitialize.EndInit"/> which will be called
-///     when the view is added to a <see cref="SuperView"/>. 
+/// Views can also opt-in to more sophisticated initialization
+/// by implementing overrides to <see cref="ISupportInitialize.BeginInit"/> and
+/// <see cref="ISupportInitialize.EndInit"/> which will be called
+/// when the view is added to a <see cref="SuperView"/>.
 /// </para>
 /// <para>
-///     If first-run-only initialization is preferred, overrides to <see cref="ISupportInitializeNotification"/>
-///     can be implemented, in which case the <see cref="ISupportInitialize"/>
-///     methods will only be called if <see cref="ISupportInitializeNotification.IsInitialized"/>
-///     is <see langword="false"/>. This allows proper <see cref="View"/> inheritance hierarchies
-///     to override base class layout code optimally by doing so only on first run,
-///     instead of on every run.
-///   </para>
+/// If first-run-only initialization is preferred, overrides to <see cref="ISupportInitializeNotification"/>
+/// can be implemented, in which case the <see cref="ISupportInitialize"/>
+/// methods will only be called if <see cref="ISupportInitializeNotification.IsInitialized"/>
+/// is <see langword="false"/>. This allows proper <see cref="View"/> inheritance hierarchies
+/// to override base class layout code optimally by doing so only on first run,
+/// instead of on every run.
+/// </para>
 /// <para>
-///	See <see href="../docs/keyboard.md">for an overview of View keyboard handling.</see>
-/// </para>	/// </remarks>
+/// See <see href="../docs/keyboard.md">for an overview of View keyboard handling.</see>
+/// </para>
+/// ///
+/// </remarks>
 #endregion API Docs
 
 public partial class View : Responder, ISupportInitializeNotification {
-	#region Constructors and Initialization
-	/// <summary>
-	/// Initializes a new instance of a <see cref="Terminal.Gui.LayoutStyle.Absolute"/> <see cref="View"/> class with the absolute
-	/// dimensions specified in the <paramref name="frame"/> parameter. 
-	/// </summary>
-	/// <param name="frame">The region covered by this view.</param>
-	/// <remarks>
-	/// This constructor initialize a View with a <see cref="LayoutStyle"/> of <see cref="Terminal.Gui.LayoutStyle.Absolute"/>.
-	/// Use <see cref="View"/> to initialize a View with  <see cref="LayoutStyle"/> of <see cref="Terminal.Gui.LayoutStyle.Computed"/> 
-	/// </remarks>
-	public View (Rect frame) : this (frame, null) { }
-
-	/// <summary>
-	///   Initializes a new instance of <see cref="View"/> using <see cref="Terminal.Gui.LayoutStyle.Computed"/> layout.
-	/// </summary>
-	/// <remarks>
-	/// <para>
-	///   Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically control the size and location of the view.
-	///   The <see cref="View"/> will be created using <see cref="Terminal.Gui.LayoutStyle.Computed"/>
-	///   coordinates. The initial size (<see cref="View.Frame"/>) will be 
-	///   adjusted to fit the contents of <see cref="Text"/>, including newlines ('\n') for multiple lines. 
-	/// </para>
-	/// <para>
-	///   If <see cref="Height"/> is greater than one, word wrapping is provided.
-	/// </para>
-	/// <para>
-	///   This constructor initialize a View with a <see cref="LayoutStyle"/> of <see cref="Terminal.Gui.LayoutStyle.Computed"/>. 
-	///   Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically control the size and location of the view.
-	/// </para>
-	/// </remarks>
-	public View () : this (string.Empty, TextDirection.LeftRight_TopBottom) { }
-
-	/// <summary>
-	///   Initializes a new instance of <see cref="View"/> using <see cref="Terminal.Gui.LayoutStyle.Absolute"/> layout.
-	/// </summary>
-	/// <remarks>
-	/// <para>
-	///   The <see cref="View"/> will be created at the given
-	///   coordinates with the given string. The size (<see cref="View.Frame"/>) will be 
-	///   adjusted to fit the contents of <see cref="Text"/>, including newlines ('\n') for multiple lines. 
-	/// </para>
-	/// <para>
-	///   No line wrapping is provided.
-	/// </para>
-	/// </remarks>
-	/// <param name="x">column to locate the View.</param>
-	/// <param name="y">row to locate the View.</param>
-	/// <param name="text">text to initialize the <see cref="Text"/> property with.</param>
-	public View (int x, int y, string text) : this (TextFormatter.CalcRect (x, y, text), text) { }
-
-	/// <summary>
-	///   Initializes a new instance of <see cref="View"/> using <see cref="Terminal.Gui.LayoutStyle.Absolute"/> layout.
-	/// </summary>
-	/// <remarks>
-	/// <para>
-	///   The <see cref="View"/> will be created at the given
-	///   coordinates with the given string. The initial size (<see cref="View.Frame"/>) will be 
-	///   adjusted to fit the contents of <see cref="Text"/>, including newlines ('\n') for multiple lines. 
-	/// </para>
-	/// <para>
-	///   If <c>rect.Height</c> is greater than one, word wrapping is provided.
-	/// </para>
-	/// </remarks>
-	/// <param name="rect">Location.</param>
-	/// <param name="text">text to initialize the <see cref="Text"/> property with.</param>
-	public View (Rect rect, string text) => SetInitialProperties (text, rect, LayoutStyle.Absolute, TextDirection.LeftRight_TopBottom);
-
-	/// <summary>
-	///   Initializes a new instance of <see cref="View"/> using <see cref="Terminal.Gui.LayoutStyle.Computed"/> layout.
-	/// </summary>
-	/// <remarks>
-	/// <para>
-	///   The <see cref="View"/> will be created using <see cref="Terminal.Gui.LayoutStyle.Computed"/>
-	///   coordinates with the given string. The initial size (<see cref="View.Frame"/>) will be 
-	///   adjusted to fit the contents of <see cref="Text"/>, including newlines ('\n') for multiple lines. 
-	/// </para>
-	/// <para>
-	///   If <see cref="Height"/> is greater than one, word wrapping is provided.
-	/// </para>
-	/// </remarks>
-	/// <param name="text">text to initialize the <see cref="Text"/> property with.</param>
-	/// <param name="direction">The text direction.</param>
-	public View (string text, TextDirection direction = TextDirection.LeftRight_TopBottom) => SetInitialProperties (text, Rect.Empty, LayoutStyle.Computed, direction);
-
-	// TODO: v2 - Remove constructors with parameters
-	/// <summary>
-	/// Private helper to set the initial properties of the View that were provided via constructors.
-	/// </summary>
-	/// <param name="text"></param>
-	/// <param name="rect"></param>
-	/// <param name="layoutStyle"></param>
-	/// <param name="direction"></param>
-	void SetInitialProperties (string text, Rect rect, LayoutStyle layoutStyle = LayoutStyle.Computed,
-				TextDirection direction = TextDirection.LeftRight_TopBottom)
-	{
-		TextFormatter = new TextFormatter ();
-		TextFormatter.HotKeyChanged += TextFormatter_HotKeyChanged;
-		TextDirection = direction;
-
-		CanFocus = false;
-		TabIndex = -1;
-		TabStop = false;
-		LayoutStyle = layoutStyle;
-
-		Text = text == null ? string.Empty : text;
-		LayoutStyle = layoutStyle;
-		Frame = rect.IsEmpty ? TextFormatter.CalcRect (0, 0, text, direction) : rect;
-		OnResizeNeeded ();
-
-		AddCommands ();
-
-		CreateFrames ();
-	}
-
-	/// <summary>
-	/// Get or sets if  the <see cref="View"/> has been initialized (via <see cref="ISupportInitialize.BeginInit"/> 
-	/// and <see cref="ISupportInitialize.EndInit"/>).
-	/// </summary>
-	/// <para>
-	///     If first-run-only initialization is preferred, overrides to <see cref="ISupportInitializeNotification.IsInitialized"/>
-	///     can be implemented, in which case the <see cref="ISupportInitialize"/>
-	///     methods will only be called if <see cref="ISupportInitializeNotification.IsInitialized"/>
-	///     is <see langword="false"/>. This allows proper <see cref="View"/> inheritance hierarchies
-	///     to override base class layout code optimally by doing so only on first run,
-	///     instead of on every run.
-	///   </para>
-	public virtual bool IsInitialized { get; set; }
-
-	/// <summary>
-	///  Signals the View that initialization is starting. See <see cref="ISupportInitialize"/>.
-	/// </summary>
-	/// <remarks>
-	/// <para>
-	///     Views can opt-in to more sophisticated initialization
-	///     by implementing overrides to <see cref="ISupportInitialize.BeginInit"/> and
-	///     <see cref="ISupportInitialize.EndInit"/> which will be called
-	///     when the view is added to a <see cref="SuperView"/>. 
-	/// </para>
-	/// <para>
-	///     If first-run-only initialization is preferred, overrides to <see cref="ISupportInitializeNotification"/>
-	///     can be implemented too, in which case the <see cref="ISupportInitialize"/>
-	///     methods will only be called if <see cref="ISupportInitializeNotification.IsInitialized"/>
-	///     is <see langword="false"/>. This allows proper <see cref="View"/> inheritance hierarchies
-	///     to override base class layout code optimally by doing so only on first run,
-	///     instead of on every run.
-	///   </para>
-	/// </remarks>
-	public virtual void BeginInit ()
-	{
-		if (!IsInitialized) {
-			_oldCanFocus = CanFocus;
-			_oldTabIndex = _tabIndex;
-
-
-			// TODO: Figure out why ScrollView and other tests fail if this call is put here 
-			// instead of the constructor.
-			//InitializeFrames ();
-
-		} else {
-			//throw new InvalidOperationException ("The view is already initialized.");
-
-		}
-
-		if (_subviews?.Count > 0) {
-			foreach (var view in _subviews) {
-				if (!view.IsInitialized) {
-					view.BeginInit ();
-				}
-			}
-		}
-	}
-
-	/// <summary>
-	///  Signals the View that initialization is ending. See <see cref="ISupportInitialize"/>.
-	/// </summary>
-	public void EndInit ()
-	{
-		IsInitialized = true;
-		// These calls were moved from BeginInit as they access Bounds which is indeterminate until EndInit is called.
-		UpdateTextDirection (TextDirection);
-		UpdateTextFormatterText ();
-		SetHotKey ();
+	bool _oldEnabled;
 
-		OnResizeNeeded ();
-		if (_subviews != null) {
-			foreach (var view in _subviews) {
-				if (!view.IsInitialized) {
-					view.EndInit ();
-				}
-			}
-		}
-		Initialized?.Invoke (this, EventArgs.Empty);
-	}
-	#endregion Constructors and Initialization
+	string _title = string.Empty;
 
 	/// <summary>
 	/// Points to the current driver in use by the view, it is a convenience property
@@ -330,10 +152,9 @@ public partial class View : Responder, ISupportInitializeNotification {
 	/// <remarks>The id should be unique across all Views that share a SuperView.</remarks>
 	public string Id { get; set; } = "";
 
-	string _title = string.Empty;
-
 	/// <summary>
-	/// The title to be displayed for this <see cref="View"/>. The title will be displayed if <see cref="Border"/>.<see cref="Thickness.Top"/>
+	/// The title to be displayed for this <see cref="View"/>. The title will be displayed if <see cref="Border"/>.
+	/// <see cref="Thickness.Top"/>
 	/// is greater than 0.
 	/// </summary>
 	/// <value>The title.</value>
@@ -341,12 +162,12 @@ public partial class View : Responder, ISupportInitializeNotification {
 		get => _title;
 		set {
 			if (!OnTitleChanging (_title, value)) {
-				string old = _title;
+				var old = _title;
 				_title = value;
 				SetNeedsDisplay ();
 #if DEBUG
 				if (_title != null && string.IsNullOrEmpty (Id)) {
-					Id = _title.ToString ();
+					Id = _title;
 				}
 #endif // DEBUG
 				OnTitleChanged (old, _title);
@@ -354,51 +175,6 @@ public partial class View : Responder, ISupportInitializeNotification {
 		}
 	}
 
-	/// <summary>
-	/// Called before the <see cref="View.Title"/> changes. Invokes the <see cref="TitleChanging"/> event, which can be cancelled.
-	/// </summary>
-	/// <param name="oldTitle">The <see cref="View.Title"/> that is/has been replaced.</param>
-	/// <param name="newTitle">The new <see cref="View.Title"/> to be replaced.</param>
-	/// <returns>`true` if an event handler canceled the Title change.</returns>
-	public virtual bool OnTitleChanging (string oldTitle, string newTitle)
-	{
-		var args = new TitleEventArgs (oldTitle, newTitle);
-		TitleChanging?.Invoke (this, args);
-		return args.Cancel;
-	}
-
-	/// <summary>
-	/// Event fired when the <see cref="View.Title"/> is changing. Set <see cref="TitleEventArgs.Cancel"/> to 
-	/// `true` to cancel the Title change.
-	/// </summary>
-	public event EventHandler<TitleEventArgs> TitleChanging;
-
-	/// <summary>
-	/// Called when the <see cref="View.Title"/> has been changed. Invokes the <see cref="TitleChanged"/> event.
-	/// </summary>
-	/// <param name="oldTitle">The <see cref="View.Title"/> that is/has been replaced.</param>
-	/// <param name="newTitle">The new <see cref="View.Title"/> to be replaced.</param>
-	public virtual void OnTitleChanged (string oldTitle, string newTitle)
-	{
-		var args = new TitleEventArgs (oldTitle, newTitle);
-		TitleChanged?.Invoke (this, args);
-	}
-
-	/// <summary>
-	/// Event fired after the <see cref="View.Title"/> has been changed. 
-	/// </summary>
-	public event EventHandler<TitleEventArgs> TitleChanged;
-
-	/// <summary>
-	/// Event fired when the <see cref="Enabled"/> value is being changed.
-	/// </summary>
-	public event EventHandler EnabledChanged;
-
-	/// <inheritdoc/>
-	public override void OnEnabledChanged () => EnabledChanged?.Invoke (this, EventArgs.Empty);
-
-	bool _oldEnabled;
-
 	/// <inheritdoc/>
 	public override bool Enabled {
 		get => base.Enabled;
@@ -432,20 +208,13 @@ public partial class View : Responder, ISupportInitializeNotification {
 		}
 	}
 
-	/// <summary>
-	/// Event fired when the <see cref="Visible"/> value is being changed.
-	/// </summary>
-	public event EventHandler VisibleChanged;
-
-	/// <inheritdoc/>
-	public override void OnVisibleChanged () => VisibleChanged?.Invoke (this, EventArgs.Empty);
-
 	/// <summary>
 	/// Gets or sets whether a view is cleared if the <see cref="Visible"/> property is <see langword="false"/>.
 	/// </summary>
 	public bool ClearOnVisibleFalse { get; set; } = true;
 
-	/// <inheritdoc/>>
+	/// <inheritdoc/>
+	/// >
 	public override bool Visible {
 		get => base.Visible;
 		set {
@@ -465,6 +234,58 @@ public partial class View : Responder, ISupportInitializeNotification {
 		}
 	}
 
+	/// <summary>
+	/// Called before the <see cref="View.Title"/> changes. Invokes the <see cref="TitleChanging"/> event, which can be
+	/// cancelled.
+	/// </summary>
+	/// <param name="oldTitle">The <see cref="View.Title"/> that is/has been replaced.</param>
+	/// <param name="newTitle">The new <see cref="View.Title"/> to be replaced.</param>
+	/// <returns>`true` if an event handler canceled the Title change.</returns>
+	public virtual bool OnTitleChanging (string oldTitle, string newTitle)
+	{
+		var args = new TitleEventArgs (oldTitle, newTitle);
+		TitleChanging?.Invoke (this, args);
+		return args.Cancel;
+	}
+
+	/// <summary>
+	/// Event fired when the <see cref="View.Title"/> is changing. Set <see cref="TitleEventArgs.Cancel"/> to
+	/// `true` to cancel the Title change.
+	/// </summary>
+	public event EventHandler<TitleEventArgs> TitleChanging;
+
+	/// <summary>
+	/// Called when the <see cref="View.Title"/> has been changed. Invokes the <see cref="TitleChanged"/> event.
+	/// </summary>
+	/// <param name="oldTitle">The <see cref="View.Title"/> that is/has been replaced.</param>
+	/// <param name="newTitle">The new <see cref="View.Title"/> to be replaced.</param>
+	public virtual void OnTitleChanged (string oldTitle, string newTitle)
+	{
+		var args = new TitleEventArgs (oldTitle, newTitle);
+		TitleChanged?.Invoke (this, args);
+	}
+
+	/// <summary>
+	/// Event fired after the <see cref="View.Title"/> has been changed.
+	/// </summary>
+	public event EventHandler<TitleEventArgs> TitleChanged;
+
+	/// <summary>
+	/// Event fired when the <see cref="Enabled"/> value is being changed.
+	/// </summary>
+	public event EventHandler EnabledChanged;
+
+	/// <inheritdoc/>
+	public override void OnEnabledChanged () => EnabledChanged?.Invoke (this, EventArgs.Empty);
+
+	/// <summary>
+	/// Event fired when the <see cref="Visible"/> value is being changed.
+	/// </summary>
+	public event EventHandler VisibleChanged;
+
+	/// <inheritdoc/>
+	public override void OnVisibleChanged () => VisibleChanged?.Invoke (this, EventArgs.Empty);
+
 	bool CanBeVisible (View view)
 	{
 		if (!view.Visible) {
@@ -497,18 +318,260 @@ public partial class View : Responder, ISupportInitializeNotification {
 		Padding?.Dispose ();
 		Padding = null;
 
-		_height = null;
-		_width = null;
-		_x = null;
-		_y = null;
-
-		for (int i = InternalSubviews.Count - 1; i >= 0; i--) {
+		for (var i = InternalSubviews.Count - 1; i >= 0; i--) {
 			var subview = InternalSubviews [i];
 			Remove (subview);
 			subview.Dispose ();
 		}
 
 		base.Dispose (disposing);
-		System.Diagnostics.Debug.Assert (InternalSubviews.Count == 0);
+		Debug.Assert (InternalSubviews.Count == 0);
 	}
+
+	#region Constructors and Initialization
+	/// <summary>
+	/// Initializes a new instance of a <see cref="View"/> class with the absolute
+	/// dimensions specified in the <paramref name="frame"/> parameter.
+	/// </summary>
+	/// <param name="frame">The region covered by this view.</param>
+	/// <remarks>
+	///         <para>
+	///         Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically
+	///         control the size and location of the view.
+	///         The <see cref="View"/> will be created using <see cref="LayoutStyle.Absolute"/>
+	///         coordinates. The initial size (<see cref="View.Frame"/>) will be
+	///         adjusted to fit the contents of <see cref="Text"/>, including newlines ('\n') for multiple lines.
+	///         </para>
+	///         <para>
+	///         If <see cref="Height"/> is greater than one, word wrapping is provided.
+	///         </para>
+	///         <para>
+	///         This constructor initialize a View with a <see cref="LayoutStyle"/> of
+	///         <see cref="LayoutStyle.Absolute"/>.
+	///         Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically
+	///         control the size and location of the view, changing it to  <see cref="LayoutStyle.Computed"/>.
+	///         </para>
+	/// </remarks>
+	public View (Rect frame) : this (frame, null) { }
+
+	/// <summary>
+	/// Initializes a new instance of <see cref="View"/>.
+	/// </summary>
+	/// <remarks>
+	///         <para>
+	///         Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically
+	///         control the size and location of the view.
+	///         The <see cref="View"/> will be created using <see cref="LayoutStyle.Absolute"/>
+	///         coordinates. The initial size (<see cref="View.Frame"/>) will be
+	///         adjusted to fit the contents of <see cref="Text"/>, including newlines ('\n') for multiple lines.
+	///         </para>
+	///         <para>
+	///         If <see cref="Height"/> is greater than one, word wrapping is provided.
+	///         </para>
+	///         <para>
+	///         This constructor initialize a View with a <see cref="LayoutStyle"/> of
+	///         <see cref="LayoutStyle.Absolute"/>.
+	///         Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically
+	///         control the size and location of the view, changing it to  <see cref="LayoutStyle.Computed"/>.
+	///         </para>
+	/// </remarks>
+	public View () : this (string.Empty) { }
+
+	/// <summary>
+	/// Initializes a new instance of <see cref="View"/> in at the position specified with the
+	/// dimensions specified in the <paramref name="x"/> and <paramref name="y"/> parameters.
+	/// </summary>
+	/// <remarks>
+	///         <para>
+	///         The <see cref="View"/> will be created at the given
+	///         coordinates with the given string. The size (<see cref="View.Frame"/>) will be
+	///         adjusted to fit the contents of <see cref="Text"/>, including newlines ('\n') for multiple lines.
+	///         </para>
+	///         <para>
+	///         Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically
+	///         control the size and location of the view.
+	///         </para>
+	///         <para>
+	///         If <see cref="Height"/> is greater than one, word wrapping is provided.
+	///         </para>
+	///         <para>
+	///         This constructor initialize a View with a <see cref="LayoutStyle"/> of
+	///         <see cref="LayoutStyle.Absolute"/>.
+	///         Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically
+	///         control the size and location of the view, changing it to  <see cref="LayoutStyle.Computed"/>.
+	///         </para>
+	/// </remarks>
+	/// <param name="x">column to locate the View.</param>
+	/// <param name="y">row to locate the View.</param>
+	/// <param name="text">text to initialize the <see cref="Text"/> property with.</param>
+	public View (int x, int y, string text) : this (TextFormatter.CalcRect (x, y, text), text) { }
+
+	/// <summary>
+	/// Initializes a new instance of a <see cref="View"/> class with the absolute
+	/// dimensions specified in the <paramref name="frame"/> parameter.
+	/// </summary>
+	/// <remarks>
+	///         <para>
+	///         The <see cref="View"/> will be created at the given
+	///         coordinates with the given string. The size (<see cref="View.Frame"/>) will be
+	///         adjusted to fit the contents of <see cref="Text"/>, including newlines ('\n') for multiple lines.
+	///         </para>
+	///         <para>
+	///         Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically
+	///         control the size and location of the view.
+	///         </para>
+	///         <para>
+	///         If <see cref="Height"/> is greater than one, word wrapping is provided.
+	///         </para>
+	///         <para>
+	///         This constructor initialize a View with a <see cref="LayoutStyle"/> of
+	///         <see cref="LayoutStyle.Absolute"/>.
+	///         Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically
+	///         control the size and location of the view, changing it to  <see cref="LayoutStyle.Computed"/>.
+	///         </para>
+	/// </remarks>
+	/// <param name="rect">Location.</param>
+	/// <param name="text">text to initialize the <see cref="Text"/> property with.</param>
+	public View (Rect rect, string text) => SetInitialProperties (text, rect, LayoutStyle.Absolute);
+
+
+	/// <summary>
+	/// Initializes a new instance of a <see cref="View"/> class with using the given text and text styling information.
+	/// </summary>
+	/// <remarks>
+	///         <para>
+	///         If <see cref="Height"/> is greater than one, word wrapping is provided.
+	///         </para>
+	///         <para>
+	///         The <see cref="View"/> will be created at the given
+	///         coordinates with the given string. The size (<see cref="View.Frame"/>) will be
+	///         adjusted to fit the contents of <see cref="Text"/>, including newlines ('\n') for multiple lines.
+	///         </para>
+	///         <para>
+	///         Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically
+	///         control the size and location of the view.
+	///         </para>
+	///         <para>
+	///         If <see cref="Height"/> is greater than one, word wrapping is provided.
+	///         </para>
+	///         <para>
+	///         This constructor initialize a View with a <see cref="LayoutStyle"/> of
+	///         <see cref="LayoutStyle.Absolute"/>.
+	///         Use <see cref="X"/>, <see cref="Y"/>, <see cref="Width"/>, and <see cref="Height"/> properties to dynamically
+	///         control the size and location of the view, changing it to  <see cref="LayoutStyle.Computed"/>.
+	///         </para>
+	/// </remarks>
+	/// <param name="text">text to initialize the <see cref="Text"/> property with.</param>
+	/// <param name="direction">The text direction.</param>
+	public View (string text, TextDirection direction = TextDirection.LeftRight_TopBottom) => SetInitialProperties (text, Rect.Empty, LayoutStyle.Computed, direction);
+
+	// TODO: v2 - Remove constructors with parameters
+
+
+	/// <summary>
+	/// Private helper to set the initial properties of the View that were provided via constructors.
+	/// </summary>
+	/// <param name="text"></param>
+	/// <param name="rect"></param>
+	/// <param name="layoutStyle"></param>
+	/// <param name="direction"></param>
+	void SetInitialProperties (string text,
+				   Rect rect,
+				   LayoutStyle layoutStyle = LayoutStyle.Computed,
+				   TextDirection direction = TextDirection.LeftRight_TopBottom)
+	{
+		TextFormatter = new TextFormatter ();
+		TextFormatter.HotKeyChanged += TextFormatter_HotKeyChanged;
+		TextDirection = direction;
+
+		CanFocus = false;
+		TabIndex = -1;
+		TabStop = false;
+
+		Text = text == null ? string.Empty : text;
+		Frame = rect.IsEmpty ? TextFormatter.CalcRect (0, 0, text, direction) : rect;
+
+		AddCommands ();
+
+		CreateFrames ();
+	}
+
+	/// <summary>
+	/// Get or sets if  the <see cref="View"/> has been initialized (via <see cref="ISupportInitialize.BeginInit"/>
+	/// and <see cref="ISupportInitialize.EndInit"/>).
+	/// </summary>
+	/// <para>
+	/// If first-run-only initialization is preferred, overrides to <see cref="ISupportInitializeNotification.IsInitialized"/>
+	/// can be implemented, in which case the <see cref="ISupportInitialize"/>
+	/// methods will only be called if <see cref="ISupportInitializeNotification.IsInitialized"/>
+	/// is <see langword="false"/>. This allows proper <see cref="View"/> inheritance hierarchies
+	/// to override base class layout code optimally by doing so only on first run,
+	/// instead of on every run.
+	/// </para>
+	public virtual bool IsInitialized { get; set; }
+
+	/// <summary>
+	/// Signals the View that initialization is starting. See <see cref="ISupportInitialize"/>.
+	/// </summary>
+	/// <remarks>
+	///         <para>
+	///         Views can opt-in to more sophisticated initialization
+	///         by implementing overrides to <see cref="ISupportInitialize.BeginInit"/> and
+	///         <see cref="ISupportInitialize.EndInit"/> which will be called
+	///         when the view is added to a <see cref="SuperView"/>.
+	///         </para>
+	///         <para>
+	///         If first-run-only initialization is preferred, overrides to <see cref="ISupportInitializeNotification"/>
+	///         can be implemented too, in which case the <see cref="ISupportInitialize"/>
+	///         methods will only be called if <see cref="ISupportInitializeNotification.IsInitialized"/>
+	///         is <see langword="false"/>. This allows proper <see cref="View"/> inheritance hierarchies
+	///         to override base class layout code optimally by doing so only on first run,
+	///         instead of on every run.
+	///         </para>
+	/// </remarks>
+	public virtual void BeginInit ()
+	{
+		if (!IsInitialized) {
+			_oldCanFocus = CanFocus;
+			_oldTabIndex = _tabIndex;
+
+
+			// TODO: Figure out why ScrollView and other tests fail if this call is put here 
+			// instead of the constructor.
+			//InitializeFrames ();
+
+		}
+
+		//throw new InvalidOperationException ("The view is already initialized.");
+		if (_subviews?.Count > 0) {
+			foreach (var view in _subviews) {
+				if (!view.IsInitialized) {
+					view.BeginInit ();
+				}
+			}
+		}
+	}
+
+	/// <summary>
+	/// Signals the View that initialization is ending. See <see cref="ISupportInitialize"/>.
+	/// </summary>
+	public void EndInit ()
+	{
+		IsInitialized = true;
+		// These calls were moved from BeginInit as they access Bounds which is indeterminate until EndInit is called.
+		UpdateTextDirection (TextDirection);
+		UpdateTextFormatterText ();
+		SetHotKey ();
+
+		OnResizeNeeded ();
+		if (_subviews != null) {
+			foreach (var view in _subviews) {
+				if (!view.IsInitialized) {
+					view.EndInit ();
+				}
+			}
+		}
+		Initialized?.Invoke (this, EventArgs.Empty);
+	}
+	#endregion Constructors and Initialization
 }

Terminal.Gui/View/ViewDrawing.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
@@ -8,9 +7,12 @@ namespace Terminal.Gui;
 public partial class View {
 	ColorScheme _colorScheme;
 
+	// The view-relative region that needs to be redrawn. Marked internal for unit tests.
+	internal Rect _needsDisplayRect = Rect.Empty;
+
 	/// <summary>
 	/// The color scheme for this view, if it is not defined, it returns the <see cref="SuperView"/>'s
-	/// color scheme. 
+	/// color scheme.
 	/// </summary>
 	public virtual ColorScheme ColorScheme {
 		get {
@@ -27,12 +29,47 @@ public partial class View {
 		}
 	}
 
+	/// <summary>
+	/// Gets or sets whether the view needs to be redrawn.
+	/// </summary>
+	public bool NeedsDisplay {
+		get => _needsDisplayRect != Rect.Empty;
+		set {
+			if (value) {
+				SetNeedsDisplay ();
+			} else {
+				ClearNeedsDisplay ();
+			}
+		}
+	}
+
+	/// <summary>
+	/// Gets whether any Subviews need to be redrawn.
+	/// </summary>
+	public bool SubViewNeedsDisplay { get; private set; }
+
+	/// <summary>
+	/// The canvas that any line drawing that is to be shared by subviews of this view should add lines to.
+	/// </summary>
+	/// <remarks><see cref="Border"/> adds border lines to this LineCanvas.</remarks>
+	public LineCanvas LineCanvas { get; } = new ();
+
+	/// <summary>
+	/// Gets or sets whether this View will use it's SuperView's <see cref="LineCanvas"/> for
+	/// rendering any border lines. If <see langword="true"/> the rendering of any borders drawn
+	/// by this Frame will be done by it's parent's SuperView. If <see langword="false"/> (the default)
+	/// this View's <see cref="OnDrawFrames()"/> method will be called to render the borders.
+	/// </summary>
+	public virtual bool SuperViewRendersLineCanvas { get; set; } = false;
+
 	/// <summary>
 	/// Determines the current <see cref="ColorScheme"/> based on the <see cref="Enabled"/> value.
 	/// </summary>
-	/// <returns><see cref="Terminal.Gui.ColorScheme.Normal"/> if <see cref="Enabled"/> is <see langword="true"/>
+	/// <returns>
+	/// <see cref="Terminal.Gui.ColorScheme.Normal"/> if <see cref="Enabled"/> is <see langword="true"/>
 	/// or <see cref="Terminal.Gui.ColorScheme.Disabled"/> if <see cref="Enabled"/> is <see langword="false"/>.
-	/// If it's overridden can return other values.</returns>
+	/// If it's overridden can return other values.
+	/// </returns>
 	public virtual Attribute GetNormalColor ()
 	{
 		var cs = ColorScheme;
@@ -45,17 +82,21 @@ public partial class View {
 	/// <summary>
 	/// Determines the current <see cref="ColorScheme"/> based on the <see cref="Enabled"/> value.
 	/// </summary>
-	/// <returns><see cref="Terminal.Gui.ColorScheme.Focus"/> if <see cref="Enabled"/> is <see langword="true"/>
+	/// <returns>
+	/// <see cref="Terminal.Gui.ColorScheme.Focus"/> if <see cref="Enabled"/> is <see langword="true"/>
 	/// or <see cref="Terminal.Gui.ColorScheme.Disabled"/> if <see cref="Enabled"/> is <see langword="false"/>.
-	/// If it's overridden can return other values.</returns>
+	/// If it's overridden can return other values.
+	/// </returns>
 	public virtual Attribute GetFocusColor () => Enabled ? ColorScheme.Focus : ColorScheme.Disabled;
 
 	/// <summary>
 	/// Determines the current <see cref="ColorScheme"/> based on the <see cref="Enabled"/> value.
 	/// </summary>
-	/// <returns><see cref="Terminal.Gui.ColorScheme.HotNormal"/> if <see cref="Enabled"/> is <see langword="true"/>
+	/// <returns>
+	/// <see cref="Terminal.Gui.ColorScheme.HotNormal"/> if <see cref="Enabled"/> is <see langword="true"/>
 	/// or <see cref="Terminal.Gui.ColorScheme.Disabled"/> if <see cref="Enabled"/> is <see langword="false"/>.
-	/// If it's overridden can return other values.</returns>
+	/// If it's overridden can return other values.
+	/// </returns>
 	public virtual Attribute GetHotNormalColor () => Enabled ? ColorScheme.HotNormal : ColorScheme.Disabled;
 
 	/// <summary>
@@ -82,24 +123,7 @@ public partial class View {
 	protected void ClearNeedsDisplay ()
 	{
 		_needsDisplayRect = Rect.Empty;
-		_subViewNeedsDisplay = false;
-	}
-
-	// The view-relative region that needs to be redrawn. Marked internal for unit tests.
-	internal Rect _needsDisplayRect = Rect.Empty;
-
-	/// <summary>
-	/// Gets or sets whether the view needs to be redrawn.
-	/// </summary>
-	public bool NeedsDisplay {
-		get => _needsDisplayRect != Rect.Empty;
-		set {
-			if (value) {
-				SetNeedsDisplay ();
-			} else {
-				ClearNeedsDisplay ();
-			}
-		}
+		SubViewNeedsDisplay = false;
 	}
 
 	/// <summary>
@@ -133,18 +157,18 @@ public partial class View {
 		if (_needsDisplayRect.IsEmpty) {
 			_needsDisplayRect = region;
 		} else {
-			int x = Math.Min (_needsDisplayRect.X, region.X);
-			int y = Math.Min (_needsDisplayRect.Y, region.Y);
-			int w = Math.Max (_needsDisplayRect.Width, region.Width);
-			int h = Math.Max (_needsDisplayRect.Height, region.Height);
+			var x = Math.Min (_needsDisplayRect.X, region.X);
+			var y = Math.Min (_needsDisplayRect.Y, region.Y);
+			var w = Math.Max (_needsDisplayRect.Width, region.Width);
+			var h = Math.Max (_needsDisplayRect.Height, region.Height);
 			_needsDisplayRect = new Rect (x, y, w, h);
 		}
 		_superView?.SetSubViewNeedsDisplay ();
 
 		if (_needsDisplayRect.X < Bounds.X ||
-		_needsDisplayRect.Y < Bounds.Y ||
-		_needsDisplayRect.Width > Bounds.Width ||
-		_needsDisplayRect.Height > Bounds.Height) {
+		    _needsDisplayRect.Y < Bounds.Y ||
+		    _needsDisplayRect.Width > Bounds.Width ||
+		    _needsDisplayRect.Height > Bounds.Height) {
 			Margin?.SetNeedsDisplay (Margin.Bounds);
 			Border?.SetNeedsDisplay (Border.Bounds);
 			Padding?.SetNeedsDisplay (Padding.Bounds);
@@ -164,31 +188,24 @@ public partial class View {
 		}
 	}
 
-	/// <summary>
-	/// Gets whether any Subviews need to be redrawn.
-	/// </summary>
-	public bool SubViewNeedsDisplay => _subViewNeedsDisplay;
-
-	bool _subViewNeedsDisplay;
-
 	/// <summary>
 	/// Indicates that any Subviews (in the <see cref="Subviews"/> list) need to be repainted.
 	/// </summary>
 	public void SetSubViewNeedsDisplay ()
 	{
-		_subViewNeedsDisplay = true;
-		if (_superView != null && !_superView._subViewNeedsDisplay) {
+		SubViewNeedsDisplay = true;
+		if (_superView != null && !_superView.SubViewNeedsDisplay) {
 			_superView.SetSubViewNeedsDisplay ();
 		}
 	}
 
 	/// <summary>
-	///   Clears the <see cref="Bounds"/> with the normal background color.
+	/// Clears the <see cref="Bounds"/> with the normal background color.
 	/// </summary>
 	/// <remarks>
-	///   <para>
-	///     This clears the Bounds used by this view.
-	///   </para>
+	///         <para>
+	///         This clears the Bounds used by this view.
+	///         </para>
 	/// </remarks>
 	public void Clear ()
 	{
@@ -202,7 +219,7 @@ public partial class View {
 	// "View APIs only deal with View-relative coords". This is only used by ComboBox which can
 	// be refactored to use the View-relative version.
 	/// <summary>
-	///   Clears the specified screen-relative rectangle with the normal background. 
+	/// Clears the specified screen-relative rectangle with the normal background.
 	/// </summary>
 	/// <remarks>
 	/// </remarks>
@@ -220,10 +237,10 @@ public partial class View {
 	// Clips a rectangle in screen coordinates to the dimensions currently available on the screen
 	internal Rect ScreenClip (Rect regionScreen)
 	{
-		int x = regionScreen.X < 0 ? 0 : regionScreen.X;
-		int y = regionScreen.Y < 0 ? 0 : regionScreen.Y;
-		int w = regionScreen.X + regionScreen.Width >= Driver.Cols ? Driver.Cols - regionScreen.X : regionScreen.Width;
-		int h = regionScreen.Y + regionScreen.Height >= Driver.Rows ? Driver.Rows - regionScreen.Y : regionScreen.Height;
+		var x = regionScreen.X < 0 ? 0 : regionScreen.X;
+		var y = regionScreen.Y < 0 ? 0 : regionScreen.Y;
+		var w = regionScreen.X + regionScreen.Width >= Driver.Cols ? Driver.Cols - regionScreen.X : regionScreen.Width;
+		var h = regionScreen.Y + regionScreen.Height >= Driver.Rows ? Driver.Rows - regionScreen.Y : regionScreen.Height;
 
 		return new Rect (x, y, w, h);
 	}
@@ -231,11 +248,15 @@ public partial class View {
 	/// <summary>
 	/// Expands the <see cref="ConsoleDriver"/>'s clip region to include <see cref="Bounds"/>.
 	/// </summary>
-	/// <returns>The current screen-relative clip region, which can be then re-applied by setting <see cref="ConsoleDriver.Clip"/>.</returns>
+	/// <returns>
+	/// The current screen-relative clip region, which can be then re-applied by setting
+	/// <see cref="ConsoleDriver.Clip"/>.
+	/// </returns>
 	/// <remarks>
-	/// <para>
-	/// If <see cref="ConsoleDriver.Clip"/> and <see cref="Bounds"/> do not intersect, the clip region will be set to <see cref="Rect.Empty"/>.
-	/// </para>
+	///         <para>
+	///         If <see cref="ConsoleDriver.Clip"/> and <see cref="Bounds"/> do not intersect, the clip region will be set to
+	///         <see cref="Rect.Empty"/>.
+	///         </para>
 	/// </remarks>
 	public Rect ClipToBounds ()
 	{
@@ -251,14 +272,17 @@ public partial class View {
 	/// <param name="hotColor">Hot color.</param>
 	/// <param name="normalColor">Normal color.</param>
 	/// <remarks>
-	/// <para>The hotkey is any character following the hotkey specifier, which is the underscore ('_') character by default.</para>
-	/// <para>The hotkey specifier can be changed via <see cref="HotKeySpecifier"/></para>
+	///         <para>
+	///         The hotkey is any character following the hotkey specifier, which is the underscore ('_') character by
+	///         default.
+	///         </para>
+	///         <para>The hotkey specifier can be changed via <see cref="HotKeySpecifier"/></para>
 	/// </remarks>
 	public void DrawHotString (string text, Attribute hotColor, Attribute normalColor)
 	{
 		var hotkeySpec = HotKeySpecifier == (Rune)0xffff ? (Rune)'_' : HotKeySpecifier;
 		Application.Driver.SetAttribute (normalColor);
-		foreach (char rune in text) {
+		foreach (var rune in text) {
 			if (rune == hotkeySpec.Value) {
 				Application.Driver.SetAttribute (hotColor);
 				continue;
@@ -272,7 +296,10 @@ public partial class View {
 	/// Utility function to draw strings that contains a hotkey using a <see cref="ColorScheme"/> and the "focused" state.
 	/// </summary>
 	/// <param name="text">String to display, the underscore before a letter flags the next letter as the hotkey.</param>
-	/// <param name="focused">If set to <see langword="true"/> this uses the focused colors from the color scheme, otherwise the regular ones.</param>
+	/// <param name="focused">
+	/// If set to <see langword="true"/> this uses the focused colors from the color scheme, otherwise
+	/// the regular ones.
+	/// </param>
 	/// <param name="scheme">The color scheme to use.</param>
 	public void DrawHotString (string text, bool focused, ColorScheme scheme)
 	{
@@ -295,28 +322,15 @@ public partial class View {
 			return;
 		}
 
-		BoundsToScreen (col, row, out int rCol, out int rRow, false);
+		BoundsToScreen (col, row, out var rCol, out var rRow, false);
 		Driver?.Move (rCol, rRow);
 	}
 
-	/// <summary>
-	/// The canvas that any line drawing that is to be shared by subviews of this view should add lines to.
-	/// </summary>
-	/// <remarks><see cref="Border"/> adds border lines to this LineCanvas.</remarks>
-	public LineCanvas LineCanvas { get; } = new ();
-
-	/// <summary>
-	/// Gets or sets whether this View will use it's SuperView's <see cref="LineCanvas"/> for
-	/// rendering any border lines. If <see langword="true"/> the rendering of any borders drawn
-	/// by this Frame will be done by it's parent's SuperView. If <see langword="false"/> (the default)
-	/// this View's <see cref="OnDrawFrames()"/> method will be called to render the borders.
-	/// </summary>
-	public virtual bool SuperViewRendersLineCanvas { get; set; } = false;
-
 	// TODO: Make this cancelable
 	/// <summary>
-	/// Prepares <see cref="View.LineCanvas"/>. If <see cref="SuperViewRendersLineCanvas"/> is true, only the <see cref="LineCanvas"/> of 
-	/// this view's subviews will be rendered. If <see cref="SuperViewRendersLineCanvas"/> is false (the default), this 
+	/// Prepares <see cref="View.LineCanvas"/>. If <see cref="SuperViewRendersLineCanvas"/> is true, only the
+	/// <see cref="LineCanvas"/> of
+	/// this view's subviews will be rendered. If <see cref="SuperViewRendersLineCanvas"/> is false (the default), this
 	/// method will cause the <see cref="LineCanvas"/> be prepared to be rendered.
 	/// </summary>
 	/// <returns></returns>
@@ -336,21 +350,22 @@ public partial class View {
 	}
 
 	/// <summary>
-	/// Draws the view. Causes the following virtual methods to be called (along with their related events): 
+	/// Draws the view. Causes the following virtual methods to be called (along with their related events):
 	/// <see cref="OnDrawContent"/>, <see cref="OnDrawContentComplete"/>.
 	/// </summary>
 	/// <remarks>
-	/// <para>
-	///    Always use <see cref="Bounds"/> (view-relative) when calling <see cref="OnDrawContent(Rect)"/>, NOT <see cref="Frame"/> (superview-relative).
-	/// </para>
-	/// <para>
-	///    Views should set the color that they want to use on entry, as otherwise this will inherit
-	///    the last color that was set globally on the driver.
-	/// </para>
-	/// <para>
-	///    Overrides of <see cref="OnDrawContent(Rect)"/> must ensure they do not set <c>Driver.Clip</c> to a clip region
-	///    larger than the <ref name="Bounds"/> property, as this will cause the driver to clip the entire region.
-	/// </para>
+	///         <para>
+	///         Always use <see cref="Bounds"/> (view-relative) when calling <see cref="OnDrawContent(Rect)"/>, NOT
+	///         <see cref="Frame"/> (superview-relative).
+	///         </para>
+	///         <para>
+	///         Views should set the color that they want to use on entry, as otherwise this will inherit
+	///         the last color that was set globally on the driver.
+	///         </para>
+	///         <para>
+	///         Overrides of <see cref="OnDrawContent(Rect)"/> must ensure they do not set <c>Driver.Clip</c> to a clip region
+	///         larger than the <ref name="Bounds"/> property, as this will cause the driver to clip the entire region.
+	///         </para>
 	/// </remarks>
 	public void Draw ()
 	{
@@ -387,8 +402,9 @@ public partial class View {
 
 	// TODO: Make this cancelable
 	/// <summary>
-	/// Renders <see cref="View.LineCanvas"/>. If <see cref="SuperViewRendersLineCanvas"/> is true, only the <see cref="LineCanvas"/> of 
-	/// this view's subviews will be rendered. If <see cref="SuperViewRendersLineCanvas"/> is false (the default), this 
+	/// Renders <see cref="View.LineCanvas"/>. If <see cref="SuperViewRendersLineCanvas"/> is true, only the
+	/// <see cref="LineCanvas"/> of
+	/// this view's subviews will be rendered. If <see cref="SuperViewRendersLineCanvas"/> is false (the default), this
 	/// method will cause the <see cref="LineCanvas"/> to be rendered.
 	/// </summary>
 	/// <returns></returns>
@@ -411,7 +427,7 @@ public partial class View {
 		}
 
 		if (Subviews.Any (s => s.SuperViewRendersLineCanvas)) {
-			foreach (var subview in Subviews.Where (s => s.SuperViewRendersLineCanvas == true)) {
+			foreach (var subview in Subviews.Where (s => s.SuperViewRendersLineCanvas)) {
 				// Combine the LineCanvas'
 				LineCanvas.Merge (subview.LineCanvas);
 				subview.LineCanvas.Clear ();
@@ -434,21 +450,25 @@ public partial class View {
 	/// Event invoked when the content area of the View is to be drawn.
 	/// </summary>
 	/// <remarks>
-	/// <para>
-	/// Will be invoked before any subviews added with <see cref="Add(View)"/> have been drawn.
-	/// </para>
-	/// <para>
-	/// Rect provides the view-relative rectangle describing the currently visible viewport into the <see cref="View"/>.
-	/// </para>
+	///         <para>
+	///         Will be invoked before any subviews added with <see cref="Add(View)"/> have been drawn.
+	///         </para>
+	///         <para>
+	///         Rect provides the view-relative rectangle describing the currently visible viewport into the <see cref="View"/>
+	///         .
+	///         </para>
 	/// </remarks>
 	public event EventHandler<DrawEventArgs> DrawContent;
 
 	/// <summary>
-	/// Enables overrides to draw infinitely scrolled content and/or a background behind added controls. 
+	/// Enables overrides to draw infinitely scrolled content and/or a background behind added controls.
 	/// </summary>
-	/// <param name="contentArea">The view-relative rectangle describing the currently visible viewport into the <see cref="View"/></param>
+	/// <param name="contentArea">
+	/// The view-relative rectangle describing the currently visible viewport into the
+	/// <see cref="View"/>
+	/// </param>
 	/// <remarks>
-	/// This method will be called before any subviews added with <see cref="Add(View)"/> have been drawn. 
+	/// This method will be called before any subviews added with <see cref="Add(View)"/> have been drawn.
 	/// </remarks>
 	public virtual void OnDrawContent (Rect contentArea)
 	{
@@ -475,8 +495,8 @@ public partial class View {
 			var subviewsNeedingDraw = _subviews.Where (
 				view => view.Visible &&
 					(view.NeedsDisplay ||
-					view.SubViewNeedsDisplay ||
-					view.LayoutNeeded)
+					 view.SubViewNeedsDisplay ||
+					 view.LayoutNeeded)
 			);
 
 			foreach (var view in subviewsNeedingDraw) {
@@ -499,19 +519,23 @@ public partial class View {
 	/// Event invoked when the content area of the View is completed drawing.
 	/// </summary>
 	/// <remarks>
-	/// <para>
-	/// Will be invoked after any subviews removed with <see cref="Remove(View)"/> have been completed drawing.
-	/// </para>
-	/// <para>
-	/// Rect provides the view-relative rectangle describing the currently visible viewport into the <see cref="View"/>.
-	/// </para>
+	///         <para>
+	///         Will be invoked after any subviews removed with <see cref="Remove(View)"/> have been completed drawing.
+	///         </para>
+	///         <para>
+	///         Rect provides the view-relative rectangle describing the currently visible viewport into the <see cref="View"/>
+	///         .
+	///         </para>
 	/// </remarks>
 	public event EventHandler<DrawEventArgs> DrawContentComplete;
 
 	/// <summary>
 	/// Enables overrides after completed drawing infinitely scrolled content and/or a background behind removed controls.
 	/// </summary>
-	/// <param name="contentArea">The view-relative rectangle describing the currently visible viewport into the <see cref="View"/></param>
+	/// <param name="contentArea">
+	/// The view-relative rectangle describing the currently visible viewport into the
+	/// <see cref="View"/>
+	/// </param>
 	/// <remarks>
 	/// This method will be called after any subviews removed with <see cref="Remove(View)"/> have been completed drawing.
 	/// </remarks>

Terminal.Gui/View/ViewSubViews.cs

@@ -1,729 +1,725 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-
-namespace Terminal.Gui {
-	public partial class View {
-		static readonly IList<View> _empty = new List<View> (0).AsReadOnly ();
-
-		View _superView = null;
-
-		/// <summary>
-		/// Returns the container for this view, or null if this view has not been added to a container.
-		/// </summary>
-		/// <value>The super view.</value>
-		public virtual View SuperView {
-			get {
-				return _superView;
-			}
-			set {
-				throw new NotImplementedException ();
-			}
-		}
 
-		List<View> _subviews; // This is null, and allocated on demand.
-		/// <summary>
-		/// This returns a list of the subviews contained by this view.
-		/// </summary>
-		/// <value>The subviews.</value>
-		public IList<View> Subviews => _subviews?.AsReadOnly () ?? _empty;
-
-		// Internally, we use InternalSubviews rather than subviews, as we do not expect us
-		// to make the same mistakes our users make when they poke at the Subviews.
-		internal IList<View> InternalSubviews => _subviews ?? _empty;
-
-		/// <summary>
-		/// Returns a value indicating if this View is currently on Top (Active)
-		/// </summary>
-		public bool IsCurrentTop => Application.Current == this;
-
-		/// <summary>
-		/// Event fired when this view is added to another.
-		/// </summary>
-		public event EventHandler<SuperViewChangedEventArgs> Added;
-
-		internal bool _addingView;
-
-		/// <summary>
-		///   Adds a subview (child) to this view.
-		/// </summary>
-		/// <remarks>
-		/// The Views that have been added to this view can be retrieved via the <see cref="Subviews"/> property. 
-		/// See also <seealso cref="Remove(View)"/> <seealso cref="RemoveAll"/> 
-		/// </remarks>
-		public virtual void Add (View view)
-		{
-			if (view == null) {
-				return;
-			}
-			if (_subviews == null) {
-				_subviews = new List<View> ();
-			}
-			if (_tabIndexes == null) {
-				_tabIndexes = new List<View> ();
-			}
-			_subviews.Add (view);
-			_tabIndexes.Add (view);
-			view._superView = this;
-			if (view.CanFocus) {
-				_addingView = true;
-				if (SuperView?.CanFocus == false) {
-					SuperView._addingView = true;
-					SuperView.CanFocus = true;
-					SuperView._addingView = false;
-				}
-				CanFocus = true;
-				view._tabIndex = _tabIndexes.IndexOf (view);
-				_addingView = false;
-			}
-			if (view.Enabled && !Enabled) {
-				view._oldEnabled = true;
-				view.Enabled = false;
-			}
+namespace Terminal.Gui;
 
-			OnAdded (new SuperViewChangedEventArgs (this, view));
-			if (IsInitialized && !view.IsInitialized) {
-				view.BeginInit ();
-				view.EndInit ();
-			}
+public partial class View {
+	static readonly IList<View> _empty = new List<View> (0).AsReadOnly ();
 
-			SetNeedsLayout ();
-			SetNeedsDisplay ();
+	internal bool _addingView;
+
+	List<View> _subviews; // This is null, and allocated on demand.
+
+	View _superView;
+
+	/// <summary>
+	/// Returns the container for this view, or null if this view has not been added to a container.
+	/// </summary>
+	/// <value>The super view.</value>
+	public virtual View SuperView {
+		get => _superView;
+		set => throw new NotImplementedException ();
+	}
+
+	/// <summary>
+	/// This returns a list of the subviews contained by this view.
+	/// </summary>
+	/// <value>The subviews.</value>
+	public IList<View> Subviews => _subviews?.AsReadOnly () ?? _empty;
+
+	// Internally, we use InternalSubviews rather than subviews, as we do not expect us
+	// to make the same mistakes our users make when they poke at the Subviews.
+	internal IList<View> InternalSubviews => _subviews ?? _empty;
+
+	/// <summary>
+	/// Returns a value indicating if this View is currently on Top (Active)
+	/// </summary>
+	public bool IsCurrentTop => Application.Current == this;
+
+	/// <summary>
+	/// Indicates whether the view was added to <see cref="SuperView"/>.
+	/// </summary>
+	public bool IsAdded { get; private set; }
+
+	/// <summary>
+	/// Event fired when this view is added to another.
+	/// </summary>
+	public event EventHandler<SuperViewChangedEventArgs> Added;
+
+	/// <summary>
+	/// Adds a subview (child) to this view.
+	/// </summary>
+	/// <remarks>
+	/// The Views that have been added to this view can be retrieved via the <see cref="Subviews"/> property.
+	/// See also <seealso cref="Remove(View)"/> <seealso cref="RemoveAll"/>
+	/// </remarks>
+	public virtual void Add (View view)
+	{
+		if (view == null) {
+			return;
+		}
+		if (_subviews == null) {
+			_subviews = new List<View> ();
+		}
+		if (_tabIndexes == null) {
+			_tabIndexes = new List<View> ();
+		}
+		_subviews.Add (view);
+		_tabIndexes.Add (view);
+		view._superView = this;
+		if (view.CanFocus) {
+			_addingView = true;
+			if (SuperView?.CanFocus == false) {
+				SuperView._addingView = true;
+				SuperView.CanFocus = true;
+				SuperView._addingView = false;
+			}
+			CanFocus = true;
+			view._tabIndex = _tabIndexes.IndexOf (view);
+			_addingView = false;
+		}
+		if (view.Enabled && !Enabled) {
+			view._oldEnabled = true;
+			view.Enabled = false;
 		}
 
-		/// <summary>
-		/// Adds the specified views (children) to the view.
-		/// </summary>
-		/// <param name="views">Array of one or more views (can be optional parameter).</param>
-		/// <remarks>
-		/// The Views that have been added to this view can be retrieved via the <see cref="Subviews"/> property. 
-		/// See also <seealso cref="Remove(View)"/> <seealso cref="RemoveAll"/> 
-		/// </remarks>
-		public void Add (params View [] views)
-		{
-			if (views == null) {
-				return;
-			}
-			foreach (var view in views) {
-				Add (view);
-			}
+		OnAdded (new SuperViewChangedEventArgs (this, view));
+		if (IsInitialized && !view.IsInitialized) {
+			view.BeginInit ();
+			view.EndInit ();
 		}
 
-		/// <summary>
-		/// Method invoked when a subview is being added to this view.
-		/// </summary>
-		/// <param name="e">Event where <see cref="ViewEventArgs.View"/> is the subview being added.</param>
-		public virtual void OnAdded (SuperViewChangedEventArgs e)
-		{
-			var view = e.Child;
-			view.IsAdded = true;
-			view.OnResizeNeeded ();
-			view._x ??= view._frame.X;
-			view._y ??= view._frame.Y;
-			view._width ??= view._frame.Width;
-			view._height ??= view._frame.Height;
-
-			view.Added?.Invoke (this, e);
-		}
-
-		/// <summary>
-		/// Indicates whether the view was added to <see cref="SuperView"/>.
-		/// </summary>
-		public bool IsAdded { get; private set; }
-
-		/// <summary>
-		/// Event fired when this view is removed from another.
-		/// </summary>
-		public event EventHandler<SuperViewChangedEventArgs> Removed;
-
-		/// <summary>
-		///   Removes all subviews (children) added via <see cref="Add(View)"/> or <see cref="Add(View[])"/> from this View.
-		/// </summary>
-		public virtual void RemoveAll ()
-		{
-			if (_subviews == null) {
-				return;
-			}
+		SetNeedsLayout ();
+		SetNeedsDisplay ();
+	}
 
-			while (_subviews.Count > 0) {
-				Remove (_subviews [0]);
-			}
+	/// <summary>
+	/// Adds the specified views (children) to the view.
+	/// </summary>
+	/// <param name="views">Array of one or more views (can be optional parameter).</param>
+	/// <remarks>
+	/// The Views that have been added to this view can be retrieved via the <see cref="Subviews"/> property.
+	/// See also <seealso cref="Remove(View)"/> <seealso cref="RemoveAll"/>
+	/// </remarks>
+	public void Add (params View [] views)
+	{
+		if (views == null) {
+			return;
+		}
+		foreach (var view in views) {
+			Add (view);
 		}
+	}
 
-		/// <summary>
-		///   Removes a subview added via <see cref="Add(View)"/> or <see cref="Add(View[])"/> from this View.
-		/// </summary>
-		/// <remarks>
-		/// </remarks>
-		public virtual void Remove (View view)
-		{
-			if (view == null || _subviews == null) return;
-
-			var touched = view.Frame;
-			_subviews.Remove (view);
-			_tabIndexes.Remove (view);
-			view._superView = null;
-			view._tabIndex = -1;
-			SetNeedsLayout ();
-			SetNeedsDisplay ();
+	/// <summary>
+	/// Method invoked when a subview is being added to this view.
+	/// </summary>
+	/// <param name="e">Event where <see cref="ViewEventArgs.View"/> is the subview being added.</param>
+	public virtual void OnAdded (SuperViewChangedEventArgs e)
+	{
+		var view = e.Child;
+		view.IsAdded = true;
+		view.OnResizeNeeded ();
+		view.Added?.Invoke (this, e);
+	}
 
-			foreach (var v in _subviews) {
-				if (v.Frame.IntersectsWith (touched))
-					view.SetNeedsDisplay ();
-			}
-			OnRemoved (new SuperViewChangedEventArgs (this, view));
-			if (_focused == view) {
-				_focused = null;
-			}
+	/// <summary>
+	/// Event fired when this view is removed from another.
+	/// </summary>
+	public event EventHandler<SuperViewChangedEventArgs> Removed;
+
+	/// <summary>
+	/// Removes all subviews (children) added via <see cref="Add(View)"/> or <see cref="Add(View[])"/> from this View.
+	/// </summary>
+	public virtual void RemoveAll ()
+	{
+		if (_subviews == null) {
+			return;
 		}
 
-		/// <summary>
-		/// Method invoked when a subview is being removed from this view.
-		/// </summary>
-		/// <param name="e">Event args describing the subview being removed.</param>
-		public virtual void OnRemoved (SuperViewChangedEventArgs e)
-		{
-			var view = e.Child;
-			view.IsAdded = false;
-			view.Removed?.Invoke (this, e);
+		while (_subviews.Count > 0) {
+			Remove (_subviews [0]);
 		}
+	}
 
+	/// <summary>
+	/// Removes a subview added via <see cref="Add(View)"/> or <see cref="Add(View[])"/> from this View.
+	/// </summary>
+	/// <remarks>
+	/// </remarks>
+	public virtual void Remove (View view)
+	{
+		if (view == null || _subviews == null) {
+			return;
+		}
 
-		void PerformActionForSubview (View subview, Action<View> action)
-		{
-			if (_subviews.Contains (subview)) {
-				action (subview);
-			}
+		var touched = view.Frame;
+		_subviews.Remove (view);
+		_tabIndexes.Remove (view);
+		view._superView = null;
+		view._tabIndex = -1;
+		SetNeedsLayout ();
+		SetNeedsDisplay ();
 
-			SetNeedsDisplay ();
-			subview.SetNeedsDisplay ();
-		}
-
-		/// <summary>
-		/// Brings the specified subview to the front so it is drawn on top of any other views.
-		/// </summary>
-		/// <param name="subview">The subview to send to the front</param>
-		/// <remarks>
-		///   <seealso cref="SendSubviewToBack"/>.
-		/// </remarks>
-		public void BringSubviewToFront (View subview)
-		{
-			PerformActionForSubview (subview, x => {
-				_subviews.Remove (x);
-				_subviews.Add (x);
-			});
-		}
-
-		/// <summary>
-		/// Sends the specified subview to the front so it is the first view drawn
-		/// </summary>
-		/// <param name="subview">The subview to send to the front</param>
-		/// <remarks>
-		///   <seealso cref="BringSubviewToFront(View)"/>.
-		/// </remarks>
-		public void SendSubviewToBack (View subview)
-		{
-			PerformActionForSubview (subview, x => {
-				_subviews.Remove (x);
-				_subviews.Insert (0, subview);
-			});
-		}
-
-		/// <summary>
-		/// Moves the subview backwards in the hierarchy, only one step
-		/// </summary>
-		/// <param name="subview">The subview to send backwards</param>
-		/// <remarks>
-		/// If you want to send the view all the way to the back use SendSubviewToBack.
-		/// </remarks>
-		public void SendSubviewBackwards (View subview)
-		{
-			PerformActionForSubview (subview, x => {
-				var idx = _subviews.IndexOf (x);
-				if (idx > 0) {
-					_subviews.Remove (x);
-					_subviews.Insert (idx - 1, x);
-				}
-			});
-		}
-
-		/// <summary>
-		/// Moves the subview backwards in the hierarchy, only one step
-		/// </summary>
-		/// <param name="subview">The subview to send backwards</param>
-		/// <remarks>
-		/// If you want to send the view all the way to the back use SendSubviewToBack.
-		/// </remarks>
-		public void BringSubviewForward (View subview)
-		{
-			PerformActionForSubview (subview, x => {
-				var idx = _subviews.IndexOf (x);
-				if (idx + 1 < _subviews.Count) {
-					_subviews.Remove (x);
-					_subviews.Insert (idx + 1, x);
-				}
-			});
-		}
-
-		/// <summary>
-		/// Get the top superview of a given <see cref="View"/>.
-		/// </summary>
-		/// <returns>The superview view.</returns>
-		public View GetTopSuperView (View view = null, View superview = null)
-		{
-			View top = superview ?? Application.Top;
-			for (var v = view?.SuperView ?? (this?.SuperView); v != null; v = v.SuperView) {
-				top = v;
-				if (top == superview) {
-					break;
-				}
+		foreach (var v in _subviews) {
+			if (v.Frame.IntersectsWith (touched)) {
+				view.SetNeedsDisplay ();
 			}
-
-			return top;
 		}
+		OnRemoved (new SuperViewChangedEventArgs (this, view));
+		if (Focused == view) {
+			Focused = null;
+		}
+	}
 
+	/// <summary>
+	/// Method invoked when a subview is being removed from this view.
+	/// </summary>
+	/// <param name="e">Event args describing the subview being removed.</param>
+	public virtual void OnRemoved (SuperViewChangedEventArgs e)
+	{
+		var view = e.Child;
+		view.IsAdded = false;
+		view.Removed?.Invoke (this, e);
+	}
 
 
-		#region Focus
-		View _focused = null;
+	void PerformActionForSubview (View subview, Action<View> action)
+	{
+		if (_subviews.Contains (subview)) {
+			action (subview);
+		}
 
-		internal enum Direction {
-			Forward,
-			Backward
+		SetNeedsDisplay ();
+		subview.SetNeedsDisplay ();
+	}
+
+	/// <summary>
+	/// Brings the specified subview to the front so it is drawn on top of any other views.
+	/// </summary>
+	/// <param name="subview">The subview to send to the front</param>
+	/// <remarks>
+	/// <seealso cref="SendSubviewToBack"/>.
+	/// </remarks>
+	public void BringSubviewToFront (View subview) => PerformActionForSubview (subview, x => {
+		_subviews.Remove (x);
+		_subviews.Add (x);
+	});
+
+	/// <summary>
+	/// Sends the specified subview to the front so it is the first view drawn
+	/// </summary>
+	/// <param name="subview">The subview to send to the front</param>
+	/// <remarks>
+	/// <seealso cref="BringSubviewToFront(View)"/>.
+	/// </remarks>
+	public void SendSubviewToBack (View subview) => PerformActionForSubview (subview, x => {
+		_subviews.Remove (x);
+		_subviews.Insert (0, subview);
+	});
+
+	/// <summary>
+	/// Moves the subview backwards in the hierarchy, only one step
+	/// </summary>
+	/// <param name="subview">The subview to send backwards</param>
+	/// <remarks>
+	/// If you want to send the view all the way to the back use SendSubviewToBack.
+	/// </remarks>
+	public void SendSubviewBackwards (View subview) => PerformActionForSubview (subview, x => {
+		var idx = _subviews.IndexOf (x);
+		if (idx > 0) {
+			_subviews.Remove (x);
+			_subviews.Insert (idx - 1, x);
+		}
+	});
+
+	/// <summary>
+	/// Moves the subview backwards in the hierarchy, only one step
+	/// </summary>
+	/// <param name="subview">The subview to send backwards</param>
+	/// <remarks>
+	/// If you want to send the view all the way to the back use SendSubviewToBack.
+	/// </remarks>
+	public void BringSubviewForward (View subview) => PerformActionForSubview (subview, x => {
+		var idx = _subviews.IndexOf (x);
+		if (idx + 1 < _subviews.Count) {
+			_subviews.Remove (x);
+			_subviews.Insert (idx + 1, x);
+		}
+	});
+
+	/// <summary>
+	/// Get the top superview of a given <see cref="View"/>.
+	/// </summary>
+	/// <returns>The superview view.</returns>
+	public View GetTopSuperView (View view = null, View superview = null)
+	{
+		var top = superview ?? Application.Top;
+		for (var v = view?.SuperView ?? this?.SuperView; v != null; v = v.SuperView) {
+			top = v;
+			if (top == superview) {
+				break;
+			}
 		}
 
-		/// <summary>
-		/// Event fired when the view gets focus.
-		/// </summary>
-		public event EventHandler<FocusEventArgs> Enter;
+		return top;
+	}
+
 
-		/// <summary>
-		/// Event fired when the view looses focus.
-		/// </summary>
-		public event EventHandler<FocusEventArgs> Leave;
 
-		Direction _focusDirection;
-		internal Direction FocusDirection {
-			get => SuperView?.FocusDirection ?? _focusDirection;
-			set {
-				if (SuperView != null)
-					SuperView.FocusDirection = value;
-				else
-					_focusDirection = value;
+	#region Focus
+	internal enum Direction {
+		Forward,
+		Backward
+	}
+
+	/// <summary>
+	/// Event fired when the view gets focus.
+	/// </summary>
+	public event EventHandler<FocusEventArgs> Enter;
+
+	/// <summary>
+	/// Event fired when the view looses focus.
+	/// </summary>
+	public event EventHandler<FocusEventArgs> Leave;
+
+	Direction _focusDirection;
+
+	internal Direction FocusDirection {
+		get => SuperView?.FocusDirection ?? _focusDirection;
+		set {
+			if (SuperView != null) {
+				SuperView.FocusDirection = value;
+			} else {
+				_focusDirection = value;
 			}
 		}
+	}
 
 
-		// BUGBUG: v2 - Seems weird that this is in View and not Responder.
-		bool _hasFocus;
+	// BUGBUG: v2 - Seems weird that this is in View and not Responder.
+	bool _hasFocus;
 
-		/// <inheritdoc/>
-		public override bool HasFocus => _hasFocus;
+	/// <inheritdoc/>
+	public override bool HasFocus => _hasFocus;
 
-		void SetHasFocus (bool value, View view, bool force = false)
-		{
-			if (_hasFocus != value || force) {
-				_hasFocus = value;
-				if (value) {
-					OnEnter (view);
-				} else {
-					OnLeave (view);
-				}
-				SetNeedsDisplay ();
+	void SetHasFocus (bool value, View view, bool force = false)
+	{
+		if (_hasFocus != value || force) {
+			_hasFocus = value;
+			if (value) {
+				OnEnter (view);
+			} else {
+				OnLeave (view);
 			}
+			SetNeedsDisplay ();
+		}
 
-			// Remove focus down the chain of subviews if focus is removed
-			if (!value && _focused != null) {
-				var f = _focused;
-				f.OnLeave (view);
-				f.SetHasFocus (false, view);
-				_focused = null;
-			}
+		// Remove focus down the chain of subviews if focus is removed
+		if (!value && Focused != null) {
+			var f = Focused;
+			f.OnLeave (view);
+			f.SetHasFocus (false, view);
+			Focused = null;
 		}
+	}
 
-		/// <summary>
-		/// Event fired when the <see cref="CanFocus"/> value is being changed.
-		/// </summary>
-		public event EventHandler CanFocusChanged;
+	/// <summary>
+	/// Event fired when the <see cref="CanFocus"/> value is being changed.
+	/// </summary>
+	public event EventHandler CanFocusChanged;
 
-		/// <inheritdoc/>
-		public override void OnCanFocusChanged () => CanFocusChanged?.Invoke (this, EventArgs.Empty);
+	/// <inheritdoc/>
+	public override void OnCanFocusChanged () => CanFocusChanged?.Invoke (this, EventArgs.Empty);
+
+	bool _oldCanFocus;
+
+	/// <inheritdoc/>
+	public override bool CanFocus {
+		get => base.CanFocus;
+		set {
+			if (!_addingView && IsInitialized && SuperView?.CanFocus == false && value) {
+				throw new InvalidOperationException ("Cannot set CanFocus to true if the SuperView CanFocus is false!");
+			}
+			if (base.CanFocus != value) {
+				base.CanFocus = value;
 
-		bool _oldCanFocus;
-		/// <inheritdoc/>
-		public override bool CanFocus {
-			get => base.CanFocus;
-			set {
-				if (!_addingView && IsInitialized && SuperView?.CanFocus == false && value) {
-					throw new InvalidOperationException ("Cannot set CanFocus to true if the SuperView CanFocus is false!");
+				switch (value) {
+				case false when _tabIndex > -1:
+					TabIndex = -1;
+					break;
+				case true when SuperView?.CanFocus == false && _addingView:
+					SuperView.CanFocus = true;
+					break;
 				}
-				if (base.CanFocus != value) {
-					base.CanFocus = value;
-
-					switch (value) {
-					case false when _tabIndex > -1:
-						TabIndex = -1;
-						break;
-					case true when SuperView?.CanFocus == false && _addingView:
-						SuperView.CanFocus = true;
-						break;
-					}
 
-					if (value && _tabIndex == -1) {
-						TabIndex = SuperView != null ? SuperView._tabIndexes.IndexOf (this) : -1;
-					}
-					TabStop = value;
+				if (value && _tabIndex == -1) {
+					TabIndex = SuperView != null ? SuperView._tabIndexes.IndexOf (this) : -1;
+				}
+				TabStop = value;
 
-					if (!value && SuperView?.Focused == this) {
-						SuperView._focused = null;
-					}
-					if (!value && HasFocus) {
-						SetHasFocus (false, this);
-						SuperView?.EnsureFocus ();
-						if (SuperView != null && SuperView.Focused == null) {
-							SuperView.FocusNext ();
-							if (SuperView.Focused == null && Application.Current != null) {
-								Application.Current.FocusNext ();
-							}
-							Application.BringOverlappedTopToFront ();
+				if (!value && SuperView?.Focused == this) {
+					SuperView.Focused = null;
+				}
+				if (!value && HasFocus) {
+					SetHasFocus (false, this);
+					SuperView?.EnsureFocus ();
+					if (SuperView != null && SuperView.Focused == null) {
+						SuperView.FocusNext ();
+						if (SuperView.Focused == null && Application.Current != null) {
+							Application.Current.FocusNext ();
 						}
+						Application.BringOverlappedTopToFront ();
 					}
-					if (_subviews != null && IsInitialized) {
-						foreach (var view in _subviews) {
-							if (view.CanFocus != value) {
-								if (!value) {
-									view._oldCanFocus = view.CanFocus;
-									view._oldTabIndex = view._tabIndex;
-									view.CanFocus = false;
-									view._tabIndex = -1;
-								} else {
-									if (_addingView) {
-										view._addingView = true;
-									}
-									view.CanFocus = view._oldCanFocus;
-									view._tabIndex = view._oldTabIndex;
-									view._addingView = false;
+				}
+				if (_subviews != null && IsInitialized) {
+					foreach (var view in _subviews) {
+						if (view.CanFocus != value) {
+							if (!value) {
+								view._oldCanFocus = view.CanFocus;
+								view._oldTabIndex = view._tabIndex;
+								view.CanFocus = false;
+								view._tabIndex = -1;
+							} else {
+								if (_addingView) {
+									view._addingView = true;
 								}
+								view.CanFocus = view._oldCanFocus;
+								view._tabIndex = view._oldTabIndex;
+								view._addingView = false;
 							}
 						}
 					}
-					OnCanFocusChanged ();
-					SetNeedsDisplay ();
 				}
+				OnCanFocusChanged ();
+				SetNeedsDisplay ();
 			}
 		}
+	}
 
 
-		/// <inheritdoc/>
-		public override bool OnEnter (View view)
-		{
-			var args = new FocusEventArgs (view);
-			Enter?.Invoke (this, args);
-			if (args.Handled) {
-				return true;
-			}
-			if (base.OnEnter (view)) {
-				return true;
-			}
+	/// <inheritdoc/>
+	public override bool OnEnter (View view)
+	{
+		var args = new FocusEventArgs (view);
+		Enter?.Invoke (this, args);
+		if (args.Handled) {
+			return true;
+		}
+		if (base.OnEnter (view)) {
+			return true;
+		}
 
-			return false;
+		return false;
+	}
+
+	/// <inheritdoc/>
+	public override bool OnLeave (View view)
+	{
+		var args = new FocusEventArgs (view);
+		Leave?.Invoke (this, args);
+		if (args.Handled) {
+			return true;
+		}
+		if (base.OnLeave (view)) {
+			return true;
 		}
 
-		/// <inheritdoc/>
-		public override bool OnLeave (View view)
-		{
-			var args = new FocusEventArgs (view);
-			Leave?.Invoke (this, args);
-			if (args.Handled) {
-				return true;
+		Driver?.SetCursorVisibility (CursorVisibility.Invisible);
+		return false;
+	}
+
+	/// <summary>
+	/// Returns the currently focused view inside this view, or null if nothing is focused.
+	/// </summary>
+	/// <value>The focused.</value>
+	public View Focused { get; private set; }
+
+	/// <summary>
+	/// Returns the most focused view in the chain of subviews (the leaf view that has the focus).
+	/// </summary>
+	/// <value>The most focused View.</value>
+	public View MostFocused {
+		get {
+			if (Focused == null) {
+				return null;
 			}
-			if (base.OnLeave (view)) {
-				return true;
+			var most = Focused.MostFocused;
+			if (most != null) {
+				return most;
 			}
-
-			Driver?.SetCursorVisibility (CursorVisibility.Invisible);
-			return false;
+			return Focused;
 		}
+	}
 
-		/// <summary>
-		/// Returns the currently focused view inside this view, or null if nothing is focused.
-		/// </summary>
-		/// <value>The focused.</value>
-		public View Focused => _focused;
-
-		/// <summary>
-		/// Returns the most focused view in the chain of subviews (the leaf view that has the focus).
-		/// </summary>
-		/// <value>The most focused View.</value>
-		public View MostFocused {
-			get {
-				if (Focused == null)
-					return null;
-				var most = Focused.MostFocused;
-				if (most != null)
-					return most;
-				return Focused;
-			}
+	/// <summary>
+	/// Causes the specified subview to have focus.
+	/// </summary>
+	/// <param name="view">View.</param>
+	void SetFocus (View view)
+	{
+		if (view == null) {
+			return;
+		}
+		//Console.WriteLine ($"Request to focus {view}");
+		if (!view.CanFocus || !view.Visible || !view.Enabled) {
+			return;
 		}
+		if (Focused?._hasFocus == true && Focused == view) {
+			return;
+		}
+		if (Focused?._hasFocus == true && Focused?.SuperView == view || view == this) {
 
-		/// <summary>
-		/// Causes the specified subview to have focus.
-		/// </summary>
-		/// <param name="view">View.</param>
-		void SetFocus (View view)
-		{
-			if (view == null) {
-				return;
-			}
-			//Console.WriteLine ($"Request to focus {view}");
-			if (!view.CanFocus || !view.Visible || !view.Enabled) {
-				return;
+			if (!view._hasFocus) {
+				view._hasFocus = true;
 			}
-			if (_focused?._hasFocus == true && _focused == view) {
-				return;
+			return;
+		}
+		// Make sure that this view is a subview
+		View c;
+		for (c = view._superView; c != null; c = c._superView) {
+			if (c == this) {
+				break;
 			}
-			if ((_focused?._hasFocus == true && _focused?.SuperView == view) || view == this) {
+		}
+		if (c == null) {
+			throw new ArgumentException ("the specified view is not part of the hierarchy of this view");
+		}
 
-				if (!view._hasFocus) {
-					view._hasFocus = true;
-				}
-				return;
-			}
-			// Make sure that this view is a subview
-			View c;
-			for (c = view._superView; c != null; c = c._superView)
-				if (c == this)
-					break;
-			if (c == null)
-				throw new ArgumentException ("the specified view is not part of the hierarchy of this view");
+		if (Focused != null) {
+			Focused.SetHasFocus (false, view);
+		}
 
-			if (_focused != null)
-				_focused.SetHasFocus (false, view);
+		var f = Focused;
+		Focused = view;
+		Focused.SetHasFocus (true, f);
+		Focused.EnsureFocus ();
 
-			var f = _focused;
-			_focused = view;
-			_focused.SetHasFocus (true, f);
-			_focused.EnsureFocus ();
+		// Send focus upwards
+		if (SuperView != null) {
+			SuperView.SetFocus (this);
+		} else {
+			SetFocus (this);
+		}
+	}
 
-			// Send focus upwards
-			if (SuperView != null) {
-				SuperView.SetFocus (this);
-			} else {
-				SetFocus (this);
+	/// <summary>
+	/// Causes the specified view and the entire parent hierarchy to have the focused order updated.
+	/// </summary>
+	public void SetFocus ()
+	{
+		if (!CanBeVisible (this) || !Enabled) {
+			if (HasFocus) {
+				SetHasFocus (false, this);
 			}
+			return;
 		}
 
-		/// <summary>
-		/// Causes the specified view and the entire parent hierarchy to have the focused order updated.
-		/// </summary>
-		public void SetFocus ()
-		{
-			if (!CanBeVisible (this) || !Enabled) {
-				if (HasFocus) {
-					SetHasFocus (false, this);
-				}
-				return;
-			}
+		if (SuperView != null) {
+			SuperView.SetFocus (this);
+		} else {
+			SetFocus (this);
+		}
+	}
 
-			if (SuperView != null) {
-				SuperView.SetFocus (this);
+	/// <summary>
+	/// Finds the first view in the hierarchy that wants to get the focus if nothing is currently focused, otherwise, does
+	/// nothing.
+	/// </summary>
+	public void EnsureFocus ()
+	{
+		if (Focused == null && _subviews?.Count > 0) {
+			if (FocusDirection == Direction.Forward) {
+				FocusFirst ();
 			} else {
-				SetFocus (this);
+				FocusLast ();
 			}
 		}
+	}
 
-		/// <summary>
-		/// Finds the first view in the hierarchy that wants to get the focus if nothing is currently focused, otherwise, does nothing.
-		/// </summary>
-		public void EnsureFocus ()
-		{
-			if (_focused == null && _subviews?.Count > 0) {
-				if (FocusDirection == Direction.Forward) {
-					FocusFirst ();
-				} else {
-					FocusLast ();
-				}
-			}
+	/// <summary>
+	/// Focuses the first focusable subview if one exists.
+	/// </summary>
+	public void FocusFirst ()
+	{
+		if (!CanBeVisible (this)) {
+			return;
 		}
 
-		/// <summary>
-		/// Focuses the first focusable subview if one exists.
-		/// </summary>
-		public void FocusFirst ()
-		{
-			if (!CanBeVisible (this)) {
-				return;
-			}
+		if (_tabIndexes == null) {
+			SuperView?.SetFocus (this);
+			return;
+		}
 
-			if (_tabIndexes == null) {
-				SuperView?.SetFocus (this);
+		foreach (var view in _tabIndexes) {
+			if (view.CanFocus && view._tabStop && view.Visible && view.Enabled) {
+				SetFocus (view);
 				return;
 			}
+		}
+	}
 
-			foreach (var view in _tabIndexes) {
-				if (view.CanFocus && view._tabStop && view.Visible && view.Enabled) {
-					SetFocus (view);
-					return;
-				}
-			}
+	/// <summary>
+	/// Focuses the last focusable subview if one exists.
+	/// </summary>
+	public void FocusLast ()
+	{
+		if (!CanBeVisible (this)) {
+			return;
 		}
 
-		/// <summary>
-		/// Focuses the last focusable subview if one exists.
-		/// </summary>
-		public void FocusLast ()
-		{
-			if (!CanBeVisible (this)) {
-				return;
-			}
+		if (_tabIndexes == null) {
+			SuperView?.SetFocus (this);
+			return;
+		}
 
-			if (_tabIndexes == null) {
-				SuperView?.SetFocus (this);
+		for (var i = _tabIndexes.Count; i > 0;) {
+			i--;
+
+			var v = _tabIndexes [i];
+			if (v.CanFocus && v._tabStop && v.Visible && v.Enabled) {
+				SetFocus (v);
 				return;
 			}
+		}
+	}
 
-			for (var i = _tabIndexes.Count; i > 0;) {
-				i--;
+	/// <summary>
+	/// Focuses the previous view.
+	/// </summary>
+	/// <returns><see langword="true"/> if previous was focused, <see langword="false"/> otherwise.</returns>
+	public bool FocusPrev ()
+	{
+		if (!CanBeVisible (this)) {
+			return false;
+		}
 
-				var v = _tabIndexes [i];
-				if (v.CanFocus && v._tabStop && v.Visible && v.Enabled) {
-					SetFocus (v);
-					return;
-				}
-			}
+		FocusDirection = Direction.Backward;
+		if (_tabIndexes == null || _tabIndexes.Count == 0) {
+			return false;
 		}
 
-		/// <summary>
-		/// Focuses the previous view.
-		/// </summary>
-		/// <returns><see langword="true"/> if previous was focused, <see langword="false"/> otherwise.</returns>
-		public bool FocusPrev ()
-		{
-			if (!CanBeVisible (this)) {
-				return false;
-			}
+		if (Focused == null) {
+			FocusLast ();
+			return Focused != null;
+		}
 
-			FocusDirection = Direction.Backward;
-			if (_tabIndexes == null || _tabIndexes.Count == 0)
-				return false;
+		var focusedIdx = -1;
+		for (var i = _tabIndexes.Count; i > 0;) {
+			i--;
+			var w = _tabIndexes [i];
 
-			if (_focused == null) {
-				FocusLast ();
-				return _focused != null;
+			if (w.HasFocus) {
+				if (w.FocusPrev ()) {
+					return true;
+				}
+				focusedIdx = i;
+				continue;
 			}
+			if (w.CanFocus && focusedIdx != -1 && w._tabStop && w.Visible && w.Enabled) {
+				Focused.SetHasFocus (false, w);
 
-			var focusedIdx = -1;
-			for (var i = _tabIndexes.Count; i > 0;) {
-				i--;
-				var w = _tabIndexes [i];
-
-				if (w.HasFocus) {
-					if (w.FocusPrev ())
-						return true;
-					focusedIdx = i;
-					continue;
+				if (w.CanFocus && w._tabStop && w.Visible && w.Enabled) {
+					w.FocusLast ();
 				}
-				if (w.CanFocus && focusedIdx != -1 && w._tabStop && w.Visible && w.Enabled) {
-					_focused.SetHasFocus (false, w);
-
-					if (w.CanFocus && w._tabStop && w.Visible && w.Enabled)
-						w.FocusLast ();
 
-					SetFocus (w);
-					return true;
-				}
-			}
-			if (_focused != null) {
-				_focused.SetHasFocus (false, this);
-				_focused = null;
+				SetFocus (w);
+				return true;
 			}
-			return false;
 		}
+		if (Focused != null) {
+			Focused.SetHasFocus (false, this);
+			Focused = null;
+		}
+		return false;
+	}
 
-		/// <summary>
-		/// Focuses the next view.
-		/// </summary>
-		/// <returns><see langword="true"/> if next was focused, <see langword="false"/> otherwise.</returns>
-		public bool FocusNext ()
-		{
-			if (!CanBeVisible (this)) {
-				return false;
-			}
-
-			FocusDirection = Direction.Forward;
-			if (_tabIndexes == null || _tabIndexes.Count == 0)
-				return false;
+	/// <summary>
+	/// Focuses the next view.
+	/// </summary>
+	/// <returns><see langword="true"/> if next was focused, <see langword="false"/> otherwise.</returns>
+	public bool FocusNext ()
+	{
+		if (!CanBeVisible (this)) {
+			return false;
+		}
 
-			if (_focused == null) {
-				FocusFirst ();
-				return _focused != null;
-			}
-			var focusedIdx = -1;
-			for (var i = 0; i < _tabIndexes.Count; i++) {
-				var w = _tabIndexes [i];
-
-				if (w.HasFocus) {
-					if (w.FocusNext ())
-						return true;
-					focusedIdx = i;
-					continue;
-				}
-				if (w.CanFocus && focusedIdx != -1 && w._tabStop && w.Visible && w.Enabled) {
-					_focused.SetHasFocus (false, w);
+		FocusDirection = Direction.Forward;
+		if (_tabIndexes == null || _tabIndexes.Count == 0) {
+			return false;
+		}
 
-					if (w.CanFocus && w._tabStop && w.Visible && w.Enabled)
-						w.FocusFirst ();
+		if (Focused == null) {
+			FocusFirst ();
+			return Focused != null;
+		}
+		var focusedIdx = -1;
+		for (var i = 0; i < _tabIndexes.Count; i++) {
+			var w = _tabIndexes [i];
 
-					SetFocus (w);
+			if (w.HasFocus) {
+				if (w.FocusNext ()) {
 					return true;
 				}
+				focusedIdx = i;
+				continue;
 			}
-			if (_focused != null) {
-				_focused.SetHasFocus (false, this);
-				_focused = null;
-			}
-			return false;
-		}
+			if (w.CanFocus && focusedIdx != -1 && w._tabStop && w.Visible && w.Enabled) {
+				Focused.SetHasFocus (false, w);
 
-		View GetMostFocused (View view)
-		{
-			if (view == null) {
-				return null;
+				if (w.CanFocus && w._tabStop && w.Visible && w.Enabled) {
+					w.FocusFirst ();
+				}
+
+				SetFocus (w);
+				return true;
 			}
+		}
+		if (Focused != null) {
+			Focused.SetHasFocus (false, this);
+			Focused = null;
+		}
+		return false;
+	}
 
-			return view._focused != null ? GetMostFocused (view._focused) : view;
+	View GetMostFocused (View view)
+	{
+		if (view == null) {
+			return null;
 		}
 
-		/// <summary>
-		///   Positions the cursor in the right position based on the currently focused view in the chain.
-		/// </summary>
-		///    Views that are focusable should override <see cref="PositionCursor"/> to ensure
-		///    the cursor is placed in a location that makes sense. Unix terminals do not have
-		///    a way of hiding the cursor, so it can be distracting to have the cursor left at
-		///    the last focused view. Views should make sure that they place the cursor
-		///    in a visually sensible place.
-		public virtual void PositionCursor ()
-		{
-			if (!CanBeVisible (this) || !Enabled) {
-				return;
-			}
+		return view.Focused != null ? GetMostFocused (view.Focused) : view;
+	}
 
-			// BUGBUG: v2 - This needs to support children of Frames too
+	/// <summary>
+	/// Positions the cursor in the right position based on the currently focused view in the chain.
+	/// </summary>
+	/// Views that are focusable should override
+	/// <see cref="PositionCursor"/>
+	/// to ensure
+	/// the cursor is placed in a location that makes sense. Unix terminals do not have
+	/// a way of hiding the cursor, so it can be distracting to have the cursor left at
+	/// the last focused view. Views should make sure that they place the cursor
+	/// in a visually sensible place.
+	public virtual void PositionCursor ()
+	{
+		if (!CanBeVisible (this) || !Enabled) {
+			return;
+		}
 
-			if (_focused == null && SuperView != null) {
-				SuperView.EnsureFocus ();
-			} else if (_focused?.Visible == true && _focused?.Enabled == true && _focused?.Frame.Width > 0 && _focused.Frame.Height > 0) {
-				_focused.PositionCursor ();
-			} else if (_focused?.Visible == true && _focused?.Enabled == false) {
-				_focused = null;
-			} else if (CanFocus && HasFocus && Visible && Frame.Width > 0 && Frame.Height > 0) {
-				Move (TextFormatter.HotKeyPos == -1 ? 0 : TextFormatter.CursorPosition, 0);
-			} else {
-				Move (_frame.X, _frame.Y);
-			}
+		// BUGBUG: v2 - This needs to support children of Frames too
+
+		if (Focused == null && SuperView != null) {
+			SuperView.EnsureFocus ();
+		} else if (Focused?.Visible == true && Focused?.Enabled == true && Focused?.Frame.Width > 0 && Focused.Frame.Height > 0) {
+			Focused.PositionCursor ();
+		} else if (Focused?.Visible == true && Focused?.Enabled == false) {
+			Focused = null;
+		} else if (CanFocus && HasFocus && Visible && Frame.Width > 0 && Frame.Height > 0) {
+			Move (TextFormatter.HotKeyPos == -1 ? 0 : TextFormatter.CursorPosition, 0);
+		} else {
+			Move (_frame.X, _frame.Y);
 		}
-		#endregion Focus
 	}
-}
+	#endregion Focus
+}

Terminal.Gui/View/ViewText.cs

@@ -7,24 +7,28 @@ public partial class View {
 	string _text;
 
 	/// <summary>
-	///   The text displayed by the <see cref="View"/>.
+	/// The text displayed by the <see cref="View"/>.
 	/// </summary>
 	/// <remarks>
-	/// <para>
-	///  The text will be drawn before any subviews are drawn.
-	/// </para>
-	/// <para>
-	///  The text will be drawn starting at the view origin (0, 0) and will be formatted according
-	///  to <see cref="TextAlignment"/> and <see cref="TextDirection"/>. 
-	/// </para>
-	/// <para>
-	///  The text will word-wrap to additional lines if it does not fit horizontally. If <see cref="Bounds"/>'s height
-	///  is 1, the text will be clipped.	
-	///  </para>
-	/// <para>
-	///  Set the <see cref="HotKeySpecifier"/> to enable hotkey support. To disable hotkey support set <see cref="HotKeySpecifier"/> to
-	///  <c>(Rune)0xffff</c>.
-	/// </para>
+	///         <para>
+	///         The text will be drawn before any subviews are drawn.
+	///         </para>
+	///         <para>
+	///         The text will be drawn starting at the view origin (0, 0) and will be formatted according
+	///         to <see cref="TextAlignment"/> and <see cref="TextDirection"/>.
+	///         </para>
+	///         <para>
+	///         The text will word-wrap to additional lines if it does not fit horizontally. If <see cref="Bounds"/>'s height
+	///         is 1, the text will be clipped.
+	///         </para>
+	///         <para>
+	///         Set the <see cref="HotKeySpecifier"/> to enable hotkey support. To disable hotkey support set
+	///         <see cref="HotKeySpecifier"/> to
+	///         <c>(Rune)0xffff</c>.
+	///         </para>
+	///         <para>
+	///         If <see cref="AutoSize"/> is <c>true</c>, the <see cref="Bounds"/> will be adjusted to fit the text.
+	///         </para>
 	/// </remarks>
 	public virtual string Text {
 		get => _text;
@@ -32,7 +36,6 @@ public partial class View {
 			_text = value;
 			SetHotKey ();
 			UpdateTextFormatterText ();
-			//TextFormatter.Format ();
 			OnResizeNeeded ();
 
 #if DEBUG
@@ -48,21 +51,10 @@ public partial class View {
 	/// </summary>
 	public TextFormatter TextFormatter { get; set; }
 
-	/// <summary>
-	/// Can be overridden if the <see cref="Terminal.Gui.TextFormatter.Text"/> has
-	///  different format than the default.
-	/// </summary>
-	protected virtual void UpdateTextFormatterText ()
-	{
-		if (TextFormatter != null) {
-			TextFormatter.Text = _text;
-		}
-	}
-
 	/// <summary>
 	/// Gets or sets whether trailing spaces at the end of word-wrapped lines are preserved
-	/// or not when <see cref="TextFormatter.WordWrap"/> is enabled. 
-	/// If <see langword="true"/> trailing spaces at the end of wrapped lines will be removed when 
+	/// or not when <see cref="TextFormatter.WordWrap"/> is enabled.
+	/// If <see langword="true"/> trailing spaces at the end of wrapped lines will be removed when
 	/// <see cref="Text"/> is formatted for display. The default is <see langword="false"/>.
 	/// </summary>
 	public virtual bool PreserveTrailingSpaces {
@@ -76,8 +68,14 @@ public partial class View {
 	}
 
 	/// <summary>
-	/// Gets or sets how the View's <see cref="Text"/> is aligned horizontally when drawn. Changing this property will redisplay the <see cref="View"/>.
+	/// Gets or sets how the View's <see cref="Text"/> is aligned horizontally when drawn. Changing this property will
+	/// redisplay the <see cref="View"/>.
 	/// </summary>
+	/// <remarks>
+	///         <para>
+	///         If <see cref="AutoSize"/> is <c>true</c>, the <see cref="Bounds"/> will be adjusted to fit the text.
+	///         </para>
+	/// </remarks>
 	/// <value>The text alignment.</value>
 	public virtual TextAlignment TextAlignment {
 		get => TextFormatter.Alignment;
@@ -89,8 +87,14 @@ public partial class View {
 	}
 
 	/// <summary>
-	/// Gets or sets how the View's <see cref="Text"/> is aligned vertically when drawn. Changing this property will redisplay the <see cref="View"/>.
+	/// Gets or sets how the View's <see cref="Text"/> is aligned vertically when drawn. Changing this property will redisplay
+	/// the <see cref="View"/>.
 	/// </summary>
+	/// <remarks>
+	///         <para>
+	///         If <see cref="AutoSize"/> is <c>true</c>, the <see cref="Bounds"/> will be adjusted to fit the text.
+	///         </para>
+	/// </remarks>
 	/// <value>The text alignment.</value>
 	public virtual VerticalTextAlignment VerticalTextAlignment {
 		get => TextFormatter.VerticalAlignment;
@@ -101,8 +105,14 @@ public partial class View {
 	}
 
 	/// <summary>
-	/// Gets or sets the direction of the View's <see cref="Text"/>. Changing this property will redisplay the <see cref="View"/>.
+	/// Gets or sets the direction of the View's <see cref="Text"/>. Changing this property will redisplay the
+	/// <see cref="View"/>.
 	/// </summary>
+	/// <remarks>
+	///         <para>
+	///         If <see cref="AutoSize"/> is <c>true</c>, the <see cref="Bounds"/> will be adjusted to fit the text.
+	///         </para>
+	/// </remarks>
 	/// <value>The text alignment.</value>
 	public virtual TextDirection TextDirection {
 		get => TextFormatter.Direction;
@@ -112,18 +122,27 @@ public partial class View {
 		}
 	}
 
+	/// <summary>
+	/// Can be overridden if the <see cref="Terminal.Gui.TextFormatter.Text"/> has
+	/// different format than the default.
+	/// </summary>
+	protected virtual void UpdateTextFormatterText ()
+	{
+		if (TextFormatter != null) {
+			TextFormatter.Text = _text;
+		}
+	}
+
 	void UpdateTextDirection (TextDirection newDirection)
 	{
-		bool directionChanged = TextFormatter.IsHorizontalDirection (TextFormatter.Direction)
-					!= TextFormatter.IsHorizontalDirection (newDirection);
+		var directionChanged = TextFormatter.IsHorizontalDirection (TextFormatter.Direction) != TextFormatter.IsHorizontalDirection (newDirection);
 		TextFormatter.Direction = newDirection;
 
-		bool isValidOldAutoSize = AutoSize && IsValidAutoSize (out var _);
+		var isValidOldAutoSize = AutoSize && IsValidAutoSize (out var _);
 
 		UpdateTextFormatterText ();
 
-		if (!ValidatePosDim && directionChanged && AutoSize
-		|| ValidatePosDim && directionChanged && AutoSize && isValidOldAutoSize) {
+		if (!ValidatePosDim && directionChanged && AutoSize || ValidatePosDim && directionChanged && AutoSize && isValidOldAutoSize) {
 			OnResizeNeeded ();
 		} else if (directionChanged && IsAdded) {
 			ResizeBoundsToFit (Bounds.Size);
@@ -132,16 +151,19 @@ public partial class View {
 		} else {
 			SetFrameToFitText ();
 		}
-		TextFormatter.Size = GetTextFormatterSizeNeededForTextAndHotKey ();
+		SetTextFormatterSize ();
 		SetNeedsDisplay ();
 	}
 
 
 	/// <summary>
-	/// Sets the size of the View to the minimum width or height required to fit <see cref="Text"/>. 
+	/// Sets the size of the View to the minimum width or height required to fit <see cref="Text"/>.
 	/// </summary>
-	/// <returns><see langword="true"/> if the size was changed; <see langword="false"/> if <see cref="AutoSize"/> == <see langword="true"/> or
-	/// <see cref="Text"/> will not fit.</returns>
+	/// <returns>
+	/// <see langword="true"/> if the size was changed; <see langword="false"/> if <see cref="AutoSize"/> ==
+	/// <see langword="true"/> or
+	/// <see cref="Text"/> will not fit.
+	/// </returns>
 	/// <remarks>
 	/// Always returns <see langword="false"/> if <see cref="AutoSize"/> is <see langword="true"/> or
 	/// if <see cref="Height"/> (Horizontal) or <see cref="Width"/> (Vertical) are not not set or zero.
@@ -168,89 +190,150 @@ public partial class View {
 			}
 			sizeRequired = Bounds.Size;
 
-			if (!AutoSize && !string.IsNullOrEmpty (TextFormatter.Text)) {
-				switch (TextFormatter.IsVerticalDirection (TextDirection)) {
-				case true:
-					int colWidth = TextFormatter.GetSumMaxCharWidth (new List<string> { TextFormatter.Text }, 0, 1);
-					// TODO: v2 - This uses frame.Width; it should only use Bounds
-					if (_frame.Width < colWidth &&
-					(Width == null ||
-					Bounds.Width >= 0 &&
-					Width is Dim.DimAbsolute &&
-					Width.Anchor (0) >= 0 &&
-					Width.Anchor (0) < colWidth)) {
-						sizeRequired = new Size (colWidth, Bounds.Height);
-						return true;
-					}
-					break;
-				default:
-					if (_frame.Height < 1 &&
-					(Height == null ||
-					Height is Dim.DimAbsolute &&
-					Height.Anchor (0) == 0)) {
-						sizeRequired = new Size (Bounds.Width, 1);
-						return true;
-					}
-					break;
+			if (AutoSize || string.IsNullOrEmpty (TextFormatter.Text)) {
+				return false;
+			}
+
+			switch (TextFormatter.IsVerticalDirection (TextDirection)) {
+			case true:
+				var colWidth = TextFormatter.GetSumMaxCharWidth (new List<string> { TextFormatter.Text }, 0, 1);
+				// TODO: v2 - This uses frame.Width; it should only use Bounds
+				if (_frame.Width < colWidth &&
+				    (Width == null ||
+				     Bounds.Width >= 0 &&
+				     Width is Dim.DimAbsolute &&
+				     Width.Anchor (0) >= 0 &&
+				     Width.Anchor (0) < colWidth)) {
+					sizeRequired = new Size (colWidth, Bounds.Height);
+					return true;
+				}
+				break;
+			default:
+				if (_frame.Height < 1 &&
+				    (Height == null ||
+				     Height is Dim.DimAbsolute &&
+				     Height.Anchor (0) == 0)) {
+					sizeRequired = new Size (Bounds.Width, 1);
+					return true;
 				}
+				break;
 			}
 			return false;
 		}
 
 		if (GetMinimumSizeOfText (out var size)) {
+			// TODO: This is a hack.
+			//_width  = size.Width;
+			//_height = size.Height;
 			_frame = new Rect (_frame.Location, size);
+			//throw new InvalidOperationException ("This is a hack.");
 			return true;
 		}
 		return false;
 	}
 
 	/// <summary>
-	/// Gets the width or height of the <see cref="Terminal.Gui.TextFormatter.HotKeySpecifier"/> characters 
+	/// Gets the width or height of the <see cref="TextFormatter.HotKeySpecifier"/> characters
 	/// in the <see cref="Text"/> property.
 	/// </summary>
 	/// <remarks>
-	/// Only the first hotkey specifier found in <see cref="Text"/> is supported.
+	/// Only the first HotKey specifier found in <see cref="Text"/> is supported.
 	/// </remarks>
-	/// <param name="isWidth">If <see langword="true"/> (the default) the width required for the hotkey specifier is returned. Otherwise the height is returned.</param>
-	/// <returns>The number of characters required for the <see cref="Terminal.Gui.TextFormatter.HotKeySpecifier"/>. If the text direction specified
-	/// by <see cref="TextDirection"/> does not match the <paramref name="isWidth"/> parameter, <c>0</c> is returned.</returns>
+	/// <param name="isWidth">
+	/// If <see langword="true"/> (the default) the width required for the HotKey specifier is returned. Otherwise the height
+	/// is returned.
+	/// </param>
+	/// <returns>
+	/// The number of characters required for the <see cref="TextFormatter.HotKeySpecifier"/>. If the text
+	/// direction specified
+	/// by <see cref="TextDirection"/> does not match the <paramref name="isWidth"/> parameter, <c>0</c> is returned.
+	/// </returns>
 	public int GetHotKeySpecifierLength (bool isWidth = true)
 	{
 		if (isWidth) {
 			return TextFormatter.IsHorizontalDirection (TextDirection) &&
-				TextFormatter.Text?.Contains ((char)HotKeySpecifier.Value) == true
-				? Math.Max (HotKeySpecifier.GetColumns (), 0) : 0;
-		} else {
-			return TextFormatter.IsVerticalDirection (TextDirection) &&
-				TextFormatter.Text?.Contains ((char)HotKeySpecifier.Value) == true
+			       TextFormatter.Text?.Contains ((char)HotKeySpecifier.Value) == true
 				? Math.Max (HotKeySpecifier.GetColumns (), 0) : 0;
 		}
+		return TextFormatter.IsVerticalDirection (TextDirection) &&
+		       TextFormatter.Text?.Contains ((char)HotKeySpecifier.Value) == true
+			? Math.Max (HotKeySpecifier.GetColumns (), 0) : 0;
 	}
 
 	/// <summary>
-	/// Gets the dimensions required for <see cref="Text"/> ignoring a <see cref="Terminal.Gui.TextFormatter.HotKeySpecifier"/>.
+	/// Gets the dimensions required for <see cref="Text"/> ignoring a <see cref="TextFormatter.HotKeySpecifier"/>.
 	/// </summary>
 	/// <returns></returns>
-	public Size GetSizeNeededForTextWithoutHotKey () => new (TextFormatter.Size.Width - GetHotKeySpecifierLength (),
+	internal Size GetSizeNeededForTextWithoutHotKey () => new (TextFormatter.Size.Width - GetHotKeySpecifierLength (),
 		TextFormatter.Size.Height - GetHotKeySpecifierLength (false));
 
 	/// <summary>
-	/// Gets the dimensions required for <see cref="Text"/> accounting for a <see cref="Terminal.Gui.TextFormatter.HotKeySpecifier"/> .
+	/// Sets <see cref="TextFormatter"/>.Size to the current <see cref="Bounds"/> size, adjusted for
+	/// <see cref="TextFormatter.HotKeySpecifier"/>.
 	/// </summary>
+	/// <remarks>
+	/// Use this API to set <see cref="TextFormatter.Size"/> when the view has changed such that the
+	/// size required to fit the text has changed.
+	/// changes.
+	/// </remarks>
 	/// <returns></returns>
-	public Size GetTextFormatterSizeNeededForTextAndHotKey ()
+	internal void SetTextFormatterSize ()
 	{
 		if (!IsInitialized) {
-			return Size.Empty;
+			TextFormatter.Size = Size.Empty;
+			return;
 		}
 
 		if (string.IsNullOrEmpty (TextFormatter.Text)) {
-			return Bounds.Size;
+			TextFormatter.Size = Bounds.Size;
+			return;
 		}
 
-		// BUGBUG: This IGNORES what Text is set to, using on only the current View size. This doesn't seem to make sense.
-		// BUGBUG: This uses Frame; in v2 it should be Bounds
-		return new Size (Bounds.Size.Width + GetHotKeySpecifierLength (),
+		TextFormatter.Size = new Size (Bounds.Size.Width + GetHotKeySpecifierLength (),
 			Bounds.Size.Height + GetHotKeySpecifierLength (false));
 	}
+
+	/// <summary>
+	/// Gets the Frame dimensions required to fit <see cref="Text"/> within <see cref="Bounds"/> using the text
+	/// <see cref="Direction"/> specified by the
+	/// <see cref="TextFormatter"/> property and accounting for any <see cref="HotKeySpecifier"/> characters.
+	/// </summary>
+	/// <returns>The <see cref="Size"/> the <see cref="Frame"/> needs to be set to fit the text.</returns>
+	public Size GetAutoSize ()
+	{
+		var x = 0;
+		var y = 0;
+		if (IsInitialized) {
+			x = Bounds.X;
+			y = Bounds.Y;
+		}
+		var rect = TextFormatter.CalcRect (x, y, TextFormatter.Text, TextFormatter.Direction);
+		int newWidth = rect.Size.Width - GetHotKeySpecifierLength () + (Margin == null ? 0 : Margin.Thickness.Horizontal + Border.Thickness.Horizontal + Padding.Thickness.Horizontal);
+		int newHeight = rect.Size.Height - GetHotKeySpecifierLength (false) + (Margin == null ? 0 : Margin.Thickness.Vertical + Border.Thickness.Vertical + Padding.Thickness.Vertical);
+		return new Size (newWidth, newHeight);
+	}
+
+	bool IsValidAutoSize (out Size autoSize)
+	{
+		var rect = TextFormatter.CalcRect (_frame.X, _frame.Y, TextFormatter.Text, TextDirection);
+		autoSize = new Size (rect.Size.Width - GetHotKeySpecifierLength (),
+			rect.Size.Height - GetHotKeySpecifierLength (false));
+		return !(ValidatePosDim && (!(Width is Dim.DimAbsolute) || !(Height is Dim.DimAbsolute)) ||
+			 _frame.Size.Width != rect.Size.Width - GetHotKeySpecifierLength () ||
+			 _frame.Size.Height != rect.Size.Height - GetHotKeySpecifierLength (false));
+	}
+
+	bool IsValidAutoSizeWidth (Dim width)
+	{
+		var rect = TextFormatter.CalcRect (_frame.X, _frame.Y, TextFormatter.Text, TextDirection);
+		var dimValue = width.Anchor (0);
+		return !(ValidatePosDim && !(width is Dim.DimAbsolute) || dimValue != rect.Size.Width - GetHotKeySpecifierLength ());
+	}
+
+	bool IsValidAutoSizeHeight (Dim height)
+	{
+		var rect = TextFormatter.CalcRect (_frame.X, _frame.Y, TextFormatter.Text, TextDirection);
+		var dimValue = height.Anchor (0);
+		return !(ValidatePosDim && !(height is Dim.DimAbsolute) || dimValue != rect.Size.Height - GetHotKeySpecifierLength (false));
+	}
 }

Terminal.Gui/Views/Button.cs

@@ -1,4 +1,4 @@
-//
+//
 // Button.cs: Button control
 //
 // Authors:
@@ -10,65 +10,64 @@ using System.Text;
 
 namespace Terminal.Gui;
 /// <summary>
-///   Button is a <see cref="View"/> that provides an item that invokes raises the <see cref="Clicked"/> event.
+/// Button is a <see cref="View"/> that provides an item that invokes raises the <see cref="Clicked"/> event.
 /// </summary>
 /// <remarks>
-/// <para>
-///   Provides a button showing text that raises the <see cref="Clicked"/> event when clicked on with a mouse
-///   or when the user presses SPACE, ENTER, or the <see cref="View.HotKey"/>. The hot key is the first letter or digit following the first underscore ('_') 
-///   in the button text. 
-/// </para>
-/// <para>
-///   Use <see cref="View.HotKeySpecifier"/> to change the hot key specifier from the default of ('_'). 
-/// </para>
-/// <para>
-///   If no hot key specifier is found, the first uppercase letter encountered will be used as the hot key.
-/// </para>
-/// <para>
-///   When the button is configured as the default (<see cref="IsDefault"/>) and the user presses
-///   the ENTER key, if no other <see cref="View"/> processes the key, the <see cref="Button"/>'s
-///   <see cref="Clicked"/> event will will be fired.
-/// </para>
+///         <para>
+///         Provides a button showing text that raises the <see cref="Clicked"/> event when clicked on with a mouse
+///         or when the user presses SPACE, ENTER, or the <see cref="View.HotKey"/>. The hot key is the first letter or
+///         digit following the first underscore ('_')
+///         in the button text.
+///         </para>
+///         <para>
+///         Use <see cref="View.HotKeySpecifier"/> to change the hot key specifier from the default of ('_').
+///         </para>
+///         <para>
+///         If no hot key specifier is found, the first uppercase letter encountered will be used as the hot key.
+///         </para>
+///         <para>
+///         When the button is configured as the default (<see cref="IsDefault"/>) and the user presses
+///         the ENTER key, if no other <see cref="View"/> processes the key, the <see cref="Button"/>'s
+///         <see cref="Clicked"/> event will will be fired.
+///         </para>
 /// </remarks>
 public class Button : View {
 	bool _isDefault;
 	Rune _leftBracket;
-	Rune _rightBracket;
 	Rune _leftDefault;
+	Rune _rightBracket;
 	Rune _rightDefault;
 
 	/// <summary>
-	///   Initializes a new instance of <see cref="Button"/> using <see cref="LayoutStyle.Computed"/> layout.
+	/// Initializes a new instance of <see cref="Button"/> using <see cref="LayoutStyle.Computed"/> layout.
 	/// </summary>
 	/// <remarks>
-	///   The width of the <see cref="Button"/> is computed based on the
-	///   text length. The height will always be 1.
+	/// The width of the <see cref="Button"/> is computed based on the
+	/// text length. The height will always be 1.
 	/// </remarks>
-	public Button () : this (text: string.Empty, is_default: false) { }
+	public Button () : this (string.Empty, false) { }
 
 	/// <summary>
-	///   Initializes a new instance of <see cref="Button"/> using <see cref="LayoutStyle.Computed"/> layout.
+	/// Initializes a new instance of <see cref="Button"/> using <see cref="LayoutStyle.Computed"/> layout.
 	/// </summary>
 	/// <remarks>
-	///   The width of the <see cref="Button"/> is computed based on the
-	///   text length. The height will always be 1.
+	/// The width of the <see cref="Button"/> is computed based on the
+	/// text length. The height will always be 1.
 	/// </remarks>
 	/// <param name="text">The button's text</param>
 	/// <param name="is_default">
-	///   If <c>true</c>, a special decoration is used, and the user pressing the enter key 
-	///   in a <see cref="Dialog"/> will implicitly activate this button.
+	/// If <c>true</c>, a special decoration is used, and the user pressing the enter key
+	/// in a <see cref="Dialog"/> will implicitly activate this button.
 	/// </param>
-	public Button (string text, bool is_default = false) : base (text)
-	{
-		SetInitialProperties (text, is_default);
-	}
+	public Button (string text, bool is_default = false) : base (text) => SetInitialProperties (text, is_default);
 
 	/// <summary>
-	///   Initializes a new instance of <see cref="Button"/> using <see cref="LayoutStyle.Absolute"/> layout, based on the given text
+	/// Initializes a new instance of <see cref="Button"/> using <see cref="LayoutStyle.Absolute"/> layout, based on the given
+	/// text
 	/// </summary>
 	/// <remarks>
-	///   The width of the <see cref="Button"/> is computed based on the
-	///   text length. The height will always be 1.
+	/// The width of the <see cref="Button"/> is computed based on the
+	/// text length. The height will always be 1.
 	/// </remarks>
 	/// <param name="x">X position where the button will be shown.</param>
 	/// <param name="y">Y position where the button will be shown.</param>
@@ -76,25 +75,46 @@ public class Button : View {
 	public Button (int x, int y, string text) : this (x, y, text, false) { }
 
 	/// <summary>
-	///   Initializes a new instance of <see cref="Button"/> using <see cref="LayoutStyle.Absolute"/> layout, based on the given text.
+	/// Initializes a new instance of <see cref="Button"/> using <see cref="LayoutStyle.Absolute"/> layout, based on the given
+	/// text.
 	/// </summary>
 	/// <remarks>
-	///   The width of the <see cref="Button"/> is computed based on the
-	///   text length. The height will always be 1.
+	/// The width of the <see cref="Button"/> is computed based on the
+	/// text length. The height will always be 1.
 	/// </remarks>
 	/// <param name="x">X position where the button will be shown.</param>
 	/// <param name="y">Y position where the button will be shown.</param>
 	/// <param name="text">The button's text</param>
 	/// <param name="is_default">
-	///   If <c>true</c>, a special decoration is used, and the user pressing the enter key 
-	///   in a <see cref="Dialog"/> will implicitly activate this button.
+	/// If <c>true</c>, a special decoration is used, and the user pressing the enter key
+	/// in a <see cref="Dialog"/> will implicitly activate this button.
 	/// </param>
 	public Button (int x, int y, string text, bool is_default)
-	    : base (new Rect (x, y, text.GetRuneCount () + 4 + (is_default ? 2 : 0), 1), text)
-	{
-		SetInitialProperties (text, is_default);
+		: base (new Rect (x, y, text.GetRuneCount () + 4 + (is_default ? 2 : 0), 1), text) => SetInitialProperties (text, is_default);
+
+	/// <summary>
+	/// Gets or sets whether the <see cref="Button"/> is the default action to activate in a dialog.
+	/// </summary>
+	/// <value><c>true</c> if is default; otherwise, <c>false</c>.</value>
+	public bool IsDefault {
+		get => _isDefault;
+		set {
+			_isDefault = value;
+			UpdateTextFormatterText ();
+			OnResizeNeeded ();
+		}
 	}
 
+	/// <summary>
+	/// 
+	/// </summary>
+	public bool NoDecorations { get; set; }
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public bool NoPadding { get; set; }
+
 	// TODO: v2 - Remove constructors with parameters
 	/// <summary>
 	/// Private helper to set the initial properties of the View that were provided via constructors.
@@ -108,56 +128,34 @@ public class Button : View {
 
 		HotKeySpecifier = new Rune ('_');
 
-		_leftBracket = CM.Glyphs.LeftBracket;
-		_rightBracket = CM.Glyphs.RightBracket;
-		_leftDefault = CM.Glyphs.LeftDefaultIndicator;
-		_rightDefault = CM.Glyphs.RightDefaultIndicator;
+		_leftBracket = Glyphs.LeftBracket;
+		_rightBracket = Glyphs.RightBracket;
+		_leftDefault = Glyphs.LeftDefaultIndicator;
+		_rightDefault = Glyphs.RightDefaultIndicator;
 
 		CanFocus = true;
 		AutoSize = true;
 		_isDefault = is_default;
 		Text = text ?? string.Empty;
 
-		OnResizeNeeded ();
-
-		// Override default behavior of View - Command.Default sets focus
-		AddCommand (Command.Accept, () => { OnClicked (); return true; });
+		// Override default behavior of View
+		// Command.Default sets focus
+		AddCommand (Command.Accept, () => {
+			OnClicked ();
+			return true;
+		});
 		KeyBindings.Add (Key.Space, Command.Default, Command.Accept);
 		KeyBindings.Add (Key.Enter, Command.Default, Command.Accept);
 	}
-	
-	/// <summary>
-	/// Gets or sets whether the <see cref="Button"/> is the default action to activate in a dialog.
-	/// </summary>
-	/// <value><c>true</c> if is default; otherwise, <c>false</c>.</value>
-	public bool IsDefault {
-		get => _isDefault;
-		set {
-			_isDefault = value;
-			UpdateTextFormatterText ();
-			OnResizeNeeded ();
-		}
-	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public bool NoDecorations { get; set; }
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public bool NoPadding { get; set; }
 
 	/// <inheritdoc/>
 	protected override void UpdateTextFormatterText ()
 	{
 		if (NoDecorations) {
 			TextFormatter.Text = Text;
-		} else
-		if (IsDefault)
+		} else if (IsDefault) {
 			TextFormatter.Text = $"{_leftBracket}{_leftDefault} {Text} {_rightDefault}{_rightBracket}";
-		else {
+		} else {
 			if (NoPadding) {
 				TextFormatter.Text = $"{_leftBracket}{Text}{_rightBracket}";
 			} else {
@@ -170,19 +168,16 @@ public class Button : View {
 	/// <summary>
 	/// Virtual method to invoke the <see cref="Clicked"/> event.
 	/// </summary>
-	public virtual void OnClicked ()
-	{
-		Clicked?.Invoke (this, EventArgs.Empty);
-	}
+	public virtual void OnClicked () => Clicked?.Invoke (this, EventArgs.Empty);
 
 	/// <summary>
-	///   The event fired when the user clicks the primary mouse button within the Bounds of this <see cref="View"/>
-	///   or if the user presses the action key while this view is focused. (TODO: IsDefault)
+	/// The event fired when the user clicks the primary mouse button within the Bounds of this <see cref="View"/>
+	/// or if the user presses the action key while this view is focused. (TODO: IsDefault)
 	/// </summary>
 	/// <remarks>
-	///   Client code can hook up to this event, it is
-	///   raised when the button is activated either with
-	///   the mouse or the keyboard.
+	/// Client code can hook up to this event, it is
+	/// raised when the button is activated either with
+	/// the mouse or the keyboard.
 	/// </remarks>
 	public event EventHandler Clicked;
 
@@ -208,7 +203,7 @@ public class Button : View {
 	public override void PositionCursor ()
 	{
 		if (HotKey.IsValid && Text != "") {
-			for (int i = 0; i < TextFormatter.Text.GetRuneCount (); i++) {
+			for (var i = 0; i < TextFormatter.Text.GetRuneCount (); i++) {
 				if (TextFormatter.Text [i] == Text [0]) {
 					Move (i, 0);
 					return;
@@ -225,4 +220,4 @@ public class Button : View {
 
 		return base.OnEnter (view);
 	}
-}
+}

Terminal.Gui/Views/CheckBox.cs

@@ -86,8 +86,6 @@ public class CheckBox : View {
 		AutoSize = true;
 		Text = s;
 
-		OnResizeNeeded ();
-
 		// Things this view knows how to do
 		AddCommand (Command.ToggleChecked, () => ToggleChecked ());
 		AddCommand (Command.Accept, () => {

Terminal.Gui/Views/ColorPicker.cs

@@ -1,281 +1,275 @@
 using System;
 using System.Text;
 
-namespace Terminal.Gui {
+namespace Terminal.Gui;
 
+/// <summary>
+/// Event arguments for the <see cref="Color"/> events.
+/// </summary>
+public class ColorEventArgs : EventArgs {
 	/// <summary>
-	/// Event arguments for the <see cref="Color"/> events.
+	/// Initializes a new instance of <see cref="ColorEventArgs"/>
 	/// </summary>
-	public class ColorEventArgs : EventArgs {
+	public ColorEventArgs () { }
 
-		/// <summary>
-		/// Initializes a new instance of <see cref="ColorEventArgs"/>
-		/// </summary>
-		public ColorEventArgs ()
-		{
-		}
+	/// <summary>
+	/// The new Thickness.
+	/// </summary>
+	public Color Color { get; set; }
+
+	/// <summary>
+	/// The previous Thickness.
+	/// </summary>
+	public Color PreviousColor { get; set; }
+}
 
-		/// <summary>
-		/// The new Thickness.
-		/// </summary>
-		public Color Color { get; set; }
+/// <summary>
+/// The <see cref="ColorPicker"/> <see cref="View"/> Color picker.
+/// </summary>
+public class ColorPicker : View {
+	int _boxHeight = 2;
+	int _boxWidth = 4;
 
-		/// <summary>
-		/// The previous Thickness.
-		/// </summary>
-		public Color PreviousColor { get; set; }
-	}
 
 	/// <summary>
-	/// The <see cref="ColorPicker"/> <see cref="View"/> Color picker.
+	/// Columns of color boxes
 	/// </summary>
-	public class ColorPicker : View {
-		private int _selectColorIndex = (int)Color.Black;
-
-
-		/// <summary>
-		/// Columns of color boxes
-		/// </summary>
-		private int _cols = 8;
-
-		/// <summary>
-		/// Rows of color boxes
-		/// </summary>
-		private int _rows = 2;
-
-		/// <summary>
-		/// Width of a color box
-		/// </summary>
-		public int BoxWidth {
-			get => _boxWidth;
-			set {
-				if (_boxWidth != value) {
-					_boxWidth = value;
-					if (IsInitialized) {
-						Bounds = new Rect (Bounds.Location, new Size (_cols * BoxWidth, _rows * BoxHeight));
-					}
-				}
-			}
-		}
-		private int _boxWidth = 4;
-
-		/// <summary>
-		/// Height of a color box
-		/// </summary>
-		public int BoxHeight {
-			get => _boxHeight;
-			set {
-				if (_boxHeight != value) {
-					_boxHeight = value;
-					if (IsInitialized) {
-						Bounds = new Rect (Bounds.Location, new Size (_cols * BoxWidth, _rows * BoxHeight));
-					}
-				}
-			}
-		}
-		int _boxHeight = 2;
-
-		/// <summary>
-		/// Cursor for the selected color.
-		/// </summary>
-		public Point Cursor {
-			get {
-				return new Point (_selectColorIndex % _cols, _selectColorIndex / _cols);
-			}
+	readonly int _cols = 8;
 
-			set {
-				var colorIndex = value.Y * _cols + value.X;
-				SelectedColor = (ColorName)colorIndex;
-			}
-		}
+	/// <summary>
+	/// Rows of color boxes
+	/// </summary>
+	readonly int _rows = 2;
 
-		/// <summary>
-		/// Fired when a color is picked.
-		/// </summary>
-		public event EventHandler<ColorEventArgs> ColorChanged;
-
-		/// <summary>
-		/// Selected color.
-		/// </summary>
-		public ColorName SelectedColor {
-			get {
-				return (ColorName)_selectColorIndex;
-			}
+	int _selectColorIndex = (int)Color.Black;
+
+	/// <summary>
+	/// Initializes a new instance of <see cref="ColorPicker"/>.
+	/// </summary>
+	public ColorPicker () => SetInitialProperties ();
 
-			set {
-				ColorName prev = (ColorName)_selectColorIndex;
-				_selectColorIndex = (int)value;
-				ColorChanged?.Invoke (this, new ColorEventArgs () {
-					PreviousColor = new Color (prev),
-					Color = new Color (value),
-				});
-				SetNeedsDisplay ();
+	/// <summary>
+	/// Width of a color box
+	/// </summary>
+	public int BoxWidth {
+		get => _boxWidth;
+		set {
+			if (_boxWidth != value) {
+				_boxWidth = value;
+				SetNeedsLayout ();
 			}
 		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of <see cref="ColorPicker"/>.
-		/// </summary>
-		public ColorPicker ()
-		{
-			SetInitialProperties ();
+	/// <summary>
+	/// Height of a color box
+	/// </summary>
+	public int BoxHeight {
+		get => _boxHeight;
+		set {
+			if (_boxHeight != value) {
+				_boxHeight = value;
+				SetNeedsLayout ();
+			}
 		}
+	}
 
-		private void SetInitialProperties ()
-		{
-			CanFocus = true;
-			AddCommands ();
-			AddKeyBindings ();
-			LayoutStarted += (o, a) => {
-				Bounds = new Rect (Bounds.Location, new Size (_cols * BoxWidth, _rows * BoxHeight));
-			};
+	/// <summary>
+	/// Cursor for the selected color.
+	/// </summary>
+	public Point Cursor {
+		get => new (_selectColorIndex % _cols, _selectColorIndex / _cols);
+		set {
+			var colorIndex = value.Y * _cols + value.X;
+			SelectedColor = (ColorName)colorIndex;
 		}
+	}
 
-		/// <summary>
-		/// Add the commands.
-		/// </summary>
-		private void AddCommands ()
-		{
-			AddCommand (Command.Left, () => MoveLeft ());
-			AddCommand (Command.Right, () => MoveRight ());
-			AddCommand (Command.LineUp, () => MoveUp ());
-			AddCommand (Command.LineDown, () => MoveDown ());
+	/// <summary>
+	/// Selected color.
+	/// </summary>
+	public ColorName SelectedColor {
+		get => (ColorName)_selectColorIndex;
+		set {
+			var prev = (ColorName)_selectColorIndex;
+			_selectColorIndex = (int)value;
+			ColorChanged?.Invoke (this, new ColorEventArgs {
+				PreviousColor = new Color (prev),
+				Color = new Color (value)
+			});
+			SetNeedsDisplay ();
 		}
+	}
 
-		/// <summary>
-		/// Add the KeyBindinds.
-		/// </summary>
-		private void AddKeyBindings ()
-		{
-			KeyBindings.Add (KeyCode.CursorLeft, Command.Left);
-			KeyBindings.Add (KeyCode.CursorRight, Command.Right);
-			KeyBindings.Add (KeyCode.CursorUp, Command.LineUp);
-			KeyBindings.Add (KeyCode.CursorDown, Command.LineDown);
-		}
+	/// <summary>
+	/// Fired when a color is picked.
+	/// </summary>
+	public event EventHandler<ColorEventArgs> ColorChanged;
+
+	void SetInitialProperties ()
+	{
+		CanFocus = true;
+		AddCommands ();
+		AddKeyBindings ();
+		LayoutStarted += (o, a) => {
+			var thickness = GetFramesThickness ();
+			Width = _cols * BoxWidth + thickness.Vertical;
+			Height = _rows * BoxHeight + thickness.Horizontal;
+		};
+	}
 
-		///<inheritdoc/>
-		public override void OnDrawContent (Rect contentArea)
-		{
-			base.OnDrawContent (contentArea);
-
-			Driver.SetAttribute (HasFocus ? ColorScheme.Focus : GetNormalColor ());
-			var colorIndex = 0;
-
-			for (var y = 0; y < (Bounds.Height / BoxHeight); y++) {
-				for (var x = 0; x < (Bounds.Width / BoxWidth); x++) {
-					var foregroundColorIndex = y == 0 ? colorIndex + _cols : colorIndex - _cols;
-					Driver.SetAttribute (new Attribute ((ColorName)foregroundColorIndex, (ColorName)colorIndex));
-					var selected = x == Cursor.X && y == Cursor.Y;
-					DrawColorBox (x, y, selected);
-					colorIndex++;
-				}
-			}
-		}
+	/// <summary>
+	/// Add the commands.
+	/// </summary>
+	void AddCommands ()
+	{
+		AddCommand (Command.Left, () => MoveLeft ());
+		AddCommand (Command.Right, () => MoveRight ());
+		AddCommand (Command.LineUp, () => MoveUp ());
+		AddCommand (Command.LineDown, () => MoveDown ());
+	}
 
-		/// <summary>
-		/// Draw a box for one color.
-		/// </summary>
-		/// <param name="x">X location.</param>
-		/// <param name="y">Y location</param>
-		/// <param name="selected"></param>
-		private void DrawColorBox (int x, int y, bool selected)
-		{
-			var index = 0;
-
-			for (var zoomedY = 0; zoomedY < BoxHeight; zoomedY++) {
-				for (var zoomedX = 0; zoomedX < BoxWidth; zoomedX++) {
-					Move (x * BoxWidth + zoomedX, y * BoxHeight + zoomedY);
-					Driver.AddRune ((Rune)' ');
-					index++;
-				}
-			}
+	/// <summary>
+	/// Add the KeyBindinds.
+	/// </summary>
+	void AddKeyBindings ()
+	{
+		KeyBindings.Add (KeyCode.CursorLeft, Command.Left);
+		KeyBindings.Add (KeyCode.CursorRight, Command.Right);
+		KeyBindings.Add (KeyCode.CursorUp, Command.LineUp);
+		KeyBindings.Add (KeyCode.CursorDown, Command.LineDown);
+	}
 
-			if (selected) {
-				DrawFocusRect (new Rect (x * BoxWidth, y * BoxHeight, BoxWidth, BoxHeight));
+	///<inheritdoc/>
+	public override void OnDrawContent (Rect contentArea)
+	{
+		base.OnDrawContent (contentArea);
+
+		Driver.SetAttribute (HasFocus ? ColorScheme.Focus : GetNormalColor ());
+		var colorIndex = 0;
+
+		for (var y = 0; y < Bounds.Height / BoxHeight; y++) {
+			for (var x = 0; x < Bounds.Width / BoxWidth; x++) {
+				var foregroundColorIndex = y == 0 ? colorIndex + _cols : colorIndex - _cols;
+				Driver.SetAttribute (new Attribute ((ColorName)foregroundColorIndex, (ColorName)colorIndex));
+				var selected = x == Cursor.X && y == Cursor.Y;
+				DrawColorBox (x, y, selected);
+				colorIndex++;
 			}
 		}
+	}
 
-		private void DrawFocusRect (Rect rect)
-		{
-			var lc = new LineCanvas ();
-			if (rect.Width == 1) {
-				lc.AddLine (rect.Location, rect.Height, Orientation.Vertical, LineStyle.Dotted);
-			} else if (rect.Height == 1) {
-				lc.AddLine (rect.Location, rect.Width, Orientation.Horizontal, LineStyle.Dotted);
-			} else {
-				lc.AddLine (rect.Location, rect.Width, Orientation.Horizontal, LineStyle.Dotted);
-				lc.AddLine (new Point (rect.Location.X, rect.Location.Y + rect.Height - 1), rect.Width, Orientation.Horizontal, LineStyle.Dotted);
-
-				lc.AddLine (rect.Location, rect.Height, Orientation.Vertical, LineStyle.Dotted);
-				lc.AddLine (new Point (rect.Location.X + rect.Width - 1, rect.Location.Y), rect.Height, Orientation.Vertical, LineStyle.Dotted);
-			}
-			foreach (var p in lc.GetMap ()) {
-				AddRune (p.Key.X, p.Key.Y, p.Value);
+	/// <summary>
+	/// Draw a box for one color.
+	/// </summary>
+	/// <param name="x">X location.</param>
+	/// <param name="y">Y location</param>
+	/// <param name="selected"></param>
+	void DrawColorBox (int x, int y, bool selected)
+	{
+		var index = 0;
+
+		for (var zoomedY = 0; zoomedY < BoxHeight; zoomedY++) {
+			for (var zoomedX = 0; zoomedX < BoxWidth; zoomedX++) {
+				Move (x * BoxWidth + zoomedX, y * BoxHeight + zoomedY);
+				Driver.AddRune ((Rune)' ');
+				index++;
 			}
 		}
 
-		/// <summary>
-		/// Moves the selected item index to the previous column.
-		/// </summary>
-		/// <returns></returns>
-		public virtual bool MoveLeft ()
-		{
-			if (Cursor.X > 0) SelectedColor--;
-			return true;
+		if (selected) {
+			DrawFocusRect (new Rect (x * BoxWidth, y * BoxHeight, BoxWidth, BoxHeight));
 		}
+	}
 
-		/// <summary>
-		/// Moves the selected item index to the next column.
-		/// </summary>
-		/// <returns></returns>
-		public virtual bool MoveRight ()
-		{
-			if (Cursor.X < _cols - 1) SelectedColor++;
-			return true;
+	void DrawFocusRect (Rect rect)
+	{
+		var lc = new LineCanvas ();
+		if (rect.Width == 1) {
+			lc.AddLine (rect.Location, rect.Height, Orientation.Vertical, LineStyle.Dotted);
+		} else if (rect.Height == 1) {
+			lc.AddLine (rect.Location, rect.Width, Orientation.Horizontal, LineStyle.Dotted);
+		} else {
+			lc.AddLine (rect.Location, rect.Width, Orientation.Horizontal, LineStyle.Dotted);
+			lc.AddLine (new Point (rect.Location.X, rect.Location.Y + rect.Height - 1), rect.Width, Orientation.Horizontal, LineStyle.Dotted);
+
+			lc.AddLine (rect.Location, rect.Height, Orientation.Vertical, LineStyle.Dotted);
+			lc.AddLine (new Point (rect.Location.X + rect.Width - 1, rect.Location.Y), rect.Height, Orientation.Vertical, LineStyle.Dotted);
+		}
+		foreach (var p in lc.GetMap ()) {
+			AddRune (p.Key.X, p.Key.Y, p.Value);
 		}
+	}
 
-		/// <summary>
-		/// Moves the selected item index to the previous row.
-		/// </summary>
-		/// <returns></returns>
-		public virtual bool MoveUp ()
-		{
-			if (Cursor.Y > 0) SelectedColor -= _cols;
-			return true;
+	/// <summary>
+	/// Moves the selected item index to the previous column.
+	/// </summary>
+	/// <returns></returns>
+	public virtual bool MoveLeft ()
+	{
+		if (Cursor.X > 0) {
+			SelectedColor--;
+		}
+		return true;
+	}
+
+	/// <summary>
+	/// Moves the selected item index to the next column.
+	/// </summary>
+	/// <returns></returns>
+	public virtual bool MoveRight ()
+	{
+		if (Cursor.X < _cols - 1) {
+			SelectedColor++;
 		}
+		return true;
+	}
 
-		/// <summary>
-		/// Moves the selected item index to the next row.
-		/// </summary>
-		/// <returns></returns>
-		public virtual bool MoveDown ()
-		{
-			if (Cursor.Y < _rows - 1) SelectedColor += _cols;
-			return true;
+	/// <summary>
+	/// Moves the selected item index to the previous row.
+	/// </summary>
+	/// <returns></returns>
+	public virtual bool MoveUp ()
+	{
+		if (Cursor.Y > 0) {
+			SelectedColor -= _cols;
 		}
+		return true;
+	}
 
-		///<inheritdoc/>
-		public override bool MouseEvent (MouseEvent me)
-		{
-			if (!me.Flags.HasFlag (MouseFlags.Button1Clicked) || !CanFocus) {
-				return false;
-			}
+	/// <summary>
+	/// Moves the selected item index to the next row.
+	/// </summary>
+	/// <returns></returns>
+	public virtual bool MoveDown ()
+	{
+		if (Cursor.Y < _rows - 1) {
+			SelectedColor += _cols;
+		}
+		return true;
+	}
 
-			SetFocus ();
-			if (me.X > Bounds.Width || me.Y > Bounds.Height) {
-				return true;
-			}
-			Cursor = new Point ((me.X ) / _boxWidth, (me.Y) / _boxHeight);
+	///<inheritdoc/>
+	public override bool MouseEvent (MouseEvent me)
+	{
+		if (!me.Flags.HasFlag (MouseFlags.Button1Clicked) || !CanFocus) {
+			return false;
+		}
 
+		SetFocus ();
+		if (me.X > Bounds.Width || me.Y > Bounds.Height) {
 			return true;
 		}
+		Cursor = new Point (me.X / _boxWidth, me.Y / _boxHeight);
 
-		///<inheritdoc/>
-		public override bool OnEnter (View view)
-		{
-			Application.Driver.SetCursorVisibility (CursorVisibility.Invisible);
+		return true;
+	}
 
-			return base.OnEnter (view);
-		}
+	///<inheritdoc/>
+	public override bool OnEnter (View view)
+	{
+		Application.Driver.SetCursorVisibility (CursorVisibility.Invisible);
+
+		return base.OnEnter (view);
 	}
-}
+}

Terminal.Gui/Views/ComboBox.cs

@@ -241,7 +241,7 @@ public class ComboBox : View {
 	public ComboBox (string text) : base ()
 	{
 		_search = new TextField ("");
-		_listview = new ComboListView (this, HideDropdownListOnClick) { LayoutStyle = LayoutStyle.Computed, CanFocus = true, TabStop = false };
+		_listview = new ComboListView (this, HideDropdownListOnClick) { CanFocus = true, TabStop = false };
 
 		SetInitialProperties ();
 		Text = text;
@@ -255,7 +255,7 @@ public class ComboBox : View {
 	public ComboBox (Rect rect, IList source) : base (rect)
 	{
 		_search = new TextField ("") { Width = rect.Width };
-		_listview = new ComboListView (this, rect, source, HideDropdownListOnClick) { LayoutStyle = LayoutStyle.Computed, ColorScheme = Colors.Base };
+		_listview = new ComboListView (this, rect, source, HideDropdownListOnClick) { ColorScheme = Colors.Base };
 
 		SetInitialProperties ();
 		SetSource (source);
@@ -268,7 +268,7 @@ public class ComboBox : View {
 	public ComboBox (IList source) : this (string.Empty)
 	{
 		_search = new TextField ("");
-		_listview = new ComboListView (this, source, HideDropdownListOnClick) { LayoutStyle = LayoutStyle.Computed, ColorScheme = Colors.Base };
+		_listview = new ComboListView (this, source, HideDropdownListOnClick) { ColorScheme = Colors.Base };
 
 		SetInitialProperties ();
 		SetSource (source);

Terminal.Gui/Views/FileDialog.cs

@@ -1,1536 +1,1500 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Text;
 using Terminal.Gui.Resources;
-using static Terminal.Gui.ConfigurationManager;
 
-namespace Terminal.Gui {
+namespace Terminal.Gui;
+
+/// <summary>
+/// Modal dialog for selecting files/directories. Has auto-complete and expandable
+/// navigation pane (Recent, Root drives etc).
+/// </summary>
+public class FileDialog : Dialog {
 	/// <summary>
-	/// Modal dialog for selecting files/directories. Has auto-complete and expandable
-	/// navigation pane (Recent, Root drives etc).
+	/// Gets the Path separators for the operating system
 	/// </summary>
-	public partial class FileDialog : Dialog {
+	internal static char [] Separators = {
+		System.IO.Path.AltDirectorySeparatorChar,
+		System.IO.Path.DirectorySeparatorChar
+	};
 
-		/// <summary>
-		/// Gets settings for controlling how visual elements behave.  Style changes should
-		/// be made before the <see cref="Dialog"/> is loaded and shown to the user for the
-		/// first time.
-		/// </summary>
-		public FileDialogStyle Style { get; }
+	/// <summary>
+	/// Characters to prevent entry into <see cref="tbPath"/>. Note that this is not using
+	/// <see cref="System.IO.Path.GetInvalidFileNameChars"/> because we do want to allow directory
+	/// separators, arrow keys etc.
+	/// </summary>
+	static readonly char [] badChars = {
+		'"', '<', '>', '|', '*', '?'
+	};
 
-		/// <summary>
-		/// The maximum number of results that will be collected
-		/// when searching before stopping.
-		/// </summary>
-		/// <remarks>
-		/// This prevents performance issues e.g. when searching
-		/// root of file system for a common letter (e.g. 'e').
-		/// </remarks>
-		[SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
-		public static int MaxSearchResults { get; set; } = 10000;
+	Dictionary<IDirectoryInfo, string> _treeRoots = new ();
+	MenuBarItem allowedTypeMenu;
+	MenuBar allowedTypeMenuBar;
+	MenuItem [] allowedTypeMenuItems;
+	readonly Button btnBack;
+	readonly Button btnCancel;
+	readonly Button btnForward;
+	readonly Button btnOk;
+	readonly Button btnToggleSplitterCollapse;
+	readonly Button btnUp;
 
-		/// <summary>
-		/// True if the file/folder must exist already to be selected.
-		/// This prevents user from entering the name of something that
-		/// doesn't exist. Defaults to false.
-		/// </summary>
-		public bool MustExist { get; set; }
+	int currentSortColumn;
 
-		/// <summary>
-		/// Gets the Path separators for the operating system
-		/// </summary>
-		internal static char [] Separators = new []
-		{
-			System.IO.Path.AltDirectorySeparatorChar,
-			System.IO.Path.DirectorySeparatorChar,
-		};
+	bool currentSortIsAsc = true;
 
-		/// <summary>
-		/// Characters to prevent entry into <see cref="tbPath"/>. Note that this is not using
-		/// <see cref="System.IO.Path.GetInvalidFileNameChars"/> because we do want to allow directory
-		/// separators, arrow keys etc.
-		/// </summary>
-		private static char [] badChars = new []
-		{
-			'"','<','>','|','*','?',
-		};
+	bool disposed;
+	string feedback;
+	readonly IFileSystem fileSystem;
 
-		/// <summary>
-		/// The UI selected <see cref="IAllowedType"/> from combo box. May be null.
-		/// </summary>
-		public IAllowedType CurrentFilter { get; private set; }
+	readonly FileDialogHistory history;
+	bool loaded;
 
-		private bool pushingState = false;
-		private bool loaded = false;
+	/// <summary>
+	/// Locking object for ensuring only a single <see cref="SearchState"/> executes at once.
+	/// </summary>
+	internal object onlyOneSearchLock = new ();
 
-		/// <summary>
-		/// Gets the currently open directory and known children presented in the dialog.
-		/// </summary>
-		internal FileDialogState State { get; private set; }
+	bool pushingState;
+	readonly SpinnerView spinnerView;
+	readonly TileView splitContainer;
 
-		/// <summary>
-		/// Locking object for ensuring only a single <see cref="SearchState"/> executes at once.
-		/// </summary>
-		internal object onlyOneSearchLock = new object ();
-
-		private bool disposed = false;
-		private IFileSystem fileSystem;
-		private TextField tbPath;
-
-		private FileDialogHistory history;
-
-		private TableView tableView;
-		private TreeView<IFileSystemInfo> treeView;
-		private TileView splitContainer;
-		private Button btnOk;
-		private Button btnCancel;
-		private Button btnToggleSplitterCollapse;
-		private Button btnForward;
-		private Button btnBack;
-		private Button btnUp;
-		private string feedback;
-		private TextField tbFind;
-		private SpinnerView spinnerView;
-		private MenuBar allowedTypeMenuBar;
-		private MenuBarItem allowedTypeMenu;
-		private MenuItem [] allowedTypeMenuItems;
-
-		private int currentSortColumn;
-
-		private bool currentSortIsAsc = true;
-		private Dictionary<IDirectoryInfo, string> _treeRoots = new Dictionary<IDirectoryInfo, string> ();
+	readonly TableView tableView;
+	readonly TextField tbFind;
+	readonly TextField tbPath;
+	readonly TreeView<IFileSystemInfo> treeView;
 
-		/// <summary>
-		/// Event fired when user attempts to confirm a selection (or multi selection).
-		/// Allows you to cancel the selection or undertake alternative behavior e.g.
-		/// open a dialog "File already exists, Overwrite? yes/no".
-		/// </summary>
-		public event EventHandler<FilesSelectedEventArgs> FilesSelected;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="FileDialog"/> class.
+	/// </summary>
+	public FileDialog () : this (new FileSystem ()) { }
 
-		/// <summary>
-		/// Gets or sets behavior of the <see cref="FileDialog"/> when the user attempts
-		/// to delete a selected file(s).  Set to null to prevent deleting.
-		/// </summary>
-		/// <remarks>Ensure you use a try/catch block with appropriate
-		/// error handling (e.g. showing a <see cref="MessageBox"/></remarks>
-		public IFileOperations FileOperationsHandler { get; set; } = new DefaultFileOperations ();
+	/// <summary>
+	/// Initializes a new instance of the <see cref="FileDialog"/> class with
+	/// a custom <see cref="IFileSystem"/>.
+	/// </summary>
+	/// <remarks>This overload is mainly useful for testing.</remarks>
+	public FileDialog (IFileSystem fileSystem)
+	{
+		this.fileSystem = fileSystem;
+		Style = new FileDialogStyle (fileSystem);
+
+		btnOk = new Button (Style.OkButtonText) {
+			Y = Pos.AnchorEnd (1),
+			X = Pos.Function (CalculateOkButtonPosX),
+			IsDefault = true
+		};
+		btnOk.Clicked += (s, e) => Accept (true);
+		btnOk.KeyDown += (s, k) => {
+			NavigateIf (k, KeyCode.CursorLeft, btnCancel);
+			NavigateIf (k, KeyCode.CursorUp, tableView);
+		};
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="FileDialog"/> class.
-		/// </summary>
-		public FileDialog () : this (new FileSystem ())
-		{
+		btnCancel = new Button (Strings.btnCancel) {
+			Y = Pos.AnchorEnd (1),
+			X = Pos.Right (btnOk) + 1
+		};
+		btnCancel.KeyDown += (s, k) => {
+			NavigateIf (k, KeyCode.CursorLeft, btnToggleSplitterCollapse);
+			NavigateIf (k, KeyCode.CursorUp, tableView);
+			NavigateIf (k, KeyCode.CursorRight, btnOk);
+		};
+		btnCancel.Clicked += (s, e) => {
+			Application.RequestStop ();
+		};
 
-		}
+		btnUp = new Button { X = 0, Y = 1, NoPadding = true };
+		btnUp.Text = GetUpButtonText ();
+		btnUp.Clicked += (s, e) => history.Up ();
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="FileDialog"/> class with
-		/// a custom <see cref="IFileSystem"/>.
-		/// </summary>
-		/// <remarks>This overload is mainly useful for testing.</remarks>
-		public FileDialog (IFileSystem fileSystem)
-		{
-			this.fileSystem = fileSystem;
-			Style = new FileDialogStyle (fileSystem);
+		btnBack = new Button { X = Pos.Right (btnUp) + 1, Y = 1, NoPadding = true };
+		btnBack.Text = GetBackButtonText ();
+		btnBack.Clicked += (s, e) => history.Back ();
 
-			this.btnOk = new Button (Style.OkButtonText) {
-				Y = Pos.AnchorEnd (1),
-				X = Pos.Function (CalculateOkButtonPosX),
-				IsDefault = true
-			};
-			this.btnOk.Clicked += (s, e) => this.Accept (true);
-			this.btnOk.KeyDown += (s, k) => {
-				this.NavigateIf (k, KeyCode.CursorLeft, this.btnCancel);
-				this.NavigateIf (k, KeyCode.CursorUp, this.tableView);
-			};
+		btnForward = new Button { X = Pos.Right (btnBack) + 1, Y = 1, NoPadding = true };
+		btnForward.Text = GetForwardButtonText ();
+		btnForward.Clicked += (s, e) => history.Forward ();
 
-			this.btnCancel = new Button (Strings.btnCancel) {
-				Y = Pos.AnchorEnd (1),
-				X = Pos.Right (btnOk) + 1
-			};
-			this.btnCancel.KeyDown += (s, k) => {
-				this.NavigateIf (k, KeyCode.CursorLeft, this.btnToggleSplitterCollapse);
-				this.NavigateIf (k, KeyCode.CursorUp, this.tableView);
-				this.NavigateIf (k, KeyCode.CursorRight, this.btnOk);
-			};
-			this.btnCancel.Clicked += (s, e) => {
-				Application.RequestStop ();
-			};
+		tbPath = new TextField {
+			Width = Dim.Fill (),
+			CaptionColor = new Color (Color.Black)
+		};
+		tbPath.KeyDown += (s, k) => {
 
-			this.btnUp = new Button () { X = 0, Y = 1, NoPadding = true };
-			btnUp.Text = GetUpButtonText ();
-			this.btnUp.Clicked += (s, e) => this.history.Up ();
+			ClearFeedback ();
 
-			this.btnBack = new Button () { X = Pos.Right (btnUp) + 1, Y = 1, NoPadding = true };
-			btnBack.Text = GetBackButtonText ();
-			this.btnBack.Clicked += (s, e) => this.history.Back ();
+			AcceptIf (k, KeyCode.Enter);
 
-			this.btnForward = new Button () { X = Pos.Right (btnBack) + 1, Y = 1, NoPadding = true };
-			btnForward.Text = GetForwardButtonText ();
-			this.btnForward.Clicked += (s, e) => this.history.Forward ();
+			SuppressIfBadChar (k);
+		};
 
-			this.tbPath = new TextField {
-				Width = Dim.Fill (0),
-				CaptionColor = new Color (Color.Black)
-			};
-			this.tbPath.KeyDown += (s, k) => {
+		tbPath.Autocomplete = new AppendAutocomplete (tbPath);
+		tbPath.Autocomplete.SuggestionGenerator = new FilepathSuggestionGenerator ();
 
-				ClearFeedback ();
+		splitContainer = new TileView {
+			X = 0,
+			Y = 2,
+			Width = Dim.Fill (),
+			Height = Dim.Fill (1)
+		};
 
-				this.AcceptIf (k, KeyCode.Enter);
+		Initialized += (s, e) => {
+			splitContainer.SetSplitterPos (0, 30);
+			splitContainer.Tiles.ElementAt (0).ContentView.Visible = false;
+		};
+		//			this.splitContainer.Border.BorderStyle = BorderStyle.None;
 
-				this.SuppressIfBadChar (k);
-			};
+		tableView = new TableView {
+			Width = Dim.Fill (),
+			Height = Dim.Fill (),
+			FullRowSelect = true,
+			CollectionNavigator = new FileDialogCollectionNavigator (this)
+		};
+		tableView.KeyBindings.Add (KeyCode.Space, Command.ToggleChecked);
+		tableView.MouseClick += OnTableViewMouseClick;
+		tableView.Style.InvertSelectedCellFirstCharacter = true;
+		Style.TableStyle = tableView.Style;
 
-			tbPath.Autocomplete = new AppendAutocomplete (tbPath);
-			tbPath.Autocomplete.SuggestionGenerator = new FilepathSuggestionGenerator ();
+		var nameStyle = Style.TableStyle.GetOrCreateColumnStyle (0);
+		nameStyle.MinWidth = 10;
+		nameStyle.ColorGetter = ColorGetter;
 
-			this.splitContainer = new TileView () {
-				X = 0,
-				Y = 2,
-				Width = Dim.Fill (0),
-				Height = Dim.Fill (1),
-			};
-			
-			Initialized += (s, e) => {
-				this.splitContainer.SetSplitterPos (0, 30);
-				this.splitContainer.Tiles.ElementAt (0).ContentView.Visible = false;
-			};
-			//			this.splitContainer.Border.BorderStyle = BorderStyle.None;
+		var sizeStyle = Style.TableStyle.GetOrCreateColumnStyle (1);
+		sizeStyle.MinWidth = 10;
+		sizeStyle.ColorGetter = ColorGetter;
 
-			this.tableView = new TableView {
-				Width = Dim.Fill (),
-				Height = Dim.Fill (),
-				FullRowSelect = true,
-				CollectionNavigator = new FileDialogCollectionNavigator (this)
-			};
-			this.tableView.KeyBindings.Add (KeyCode.Space, Command.ToggleChecked);
-			this.tableView.MouseClick += OnTableViewMouseClick;
-			tableView.Style.InvertSelectedCellFirstCharacter = true;
-			Style.TableStyle = tableView.Style;
-
-			var nameStyle = Style.TableStyle.GetOrCreateColumnStyle (0);
-			nameStyle.MinWidth = 10;
-			nameStyle.ColorGetter = this.ColorGetter;
-
-			var sizeStyle = Style.TableStyle.GetOrCreateColumnStyle (1);
-			sizeStyle.MinWidth = 10;
-			sizeStyle.ColorGetter = this.ColorGetter;
-
-			var dateModifiedStyle = Style.TableStyle.GetOrCreateColumnStyle (2);
-			dateModifiedStyle.MinWidth = 30;
-			dateModifiedStyle.ColorGetter = this.ColorGetter;
-
-			var typeStyle = Style.TableStyle.GetOrCreateColumnStyle (3);
-			typeStyle.MinWidth = 6;
-			typeStyle.ColorGetter = this.ColorGetter;
-
-			this.tableView.KeyDown += (s, k) => {
-				if (this.tableView.SelectedRow <= 0) {
-					this.NavigateIf (k, KeyCode.CursorUp, this.tbPath);
-				}
-				if (this.tableView.SelectedRow == this.tableView.Table.Rows - 1) {
-					this.NavigateIf (k, KeyCode.CursorDown, this.btnToggleSplitterCollapse);
-				}
+		var dateModifiedStyle = Style.TableStyle.GetOrCreateColumnStyle (2);
+		dateModifiedStyle.MinWidth = 30;
+		dateModifiedStyle.ColorGetter = ColorGetter;
 
-				if (splitContainer.Tiles.First ().ContentView.Visible && tableView.SelectedColumn == 0) {
-					this.NavigateIf (k, KeyCode.CursorLeft, this.treeView);
-				}
+		var typeStyle = Style.TableStyle.GetOrCreateColumnStyle (3);
+		typeStyle.MinWidth = 6;
+		typeStyle.ColorGetter = ColorGetter;
 
-				if (k.Handled) {
-					return;
-				}
-			};
+		tableView.KeyDown += (s, k) => {
+			if (tableView.SelectedRow <= 0) {
+				NavigateIf (k, KeyCode.CursorUp, tbPath);
+			}
+			if (tableView.SelectedRow == tableView.Table.Rows - 1) {
+				NavigateIf (k, KeyCode.CursorDown, btnToggleSplitterCollapse);
+			}
 
-			this.treeView = new TreeView<IFileSystemInfo> () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill (),
-			};
+			if (splitContainer.Tiles.First ().ContentView.Visible && tableView.SelectedColumn == 0) {
+				NavigateIf (k, KeyCode.CursorLeft, treeView);
+			}
 
-			var fileDialogTreeBuilder = new FileSystemTreeBuilder ();
-			this.treeView.TreeBuilder = fileDialogTreeBuilder;
-			this.treeView.AspectGetter = this.AspectGetter;
-			this.Style.TreeStyle = treeView.Style;
+			if (k.Handled) { }
+		};
 
-			this.treeView.SelectionChanged += this.TreeView_SelectionChanged;
+		treeView = new TreeView<IFileSystemInfo> {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
 
-			this.splitContainer.Tiles.ElementAt (0).ContentView.Add (this.treeView);
-			this.splitContainer.Tiles.ElementAt (1).ContentView.Add (this.tableView);
+		var fileDialogTreeBuilder = new FileSystemTreeBuilder ();
+		treeView.TreeBuilder = fileDialogTreeBuilder;
+		treeView.AspectGetter = AspectGetter;
+		Style.TreeStyle = treeView.Style;
 
-			this.btnToggleSplitterCollapse = new Button (GetToggleSplitterText (false)) {
-				Y = Pos.AnchorEnd (1),
-			};
-			this.btnToggleSplitterCollapse.Clicked += (s, e) => {
-				var tile = this.splitContainer.Tiles.ElementAt (0);
+		treeView.SelectionChanged += TreeView_SelectionChanged;
 
-				var newState = !tile.ContentView.Visible;
-				tile.ContentView.Visible = newState;
-				this.btnToggleSplitterCollapse.Text = GetToggleSplitterText (newState);
-				this.LayoutSubviews ();
-			};
+		splitContainer.Tiles.ElementAt (0).ContentView.Add (treeView);
+		splitContainer.Tiles.ElementAt (1).ContentView.Add (tableView);
 
-			tbFind = new TextField {
-				X = Pos.Right (this.btnToggleSplitterCollapse) + 1,
-				CaptionColor = new Color (Color.Black),
-				Width = 30,
-				Y = Pos.AnchorEnd (1),
-				HotKey = KeyCode.F | KeyCode.AltMask
-			};
-			spinnerView = new SpinnerView () {
-				X = Pos.Right (tbFind) + 1,
-				Y = Pos.AnchorEnd (1),
-				Visible = false,
-			};
+		btnToggleSplitterCollapse = new Button (GetToggleSplitterText (false)) {
+			Y = Pos.AnchorEnd (1)
+		};
+		btnToggleSplitterCollapse.Clicked += (s, e) => {
+			var tile = splitContainer.Tiles.ElementAt (0);
 
-			tbFind.TextChanged += (s, o) => RestartSearch ();
-			tbFind.KeyDown += (s, o) => {
-				if (o.KeyCode == KeyCode.Enter) {
-					RestartSearch ();
-					o.Handled = true;
-				}
+			var newState = !tile.ContentView.Visible;
+			tile.ContentView.Visible = newState;
+			btnToggleSplitterCollapse.Text = GetToggleSplitterText (newState);
+			LayoutSubviews ();
+		};
 
-				if (o.KeyCode == KeyCode.Esc) {
-					if (CancelSearch ()) {
-						o.Handled = true;
-					}
-				}
-				if (tbFind.CursorIsAtEnd ()) {
-					NavigateIf (o, KeyCode.CursorRight, btnCancel);
-				}
-				if (tbFind.CursorIsAtStart ()) {
-					NavigateIf (o, KeyCode.CursorLeft, btnToggleSplitterCollapse);
+		tbFind = new TextField {
+			X = Pos.Right (btnToggleSplitterCollapse) + 1,
+			CaptionColor = new Color (Color.Black),
+			Width = 30,
+			Y = Pos.AnchorEnd (1),
+			HotKey = KeyCode.F | KeyCode.AltMask
+		};
+		spinnerView = new SpinnerView {
+			X = Pos.Right (tbFind) + 1,
+			Y = Pos.AnchorEnd (1),
+			Visible = false
+		};
+
+		tbFind.TextChanged += (s, o) => RestartSearch ();
+		tbFind.KeyDown += (s, o) => {
+			if (o.KeyCode == KeyCode.Enter) {
+				RestartSearch ();
+				o.Handled = true;
+			}
+
+			if (o.KeyCode == KeyCode.Esc) {
+				if (CancelSearch ()) {
+					o.Handled = true;
 				}
-			};
+			}
+			if (tbFind.CursorIsAtEnd ()) {
+				NavigateIf (o, KeyCode.CursorRight, btnCancel);
+			}
+			if (tbFind.CursorIsAtStart ()) {
+				NavigateIf (o, KeyCode.CursorLeft, btnToggleSplitterCollapse);
+			}
+		};
 
-			this.tableView.Style.ShowHorizontalHeaderOverline = true;
-			this.tableView.Style.ShowVerticalCellLines = true;
-			this.tableView.Style.ShowVerticalHeaderLines = true;
-			this.tableView.Style.AlwaysShowHeaders = true;
-			this.tableView.Style.ShowHorizontalHeaderUnderline = true;
-			this.tableView.Style.ShowHorizontalScrollIndicators = true;
+		tableView.Style.ShowHorizontalHeaderOverline = true;
+		tableView.Style.ShowVerticalCellLines = true;
+		tableView.Style.ShowVerticalHeaderLines = true;
+		tableView.Style.AlwaysShowHeaders = true;
+		tableView.Style.ShowHorizontalHeaderUnderline = true;
+		tableView.Style.ShowHorizontalScrollIndicators = true;
 
-			this.history = new FileDialogHistory (this);
+		history = new FileDialogHistory (this);
 
-			this.tbPath.TextChanged += (s, e) => this.PathChanged ();
+		tbPath.TextChanged += (s, e) => PathChanged ();
 
-			this.tableView.CellActivated += this.CellActivate;
-			this.tableView.KeyUp += (s, k) => k.Handled = this.TableView_KeyUp (k);
-			this.tableView.SelectedCellChanged += this.TableView_SelectedCellChanged;
+		tableView.CellActivated += CellActivate;
+		tableView.KeyUp += (s, k) => k.Handled = TableView_KeyUp (k);
+		tableView.SelectedCellChanged += TableView_SelectedCellChanged;
 
-			this.tableView.KeyBindings.Add (KeyCode.Home, Command.TopHome);
-			this.tableView.KeyBindings.Add (KeyCode.End, Command.BottomEnd);
-			this.tableView.KeyBindings.Add (KeyCode.Home | KeyCode.ShiftMask, Command.TopHomeExtend);
-			this.tableView.KeyBindings.Add (KeyCode.End | KeyCode.ShiftMask, Command.BottomEndExtend);
+		tableView.KeyBindings.Add (KeyCode.Home, Command.TopHome);
+		tableView.KeyBindings.Add (KeyCode.End, Command.BottomEnd);
+		tableView.KeyBindings.Add (KeyCode.Home | KeyCode.ShiftMask, Command.TopHomeExtend);
+		tableView.KeyBindings.Add (KeyCode.End | KeyCode.ShiftMask, Command.BottomEndExtend);
 
-			this.treeView.KeyDown += (s, k) => {
+		treeView.KeyDown += (s, k) => {
 
-				var selected = treeView.SelectedObject;
-				if (selected != null) {
-					if (!treeView.CanExpand (selected) || treeView.IsExpanded (selected)) {
-						this.NavigateIf (k, KeyCode.CursorRight, this.tableView);
-					} else
-					if (treeView.GetObjectRow (selected) == 0) {
-						this.NavigateIf (k, KeyCode.CursorUp, this.tbPath);
-					}
+			var selected = treeView.SelectedObject;
+			if (selected != null) {
+				if (!treeView.CanExpand (selected) || treeView.IsExpanded (selected)) {
+					NavigateIf (k, KeyCode.CursorRight, tableView);
+				} else if (treeView.GetObjectRow (selected) == 0) {
+					NavigateIf (k, KeyCode.CursorUp, tbPath);
 				}
+			}
 
-				if (k.Handled) {
-					return;
-				}
+			if (k.Handled) {
+				return;
+			}
 
-				k.Handled = this.TreeView_KeyDown (k);
+			k.Handled = TreeView_KeyDown (k);
 
-			};
+		};
 
-			this.AllowsMultipleSelection = false;
+		AllowsMultipleSelection = false;
+
+		UpdateNavigationVisibility ();
+
+		// Determines tab order
+		Add (btnToggleSplitterCollapse);
+		Add (tbFind);
+		Add (spinnerView);
+		Add (btnOk);
+		Add (btnCancel);
+		Add (btnUp);
+		Add (btnBack);
+		Add (btnForward);
+		Add (tbPath);
+		Add (splitContainer);
+	}
 
-			this.UpdateNavigationVisibility ();
+	/// <summary>
+	/// Gets settings for controlling how visual elements behave.  Style changes should
+	/// be made before the <see cref="Dialog"/> is loaded and shown to the user for the
+	/// first time.
+	/// </summary>
+	public FileDialogStyle Style { get; }
 
-			// Determines tab order
-			this.Add (this.btnToggleSplitterCollapse);
-			this.Add (this.tbFind);
-			this.Add (this.spinnerView);
-			this.Add (this.btnOk);
-			this.Add (this.btnCancel);
-			this.Add (this.btnUp);
-			this.Add (this.btnBack);
-			this.Add (this.btnForward);
-			this.Add (this.tbPath);
-			this.Add (this.splitContainer);
-		}
+	/// <summary>
+	/// The maximum number of results that will be collected
+	/// when searching before stopping.
+	/// </summary>
+	/// <remarks>
+	/// This prevents performance issues e.g. when searching
+	/// root of file system for a common letter (e.g. 'e').
+	/// </remarks>
+	[SerializableConfigurationProperty (Scope = typeof (SettingsScope))]
+	public static int MaxSearchResults { get; set; } = 10000;
 
-		private int CalculateOkButtonPosX ()
-		{
-			return this.Bounds.Width
-				- btnOk.Bounds.Width
-				- btnCancel.Bounds.Width
-				- 1
-				// TODO: Fiddle factor, seems the Bounds are wrong for someone
-				- 2;
-		}
+	/// <summary>
+	/// True if the file/folder must exist already to be selected.
+	/// This prevents user from entering the name of something that
+	/// doesn't exist. Defaults to false.
+	/// </summary>
+	public bool MustExist { get; set; }
 
-		private string AspectGetter (object o)
-		{
-			var fsi = (IFileSystemInfo)o;
+	/// <summary>
+	/// The UI selected <see cref="IAllowedType"/> from combo box. May be null.
+	/// </summary>
+	public IAllowedType CurrentFilter { get; private set; }
 
-			if (o is IDirectoryInfo dir && _treeRoots.ContainsKey (dir)) {
+	/// <summary>
+	/// Gets the currently open directory and known children presented in the dialog.
+	/// </summary>
+	internal FileDialogState State { get; private set; }
 
-				// Directory has a special name e.g. 'Pictures'
-				return _treeRoots [dir];
-			}
+	/// <summary>
+	/// Gets or sets behavior of the <see cref="FileDialog"/> when the user attempts
+	/// to delete a selected file(s).  Set to null to prevent deleting.
+	/// </summary>
+	/// <remarks>
+	/// Ensure you use a try/catch block with appropriate
+	/// error handling (e.g. showing a <see cref="MessageBox"/>
+	/// </remarks>
+	public IFileOperations FileOperationsHandler { get; set; } = new DefaultFileOperations ();
+
+	/// <summary>
+	/// Gets or Sets which <see cref="System.IO.FileSystemInfo"/> type can be selected.
+	/// Defaults to <see cref="OpenMode.Mixed"/> (i.e. <see cref="DirectoryInfo"/> or
+	/// <see cref="FileInfo"/>).
+	/// </summary>
+	public OpenMode OpenMode { get; set; } = OpenMode.Mixed;
 
-			return (Style.IconProvider.GetIconWithOptionalSpace (fsi) + fsi.Name).Trim ();
+	/// <summary>
+	/// Gets or Sets the selected path in the dialog. This is the result that should
+	/// be used if <see cref="AllowsMultipleSelection"/> is off and <see cref="Canceled"/>
+	/// is true.
+	/// </summary>
+	public string Path {
+		get => tbPath.Text;
+		set {
+			tbPath.Text = value;
+			tbPath.MoveEnd ();
 		}
+	}
 
-		private void OnTableViewMouseClick (object sender, MouseEventEventArgs e)
-		{
-			var clickedCell = this.tableView.ScreenToCell (e.MouseEvent.X, e.MouseEvent.Y, out int? clickedCol);
+	/// <summary>
+	/// Defines how the dialog matches files/folders when using the search
+	/// box. Provide a custom implementation if you want to tailor how matching
+	/// is performed.
+	/// </summary>
+	public ISearchMatcher SearchMatcher { get; set; } = new DefaultSearchMatcher ();
 
-			if (clickedCol != null) {
-				if (e.MouseEvent.Flags.HasFlag (MouseFlags.Button1Clicked)) {
+	/// <summary>
+	/// Gets or Sets a value indicating whether to allow selecting
+	/// multiple existing files/directories. Defaults to false.
+	/// </summary>
+	public bool AllowsMultipleSelection {
+		get => tableView.MultiSelect;
+		set => tableView.MultiSelect = value;
+	}
 
-					// left click in a header
-					this.SortColumn (clickedCol.Value);
-				} else if (e.MouseEvent.Flags.HasFlag (MouseFlags.Button3Clicked)) {
+	/// <summary>
+	/// Gets or Sets a collection of file types that the user can/must select. Only applies
+	/// when <see cref="OpenMode"/> is <see cref="OpenMode.File"/> or <see cref="OpenMode.Mixed"/>.
+	/// </summary>
+	/// <remarks>
+	/// <see cref="AllowedTypeAny"/> adds the option to select any type (*.*). If this
+	/// collection is empty then any type is supported and no Types drop-down is shown.
+	/// </remarks>
+	public List<IAllowedType> AllowedTypes { get; set; } = new ();
 
-					// right click in a header
-					this.ShowHeaderContextMenu (clickedCol.Value, e);
-				}
-			} else {
-				if (clickedCell != null && e.MouseEvent.Flags.HasFlag (MouseFlags.Button3Clicked)) {
+	/// <summary>
+	/// Gets a value indicating whether the <see cref="FileDialog"/> was closed
+	/// without confirming a selection.
+	/// </summary>
+	public bool Canceled { get; private set; } = true;
 
-					// right click in rest of table
-					this.ShowCellContextMenu (clickedCell, e);
-				}
-			}
-		}
+	/// <summary>
+	/// Gets all files/directories selected or an empty collection
+	/// <see cref="AllowsMultipleSelection"/> is <see langword="false"/> or <see cref="Canceled"/>.
+	/// </summary>
+	/// <remarks>If selecting only a single file/directory then you should use <see cref="Path"/> instead.</remarks>
+	public IReadOnlyList<string> MultiSelected { get; private set; }
+		= Enumerable.Empty<string> ().ToList ().AsReadOnly ();
 
-		private string GetForwardButtonText ()
-		{
-			return "-" + CM.Glyphs.RightArrow;
-		}
+	/// <summary>
+	/// Event fired when user attempts to confirm a selection (or multi selection).
+	/// Allows you to cancel the selection or undertake alternative behavior e.g.
+	/// open a dialog "File already exists, Overwrite? yes/no".
+	/// </summary>
+	public event EventHandler<FilesSelectedEventArgs> FilesSelected;
 
-		private string GetBackButtonText ()
-		{
-			return CM.Glyphs.LeftArrow + "-";
+	int CalculateOkButtonPosX ()
+	{
+		if (!IsInitialized || !btnOk.IsInitialized || !btnCancel.IsInitialized) {
+			return 0;
 		}
+		return Bounds.Width -
+		       btnOk.Bounds.Width -
+		       btnCancel.Bounds.Width -
+		       1
+		       // TODO: Fiddle factor, seems the Bounds are wrong for someone
+		       -
+		       2;
+	}
 
-		private string GetUpButtonText ()
-		{
-			return Style.UseUnicodeCharacters ? "◭" : "▲";
-		}
+	string AspectGetter (object o)
+	{
+		var fsi = (IFileSystemInfo)o;
 
-		private string GetToggleSplitterText (bool isExpanded)
-		{
-			return isExpanded ?
-				new string ((char)CM.Glyphs.LeftArrow.Value, 2) :
-				new string ((char)CM.Glyphs.RightArrow.Value, 2);
+		if (o is IDirectoryInfo dir && _treeRoots.ContainsKey (dir)) {
+
+			// Directory has a special name e.g. 'Pictures'
+			return _treeRoots [dir];
 		}
 
-		private void Delete ()
-		{
-			var toDelete = GetFocusedFiles ();
+		return (Style.IconProvider.GetIconWithOptionalSpace (fsi) + fsi.Name).Trim ();
+	}
 
-			if (toDelete != null && FileOperationsHandler.Delete (toDelete)) {
-				RefreshState ();
-			}
-		}
+	void OnTableViewMouseClick (object sender, MouseEventEventArgs e)
+	{
+		var clickedCell = tableView.ScreenToCell (e.MouseEvent.X, e.MouseEvent.Y, out var clickedCol);
 
-		private void Rename ()
-		{
-			var toRename = GetFocusedFiles ();
+		if (clickedCol != null) {
+			if (e.MouseEvent.Flags.HasFlag (MouseFlags.Button1Clicked)) {
 
-			if (toRename?.Length == 1) {
-				var newNamed = FileOperationsHandler.Rename (this.fileSystem, toRename.Single ());
+				// left click in a header
+				SortColumn (clickedCol.Value);
+			} else if (e.MouseEvent.Flags.HasFlag (MouseFlags.Button3Clicked)) {
 
-				if (newNamed != null) {
-					RefreshState ();
-					RestoreSelection (newNamed);
-				}
+				// right click in a header
+				ShowHeaderContextMenu (clickedCol.Value, e);
 			}
-		}
-		private void New ()
-		{
-			if (State != null) {
-				var created = FileOperationsHandler.New (this.fileSystem, State.Directory);
-				if (created != null) {
-					RefreshState ();
-					RestoreSelection (created);
-				}
+		} else {
+			if (clickedCell != null && e.MouseEvent.Flags.HasFlag (MouseFlags.Button3Clicked)) {
+
+				// right click in rest of table
+				ShowCellContextMenu (clickedCell, e);
 			}
 		}
-		private IFileSystemInfo [] GetFocusedFiles ()
-		{
+	}
 
-			if (!tableView.HasFocus || !tableView.CanFocus || FileOperationsHandler == null) {
-				return null;
-			}
+	string GetForwardButtonText () => "-" + Glyphs.RightArrow;
 
-			tableView.EnsureValidSelection ();
+	string GetBackButtonText () => Glyphs.LeftArrow + "-";
 
-			if (tableView.SelectedRow < 0) {
-				return null;
-			}
+	string GetUpButtonText () => Style.UseUnicodeCharacters ? "◭" : "▲";
 
-			return tableView.GetAllSelectedCells ()
-				.Select (c => c.Y)
-				.Distinct ()
-				.Select (RowToStats)
-				.Where (s => !s.IsParent)
-				.Select (d => d.FileSystemInfo)
-				.ToArray ();
-		}
+	string GetToggleSplitterText (bool isExpanded) => isExpanded ?
+		new string ((char)Glyphs.LeftArrow.Value, 2) :
+		new string ((char)Glyphs.RightArrow.Value, 2);
 
+	void Delete ()
+	{
+		var toDelete = GetFocusedFiles ();
 
-//		/// <inheritdoc/>
-//		public override bool OnHotKey (KeyEventArgs keyEvent)
-//		{
-//#if BROKE_IN_2927
-//			// BUGBUG: Ctrl-F is forward in a TextField. 
-//			if (this.NavigateIf (keyEvent, Key.Alt | Key.F, this.tbFind)) {
-//				return true;
-//			}
-//#endif
+		if (toDelete != null && FileOperationsHandler.Delete (toDelete)) {
+			RefreshState ();
+		}
+	}
 
-//			ClearFeedback ();
+	void Rename ()
+	{
+		var toRename = GetFocusedFiles ();
 
-//			if (allowedTypeMenuBar != null &&
-//				keyEvent.ConsoleDriverKey == Key.Tab &&
-//				allowedTypeMenuBar.IsMenuOpen) {
-//				allowedTypeMenuBar.CloseMenu (false, false, false);
-//			}
+		if (toRename?.Length == 1) {
+			var newNamed = FileOperationsHandler.Rename (fileSystem, toRename.Single ());
 
-//			return base.OnHotKey (keyEvent);
-//		}
-		private void RestartSearch ()
-		{
-			if (disposed || State?.Directory == null) {
-				return;
+			if (newNamed != null) {
+				RefreshState ();
+				RestoreSelection (newNamed);
 			}
+		}
+	}
 
-			if (State is SearchState oldSearch) {
-				oldSearch.Cancel ();
+	void New ()
+	{
+		if (State != null) {
+			var created = FileOperationsHandler.New (fileSystem, State.Directory);
+			if (created != null) {
+				RefreshState ();
+				RestoreSelection (created);
 			}
+		}
+	}
 
-			// user is clearing search terms
-			if (tbFind.Text == null || tbFind.Text.Length == 0) {
-
-				// Wait for search cancellation (if any) to finish
-				// then push the current dir state
-				lock (onlyOneSearchLock) {
-					PushState (new FileDialogState (State.Directory, this), false);
-				}
-				return;
-			}
+	IFileSystemInfo [] GetFocusedFiles ()
+	{
 
-			PushState (new SearchState (State?.Directory, this, tbFind.Text), true);
+		if (!tableView.HasFocus || !tableView.CanFocus || FileOperationsHandler == null) {
+			return null;
 		}
 
-		/// <inheritdoc/>
-		protected override void Dispose (bool disposing)
-		{
-			disposed = true;
-			base.Dispose (disposing);
+		tableView.EnsureValidSelection ();
 
-			CancelSearch ();
+		if (tableView.SelectedRow < 0) {
+			return null;
 		}
 
-		private bool CancelSearch ()
-		{
-			if (State is SearchState search) {
-				return search.Cancel ();
-			}
+		return tableView.GetAllSelectedCells ()
+				.Select (c => c.Y)
+				.Distinct ()
+				.Select (RowToStats)
+				.Where (s => !s.IsParent)
+				.Select (d => d.FileSystemInfo)
+				.ToArray ();
+	}
 
-			return false;
+
+	//		/// <inheritdoc/>
+	//		public override bool OnHotKey (KeyEventArgs keyEvent)
+	//		{
+	//#if BROKE_IN_2927
+	//			// BUGBUG: Ctrl-F is forward in a TextField. 
+	//			if (this.NavigateIf (keyEvent, Key.Alt | Key.F, this.tbFind)) {
+	//				return true;
+	//			}
+	//#endif
+
+	//			ClearFeedback ();
+
+	//			if (allowedTypeMenuBar != null &&
+	//				keyEvent.ConsoleDriverKey == Key.Tab &&
+	//				allowedTypeMenuBar.IsMenuOpen) {
+	//				allowedTypeMenuBar.CloseMenu (false, false, false);
+	//			}
+
+	//			return base.OnHotKey (keyEvent);
+	//		}
+	void RestartSearch ()
+	{
+		if (disposed || State?.Directory == null) {
+			return;
 		}
 
-		private void ClearFeedback ()
-		{
-			feedback = null;
+		if (State is SearchState oldSearch) {
+			oldSearch.Cancel ();
 		}
 
-		/// <summary>
-		/// Gets or Sets which <see cref="System.IO.FileSystemInfo"/> type can be selected.
-		/// Defaults to <see cref="OpenMode.Mixed"/> (i.e. <see cref="DirectoryInfo"/> or
-		/// <see cref="FileInfo"/>).
-		/// </summary>
-		public OpenMode OpenMode { get; set; } = OpenMode.Mixed;
+		// user is clearing search terms
+		if (tbFind.Text == null || tbFind.Text.Length == 0) {
 
-		/// <summary>
-		/// Gets or Sets the selected path in the dialog. This is the result that should
-		/// be used if <see cref="AllowsMultipleSelection"/> is off and <see cref="Canceled"/>
-		/// is true.
-		/// </summary>
-		public string Path {
-			get => this.tbPath.Text;
-			set {
-				this.tbPath.Text = value;
-				this.tbPath.MoveEnd ();
+			// Wait for search cancellation (if any) to finish
+			// then push the current dir state
+			lock (onlyOneSearchLock) {
+				PushState (new FileDialogState (State.Directory, this), false);
 			}
+			return;
 		}
 
-		/// <summary>
-		/// Defines how the dialog matches files/folders when using the search
-		/// box. Provide a custom implementation if you want to tailor how matching
-		/// is performed.
-		/// </summary>
-		public ISearchMatcher SearchMatcher { get; set; } = new DefaultSearchMatcher ();
+		PushState (new SearchState (State?.Directory, this, tbFind.Text), true);
+	}
 
-		/// <summary>
-		/// Gets or Sets a value indicating whether to allow selecting 
-		/// multiple existing files/directories. Defaults to false.
-		/// </summary>
-		public bool AllowsMultipleSelection {
-			get => this.tableView.MultiSelect;
-			set => this.tableView.MultiSelect = value;
+	/// <inheritdoc/>
+	protected override void Dispose (bool disposing)
+	{
+		disposed = true;
+		base.Dispose (disposing);
+
+		CancelSearch ();
+	}
+
+	bool CancelSearch ()
+	{
+		if (State is SearchState search) {
+			return search.Cancel ();
 		}
 
-		/// <summary>
-		/// Gets or Sets a collection of file types that the user can/must select. Only applies
-		/// when <see cref="OpenMode"/> is <see cref="OpenMode.File"/> or <see cref="OpenMode.Mixed"/>.
-		/// </summary>
-		/// <remarks><see cref="AllowedTypeAny"/> adds the option to select any type (*.*). If this
-		/// collection is empty then any type is supported and no Types drop-down is shown.</remarks> 
-		public List<IAllowedType> AllowedTypes { get; set; } = new List<IAllowedType> ();
+		return false;
+	}
 
-		/// <summary>
-		/// Gets a value indicating whether the <see cref="FileDialog"/> was closed
-		/// without confirming a selection.
-		/// </summary>
-		public bool Canceled { get; private set; } = true;
+	void ClearFeedback () => feedback = null;
 
-		/// <summary>
-		/// Gets all files/directories selected or an empty collection
-		/// <see cref="AllowsMultipleSelection"/> is <see langword="false"/> or <see cref="Canceled"/>.
-		/// </summary>
-		/// <remarks>If selecting only a single file/directory then you should use <see cref="Path"/> instead.</remarks>
-		public IReadOnlyList<string> MultiSelected { get; private set; }
-			= Enumerable.Empty<string> ().ToList ().AsReadOnly ();
+	/// <inheritdoc/>
+	public override void OnDrawContent (Rect contentArea)
+	{
+		base.OnDrawContent (contentArea);
 
-		/// <inheritdoc/>
-		public override void OnDrawContent (Rect contentArea)
-		{
-			base.OnDrawContent (contentArea);
+		if (!string.IsNullOrWhiteSpace (feedback)) {
+			var feedbackWidth = feedback.EnumerateRunes ().Sum (c => c.GetColumns ());
+			var feedbackPadLeft = (Bounds.Width - feedbackWidth) / 2 - 1;
 
-			if (!string.IsNullOrWhiteSpace (feedback)) {
-				var feedbackWidth = feedback.EnumerateRunes ().Sum (c => c.GetColumns ());
-				var feedbackPadLeft = ((Bounds.Width - feedbackWidth) / 2) - 1;
+			feedbackPadLeft = Math.Min (Bounds.Width, feedbackPadLeft);
+			feedbackPadLeft = Math.Max (0, feedbackPadLeft);
 
-				feedbackPadLeft = Math.Min (Bounds.Width, feedbackPadLeft);
-				feedbackPadLeft = Math.Max (0, feedbackPadLeft);
+			var feedbackPadRight = Bounds.Width - (feedbackPadLeft + feedbackWidth + 2);
+			feedbackPadRight = Math.Min (Bounds.Width, feedbackPadRight);
+			feedbackPadRight = Math.Max (0, feedbackPadRight);
 
-				var feedbackPadRight = Bounds.Width - (feedbackPadLeft + feedbackWidth + 2);
-				feedbackPadRight = Math.Min (Bounds.Width, feedbackPadRight);
-				feedbackPadRight = Math.Max (0, feedbackPadRight);
+			Move (0, Bounds.Height / 2);
 
-				Move (0, Bounds.Height / 2);
+			Driver.SetAttribute (new Attribute (Color.Red, ColorScheme.Normal.Background));
+			Driver.AddStr (new string (' ', feedbackPadLeft));
+			Driver.AddStr (feedback);
+			Driver.AddStr (new string (' ', feedbackPadRight));
+		}
+	}
 
-				Driver.SetAttribute (new Attribute (Color.Red, this.ColorScheme.Normal.Background));
-				Driver.AddStr (new string (' ', feedbackPadLeft));
-				Driver.AddStr (feedback);
-				Driver.AddStr (new string (' ', feedbackPadRight));
-			}
+	/// <inheritdoc/>
+	public override void OnLoaded ()
+	{
+		base.OnLoaded ();
+		if (loaded) {
+			return;
 		}
+		loaded = true;
 
-		/// <inheritdoc/>
-		public override void OnLoaded ()
-		{
-			base.OnLoaded ();
-			if (loaded) {
-				return;
-			}
-			loaded = true;
+		// May have been updated after instance was constructed
+		btnOk.Text = Style.OkButtonText;
+		btnCancel.Text = Style.CancelButtonText;
+		btnUp.Text = GetUpButtonText ();
+		btnBack.Text = GetBackButtonText ();
+		btnForward.Text = GetForwardButtonText ();
+		btnToggleSplitterCollapse.Text = GetToggleSplitterText (false);
 
-			// May have been updated after instance was constructed
-			this.btnOk.Text = Style.OkButtonText;
-			this.btnCancel.Text = Style.CancelButtonText;
-			this.btnUp.Text = this.GetUpButtonText ();
-			this.btnBack.Text = this.GetBackButtonText ();
-			this.btnForward.Text = this.GetForwardButtonText ();
-			this.btnToggleSplitterCollapse.Text = this.GetToggleSplitterText (false);
+		if (Style.FlipOkCancelButtonLayoutOrder) {
+			btnCancel.X = Pos.Function (CalculateOkButtonPosX);
+			btnOk.X = Pos.Right (btnCancel) + 1;
 
-			if (Style.FlipOkCancelButtonLayoutOrder) {
-				btnCancel.X = Pos.Function (this.CalculateOkButtonPosX);
-				btnOk.X = Pos.Right (btnCancel) + 1;
 
+			// Flip tab order too for consistency
+			var p1 = btnOk.TabIndex;
+			var p2 = btnCancel.TabIndex;
 
-				// Flip tab order too for consistency
-				var p1 = this.btnOk.TabIndex;
-				var p2 = this.btnCancel.TabIndex;
+			btnOk.TabIndex = p2;
+			btnCancel.TabIndex = p1;
+		}
 
-				this.btnOk.TabIndex = p2;
-				this.btnCancel.TabIndex = p1;
-			}
+		tbPath.Caption = Style.PathCaption;
+		tbFind.Caption = Style.SearchCaption;
 
-			tbPath.Caption = Style.PathCaption;
-			tbFind.Caption = Style.SearchCaption;
+		tbPath.Autocomplete.ColorScheme.Normal = new Attribute (Color.Black, tbPath.ColorScheme.Normal.Background);
 
-			tbPath.Autocomplete.ColorScheme.Normal = new Attribute (Color.Black, tbPath.ColorScheme.Normal.Background);
+		_treeRoots = Style.TreeRootGetter ();
+		Style.IconProvider.IsOpenGetter = treeView.IsExpanded;
 
-			_treeRoots = Style.TreeRootGetter ();
-			Style.IconProvider.IsOpenGetter = treeView.IsExpanded;
+		treeView.AddObjects (_treeRoots.Keys);
 
-			treeView.AddObjects (_treeRoots.Keys);
+		// if filtering on file type is configured then create the ComboBox and establish
+		// initial filtering by extension(s)
+		if (AllowedTypes.Any ()) {
 
-			// if filtering on file type is configured then create the ComboBox and establish
-			// initial filtering by extension(s)
-			if (this.AllowedTypes.Any ()) {
+			CurrentFilter = AllowedTypes [0];
 
-				this.CurrentFilter = this.AllowedTypes [0];
+			// Fiddle factor
+			var width = AllowedTypes.Max (a => a.ToString ().Length) + 6;
 
-				// Fiddle factor
-				var width = this.AllowedTypes.Max (a => a.ToString ().Length) + 6;
+			allowedTypeMenu = new MenuBarItem ("<placeholder>",
+				allowedTypeMenuItems = AllowedTypes.Select (
+									   (a, i) => new MenuItem (a.ToString (), null, () => {
+										   AllowedTypeMenuClicked (i);
+									   }))
+								   .ToArray ());
 
-				allowedTypeMenu = new MenuBarItem ("<placeholder>",
-					allowedTypeMenuItems = AllowedTypes.Select (
-						(a, i) => new MenuItem (a.ToString (), null, () => {
-							AllowedTypeMenuClicked (i);
-						}))
-					.ToArray ());
+			allowedTypeMenuBar = new MenuBar (new [] { allowedTypeMenu }) {
+				Width = width,
+				Y = 1,
+				X = Pos.AnchorEnd (width),
 
-				allowedTypeMenuBar = new MenuBar (new [] { allowedTypeMenu }) {
-					Width = width,
-					Y = 1,
-					X = Pos.AnchorEnd (width),
+				// TODO: Does not work, if this worked then we could tab to it instead
+				// of having to hit F9
+				CanFocus = true,
+				TabStop = true
+			};
+			AllowedTypeMenuClicked (0);
 
-					// TODO: Does not work, if this worked then we could tab to it instead
-					// of having to hit F9
-					CanFocus = true,
-					TabStop = true
-				};
-				AllowedTypeMenuClicked (0);
+			allowedTypeMenuBar.Enter += (s, e) => {
+				allowedTypeMenuBar.OpenMenu (0);
+			};
 
-				allowedTypeMenuBar.Enter += (s, e) => {
-					allowedTypeMenuBar.OpenMenu (0);
-				};
+			allowedTypeMenuBar.DrawContentComplete += (s, e) => {
 
-				allowedTypeMenuBar.DrawContentComplete += (s, e) => {
+				allowedTypeMenuBar.Move (e.Rect.Width - 1, 0);
+				Driver.AddRune (Glyphs.DownArrow);
 
-					allowedTypeMenuBar.Move (e.Rect.Width - 1, 0);
-					Driver.AddRune (CM.Glyphs.DownArrow);
+			};
 
-				};
+			Add (allowedTypeMenuBar);
+		}
 
-				this.Add (allowedTypeMenuBar);
-			}
+		// if no path has been provided
+		if (tbPath.Text.Length <= 0) {
+			Path = Environment.CurrentDirectory;
+		}
 
-			// if no path has been provided
-			if (this.tbPath.Text.Length <= 0) {
-				this.Path = Environment.CurrentDirectory;
-			}
+		// to streamline user experience and allow direct typing of paths
+		// with zero navigation we start with focus in the text box and any
+		// default/current path fully selected and ready to be overwritten
+		tbPath.FocusFirst ();
+		tbPath.SelectAll ();
 
-			// to streamline user experience and allow direct typing of paths
-			// with zero navigation we start with focus in the text box and any
-			// default/current path fully selected and ready to be overwritten
-			this.tbPath.FocusFirst ();
-			this.tbPath.SelectAll ();
+		if (string.IsNullOrEmpty (Title)) {
+			Title = GetDefaultTitle ();
+		}
+		LayoutSubviews ();
+	}
 
-			if (string.IsNullOrEmpty (Title)) {
-				this.Title = GetDefaultTitle ();
-			}
-			this.LayoutSubviews ();
+	/// <summary>
+	/// Gets a default dialog title, when <see cref="View.Title"/> is not set or empty,
+	/// result of the function will be shown.
+	/// </summary>
+	protected virtual string GetDefaultTitle ()
+	{
+		List<string> titleParts = new () {
+			Strings.fdOpen
+		};
+		if (MustExist) {
+			titleParts.Add (Strings.fdExisting);
 		}
-		/// <summary>
-		/// Gets a default dialog title, when <see cref="View.Title"/> is not set or empty, 
-		/// result of the function will be shown.
-		/// </summary>
-		protected virtual string GetDefaultTitle ()
-		{
-			List<string> titleParts = new () {
-				Strings.fdOpen
-			};
-			if (MustExist) {
-				titleParts.Add (Strings.fdExisting);
-			}
-			switch (OpenMode) {
-			case OpenMode.File:
-				titleParts.Add (Strings.fdFile);
-				break;
-			case OpenMode.Directory:
-				titleParts.Add (Strings.fdDirectory);
-				break;
-			}
-			return string.Join (' ', titleParts);
+		switch (OpenMode) {
+		case OpenMode.File:
+			titleParts.Add (Strings.fdFile);
+			break;
+		case OpenMode.Directory:
+			titleParts.Add (Strings.fdDirectory);
+			break;
 		}
+		return string.Join (' ', titleParts);
+	}
 
-		private void AllowedTypeMenuClicked (int idx)
-		{
+	void AllowedTypeMenuClicked (int idx)
+	{
 
-			var allow = AllowedTypes [idx];
-			for (int i = 0; i < AllowedTypes.Count; i++) {
-				allowedTypeMenuItems [i].Checked = i == idx;
-			}
-			allowedTypeMenu.Title = allow.ToString ();
+		var allow = AllowedTypes [idx];
+		for (var i = 0; i < AllowedTypes.Count; i++) {
+			allowedTypeMenuItems [i].Checked = i == idx;
+		}
+		allowedTypeMenu.Title = allow.ToString ();
 
-			this.CurrentFilter = allow;
+		CurrentFilter = allow;
 
-			this.tbPath.ClearAllSelection ();
-			this.tbPath.Autocomplete.ClearSuggestions ();
+		tbPath.ClearAllSelection ();
+		tbPath.Autocomplete.ClearSuggestions ();
 
-			if (this.State != null) {
-				this.State.RefreshChildren ();
-				this.WriteStateToTableView ();
-			}
+		if (State != null) {
+			State.RefreshChildren ();
+			WriteStateToTableView ();
 		}
+	}
 
-		private void SuppressIfBadChar (Key k)
-		{
-			// don't let user type bad letters
-			var ch = (char)k;
+	void SuppressIfBadChar (Key k)
+	{
+		// don't let user type bad letters
+		var ch = (char)k;
 
-			if (badChars.Contains (ch)) {
-				k.Handled = true;
-			}
+		if (badChars.Contains (ch)) {
+			k.Handled = true;
 		}
+	}
 
-		private bool TreeView_KeyDown (Key keyEvent)
-		{
-			if (this.treeView.HasFocus && Separators.Contains ((char)keyEvent)) {
-				this.tbPath.FocusFirst ();
+	bool TreeView_KeyDown (Key keyEvent)
+	{
+		if (treeView.HasFocus && Separators.Contains ((char)keyEvent)) {
+			tbPath.FocusFirst ();
 
-				// let that keystroke go through on the tbPath instead
-				return true;
-			}
-
-			return false;
+			// let that keystroke go through on the tbPath instead
+			return true;
 		}
 
-		private void AcceptIf (Key keyEvent, KeyCode isKey)
-		{
-			if (!keyEvent.Handled && keyEvent.KeyCode == isKey) {
-				keyEvent.Handled = true;
+		return false;
+	}
 
-				// User hit Enter in text box so probably wants the
-				// contents of the text box as their selection not
-				// whatever lingering selection is in TableView
-				this.Accept (false);
-			}
+	void AcceptIf (Key keyEvent, KeyCode isKey)
+	{
+		if (!keyEvent.Handled && keyEvent.KeyCode == isKey) {
+			keyEvent.Handled = true;
+
+			// User hit Enter in text box so probably wants the
+			// contents of the text box as their selection not
+			// whatever lingering selection is in TableView
+			Accept (false);
 		}
+	}
 
-		private void Accept (IEnumerable<FileSystemInfoStats> toMultiAccept)
-		{
-			if (!this.AllowsMultipleSelection) {
-				return;
-			}
+	void Accept (IEnumerable<FileSystemInfoStats> toMultiAccept)
+	{
+		if (!AllowsMultipleSelection) {
+			return;
+		}
 
-			// Don't include ".." (IsParent) in multiselections
-			this.MultiSelected = toMultiAccept
+		// Don't include ".." (IsParent) in multiselections
+		MultiSelected = toMultiAccept
 				.Where (s => !s.IsParent)
 				.Select (s => s.FileSystemInfo.FullName)
 				.ToList ().AsReadOnly ();
 
-			this.Path = this.MultiSelected.Count == 1 ? this.MultiSelected [0] : string.Empty;
+		Path = MultiSelected.Count == 1 ? MultiSelected [0] : string.Empty;
+
+		FinishAccept ();
+	}
 
-			FinishAccept ();
+	void Accept (IFileInfo f)
+	{
+		if (!IsCompatibleWithOpenMode (f.FullName, out var reason)) {
+			feedback = reason;
+			SetNeedsDisplay ();
+			return;
 		}
 
-		private void Accept (IFileInfo f)
-		{
-			if (!this.IsCompatibleWithOpenMode (f.FullName, out var reason)) {
+		Path = f.FullName;
+
+		if (AllowsMultipleSelection) {
+			MultiSelected = new List<string> { f.FullName }.AsReadOnly ();
+		}
+
+		FinishAccept ();
+	}
+
+	void Accept (bool allowMulti)
+	{
+		if (allowMulti && TryAcceptMulti ()) {
+			return;
+		}
+
+		if (!IsCompatibleWithOpenMode (tbPath.Text, out var reason)) {
+			if (reason != null) {
 				feedback = reason;
 				SetNeedsDisplay ();
-				return;
 			}
+			return;
+		}
 
-			this.Path = f.FullName;
+		FinishAccept ();
+	}
 
-			if (AllowsMultipleSelection) {
-				this.MultiSelected = new List<string> { f.FullName }.AsReadOnly ();
-			}
+	void FinishAccept ()
+	{
+		var e = new FilesSelectedEventArgs (this);
 
-			FinishAccept ();
-		}
+		FilesSelected?.Invoke (this, e);
 
-		private void Accept (bool allowMulti)
-		{
-			if (allowMulti && TryAcceptMulti ()) {
-				return;
-			}
+		if (e.Cancel) {
+			return;
+		}
 
-			if (!this.IsCompatibleWithOpenMode (this.tbPath.Text, out string reason)) {
-				if (reason != null) {
-					feedback = reason;
-					SetNeedsDisplay ();
-				}
-				return;
-			}
+		// if user uses Path selection mode (e.g. Enter in text box)
+		// then also copy to MultiSelected
+		if (AllowsMultipleSelection && !MultiSelected.Any ()) {
 
-			FinishAccept ();
+			MultiSelected = string.IsNullOrWhiteSpace (Path) ?
+				Enumerable.Empty<string> ().ToList ().AsReadOnly () :
+				new List<string> { Path }.AsReadOnly ();
 		}
 
-		private void FinishAccept ()
-		{
-			var e = new FilesSelectedEventArgs (this);
+		Canceled = false;
+		Application.RequestStop ();
+	}
 
-			this.FilesSelected?.Invoke (this, e);
+	bool NavigateIf (Key keyEvent, KeyCode isKey, View to)
+	{
+		if (keyEvent.KeyCode == isKey) {
 
-			if (e.Cancel) {
-				return;
+			to.FocusFirst ();
+			if (to == tbPath) {
+				tbPath.MoveEnd ();
 			}
+			return true;
+		}
 
-			// if user uses Path selection mode (e.g. Enter in text box)
-			// then also copy to MultiSelected
-			if (AllowsMultipleSelection && (!MultiSelected.Any ())) {
-
-				MultiSelected = string.IsNullOrWhiteSpace (Path) ?
-						Enumerable.Empty<string> ().ToList ().AsReadOnly () :
-						new List<string> () { Path }.AsReadOnly ();
-			}
+		return false;
+	}
 
-			this.Canceled = false;
-			Application.RequestStop ();
+	void TreeView_SelectionChanged (object sender, SelectionChangedEventArgs<IFileSystemInfo> e)
+	{
+		if (e.NewValue == null) {
+			return;
 		}
 
-		private bool NavigateIf (Key keyEvent, KeyCode isKey, View to)
-		{
-			if (keyEvent.KeyCode == isKey) {
+		Path = e.NewValue.FullName;
+	}
 
-				to.FocusFirst ();
-				if (to == tbPath) {
-					tbPath.MoveEnd ();
-				}
-				return true;
-			}
+	void UpdateNavigationVisibility ()
+	{
+		btnBack.Visible = history.CanBack ();
+		btnForward.Visible = history.CanForward ();
+		btnUp.Visible = history.CanUp ();
+	}
 
-			return false;
+	void TableView_SelectedCellChanged (object sender, SelectedCellChangedEventArgs obj)
+	{
+		if (!tableView.HasFocus || obj.NewRow == -1 || obj.Table.Rows == 0) {
+			return;
 		}
 
-		private void TreeView_SelectionChanged (object sender, SelectionChangedEventArgs<IFileSystemInfo> e)
-		{
-			if (e.NewValue == null) {
-				return;
-			}
-
-			this.Path = e.NewValue.FullName;
+		if (tableView.MultiSelect && tableView.MultiSelectedRegions.Any ()) {
+			return;
 		}
 
-		private void UpdateNavigationVisibility ()
-		{
-			this.btnBack.Visible = this.history.CanBack ();
-			this.btnForward.Visible = this.history.CanForward ();
-			this.btnUp.Visible = this.history.CanUp ();
-		}
+		var stats = RowToStats (obj.NewRow);
 
-		private void TableView_SelectedCellChanged (object sender, SelectedCellChangedEventArgs obj)
-		{
-			if (!this.tableView.HasFocus || obj.NewRow == -1 || obj.Table.Rows == 0) {
-				return;
-			}
+		if (stats == null) {
+			return;
+		}
+		IFileSystemInfo dest;
 
-			if (this.tableView.MultiSelect && this.tableView.MultiSelectedRegions.Any ()) {
-				return;
-			}
+		if (stats.IsParent) {
+			dest = State.Directory;
+		} else {
+			dest = stats.FileSystemInfo;
+		}
 
-			var stats = this.RowToStats (obj.NewRow);
+		try {
+			pushingState = true;
 
-			if (stats == null) {
-				return;
-			}
-			IFileSystemInfo dest;
+			Path = dest.FullName;
+			State.Selected = stats;
+			tbPath.Autocomplete.ClearSuggestions ();
 
-			if (stats.IsParent) {
-				dest = State.Directory;
-			} else {
-				dest = stats.FileSystemInfo;
-			}
+		} finally {
 
-			try {
-				this.pushingState = true;
+			pushingState = false;
+		}
+	}
 
-				this.Path = dest.FullName;
-				this.State.Selected = stats;
-				this.tbPath.Autocomplete.ClearSuggestions ();
+	bool TableView_KeyUp (Key keyEvent)
+	{
+		if (keyEvent.KeyCode == KeyCode.Backspace) {
+			return history.Back ();
+		}
+		if (keyEvent.KeyCode == (KeyCode.ShiftMask | KeyCode.Backspace)) {
+			return history.Forward ();
+		}
 
-			} finally {
+		if (keyEvent.KeyCode == KeyCode.Delete) {
 
-				this.pushingState = false;
-			}
+			Delete ();
+			return true;
 		}
 
-		private bool TableView_KeyUp (Key keyEvent)
-		{
-			if (keyEvent.KeyCode == KeyCode.Backspace) {
-				return this.history.Back ();
-			}
-			if (keyEvent.KeyCode == (KeyCode.ShiftMask | KeyCode.Backspace)) {
-				return this.history.Forward ();
-			}
+		if (keyEvent.KeyCode == (KeyCode.CtrlMask | KeyCode.R)) {
 
-			if (keyEvent.KeyCode == KeyCode.Delete) {
+			Rename ();
+			return true;
+		}
 
-				Delete ();
-				return true;
-			}
+		if (keyEvent.KeyCode == (KeyCode.CtrlMask | KeyCode.N)) {
+			New ();
+			return true;
+		}
 
-			if (keyEvent.KeyCode == (KeyCode.CtrlMask | KeyCode.R)) {
+		return false;
+	}
 
-				Rename ();
-				return true;
-			}
+	void CellActivate (object sender, CellActivatedEventArgs obj)
+	{
+		if (TryAcceptMulti ()) {
+			return;
+		}
 
-			if (keyEvent.KeyCode == (KeyCode.CtrlMask | KeyCode.N)) {
-				New ();
-				return true;
-			}
+		var stats = RowToStats (obj.Row);
 
-			return false;
+		if (stats.FileSystemInfo is IDirectoryInfo d) {
+			PushState (d, true);
+			return;
 		}
 
-		private void CellActivate (object sender, CellActivatedEventArgs obj)
-		{
-			if (TryAcceptMulti ()) {
-				return;
-			}
-
-			var stats = this.RowToStats (obj.Row);
+		if (stats.FileSystemInfo is IFileInfo f) {
+			Accept (f);
+		}
+	}
 
-			if (stats.FileSystemInfo is IDirectoryInfo d) {
-				this.PushState (d, true);
-				return;
-			}
+	bool TryAcceptMulti ()
+	{
+		var multi = MultiRowToStats ();
+		string reason = null;
 
-			if (stats.FileSystemInfo is IFileInfo f) {
-				this.Accept (f);
-			}
+		if (!multi.Any ()) {
+			return false;
 		}
 
-		private bool TryAcceptMulti ()
-		{
-			var multi = this.MultiRowToStats ();
-			string reason = null;
-
-			if (!multi.Any ()) {
-				return false;
-			}
+		if (multi.All (m => IsCompatibleWithOpenMode (
+			m.FileSystemInfo.FullName, out reason))) {
+			Accept (multi);
+			return true;
+		}
+		if (reason != null) {
+			feedback = reason;
+			SetNeedsDisplay ();
+		}
 
-			if (multi.All (m => this.IsCompatibleWithOpenMode (
-				m.FileSystemInfo.FullName, out reason))) {
-				this.Accept (multi);
-				return true;
-			} else {
-				if (reason != null) {
-					feedback = reason;
-					SetNeedsDisplay ();
-				}
+		return false;
+	}
 
-				return false;
-			}
+	/// <summary>
+	/// Returns true if there are no <see cref="AllowedTypes"/> or one of them agrees
+	/// that <paramref name="file"/> <see cref="IAllowedType.IsAllowed(string)"/>.
+	/// </summary>
+	/// <param name="file"></param>
+	/// <returns></returns>
+	public bool IsCompatibleWithAllowedExtensions (IFileInfo file)
+	{
+		// no restrictions
+		if (!AllowedTypes.Any ()) {
+			return true;
 		}
+		return MatchesAllowedTypes (file);
+	}
 
-		/// <summary>
-		/// Returns true if there are no <see cref="AllowedTypes"/> or one of them agrees
-		/// that <paramref name="file"/> <see cref="IAllowedType.IsAllowed(string)"/>.
-		/// </summary>
-		/// <param name="file"></param>
-		/// <returns></returns>
-		public bool IsCompatibleWithAllowedExtensions (IFileInfo file)
-		{
-			// no restrictions
-			if (!this.AllowedTypes.Any ()) {
-				return true;
-			}
-			return this.MatchesAllowedTypes (file);
+	bool IsCompatibleWithAllowedExtensions (string path)
+	{
+		// no restrictions
+		if (!AllowedTypes.Any ()) {
+			return true;
 		}
 
-		private bool IsCompatibleWithAllowedExtensions (string path)
-		{
-			// no restrictions
-			if (!this.AllowedTypes.Any ()) {
-				return true;
-			}
+		return AllowedTypes.Any (t => t.IsAllowed (path));
+	}
 
-			return this.AllowedTypes.Any (t => t.IsAllowed (path));
+	/// <summary>
+	/// Returns true if any <see cref="AllowedTypes"/> matches <paramref name="file"/>.
+	/// </summary>
+	/// <param name="file"></param>
+	/// <returns></returns>
+	bool MatchesAllowedTypes (IFileInfo file) => AllowedTypes.Any (t => t.IsAllowed (file.FullName));
+
+	bool IsCompatibleWithOpenMode (string s, out string reason)
+	{
+		reason = null;
+		if (string.IsNullOrWhiteSpace (s)) {
+			return false;
 		}
 
-		/// <summary>
-		/// Returns true if any <see cref="AllowedTypes"/> matches <paramref name="file"/>.
-		/// </summary>
-		/// <param name="file"></param>
-		/// <returns></returns>
-		private bool MatchesAllowedTypes (IFileInfo file)
-		{
-			return this.AllowedTypes.Any (t => t.IsAllowed (file.FullName));
+		if (!IsCompatibleWithAllowedExtensions (s)) {
+			reason = Style.WrongFileTypeFeedback;
+			return false;
 		}
-		private bool IsCompatibleWithOpenMode (string s, out string reason)
-		{
-			reason = null;
-			if (string.IsNullOrWhiteSpace (s)) {
+
+		switch (OpenMode) {
+		case OpenMode.Directory:
+			if (MustExist && !Directory.Exists (s)) {
+				reason = Style.DirectoryMustExistFeedback;
 				return false;
 			}
 
-			if (!this.IsCompatibleWithAllowedExtensions (s)) {
-				reason = Style.WrongFileTypeFeedback;
+			if (File.Exists (s)) {
+				reason = Style.FileAlreadyExistsFeedback;
 				return false;
 			}
+			return true;
+		case OpenMode.File:
 
-			switch (this.OpenMode) {
-			case OpenMode.Directory:
-				if (MustExist && !Directory.Exists (s)) {
-					reason = Style.DirectoryMustExistFeedback;
-					return false;
-				}
-
-				if (File.Exists (s)) {
-					reason = Style.FileAlreadyExistsFeedback;
-					return false;
-				}
-				return true;
-			case OpenMode.File:
-
-				if (MustExist && !File.Exists (s)) {
-					reason = Style.FileMustExistFeedback;
-					return false;
-				}
-				if (Directory.Exists (s)) {
-					reason = Style.DirectoryAlreadyExistsFeedback;
-					return false;
-				}
-				return true;
-			case OpenMode.Mixed:
-				if (MustExist && !File.Exists (s) && !Directory.Exists (s)) {
-					reason = Style.FileOrDirectoryMustExistFeedback;
-					return false;
-				}
-				return true;
-			default: throw new ArgumentOutOfRangeException (nameof (this.OpenMode));
+			if (MustExist && !File.Exists (s)) {
+				reason = Style.FileMustExistFeedback;
+				return false;
 			}
-		}
-
-		/// <summary>
-		/// Changes the dialog such that <paramref name="d"/> is being explored.
-		/// </summary>
-		/// <param name="d"></param>
-		/// <param name="addCurrentStateToHistory"></param>
-		/// <param name="setPathText"></param>
-		/// <param name="clearForward"></param>
-		/// <param name="pathText">Optional alternate string to set path to.</param>
-		internal void PushState (IDirectoryInfo d, bool addCurrentStateToHistory, bool setPathText = true, bool clearForward = true, string pathText = null)
-		{
-			// no change of state
-			if (d == this.State?.Directory) {
-				return;
+			if (Directory.Exists (s)) {
+				reason = Style.DirectoryAlreadyExistsFeedback;
+				return false;
 			}
-			if (d.FullName == this.State?.Directory.FullName) {
-				return;
+			return true;
+		case OpenMode.Mixed:
+			if (MustExist && !File.Exists (s) && !Directory.Exists (s)) {
+				reason = Style.FileOrDirectoryMustExistFeedback;
+				return false;
 			}
-
-			PushState (new FileDialogState (d, this), addCurrentStateToHistory, setPathText, clearForward, pathText);
+			return true;
+		default: throw new ArgumentOutOfRangeException (nameof (OpenMode));
 		}
+	}
 
-		private void RefreshState ()
-		{
-			State.RefreshChildren ();
-			PushState (State, false, false, false);
+	/// <summary>
+	/// Changes the dialog such that <paramref name="d"/> is being explored.
+	/// </summary>
+	/// <param name="d"></param>
+	/// <param name="addCurrentStateToHistory"></param>
+	/// <param name="setPathText"></param>
+	/// <param name="clearForward"></param>
+	/// <param name="pathText">Optional alternate string to set path to.</param>
+	internal void PushState (IDirectoryInfo d, bool addCurrentStateToHistory, bool setPathText = true, bool clearForward = true, string pathText = null)
+	{
+		// no change of state
+		if (d == State?.Directory) {
+			return;
+		}
+		if (d.FullName == State?.Directory.FullName) {
+			return;
 		}
 
-		private void PushState (FileDialogState newState, bool addCurrentStateToHistory, bool setPathText = true, bool clearForward = true, string pathText = null)
-		{
-			if (State is SearchState search) {
-				search.Cancel ();
-			}
+		PushState (new FileDialogState (d, this), addCurrentStateToHistory, setPathText, clearForward, pathText);
+	}
 
-			try {
-				this.pushingState = true;
+	void RefreshState ()
+	{
+		State.RefreshChildren ();
+		PushState (State, false, false, false);
+	}
 
-				// push the old state to history
-				if (addCurrentStateToHistory) {
-					this.history.Push (this.State, clearForward);
-				}
+	void PushState (FileDialogState newState, bool addCurrentStateToHistory, bool setPathText = true, bool clearForward = true, string pathText = null)
+	{
+		if (State is SearchState search) {
+			search.Cancel ();
+		}
 
-				this.tbPath.Autocomplete.ClearSuggestions ();
+		try {
+			pushingState = true;
 
-				if (pathText != null) {
-					this.Path = pathText;
-				} else
-				if (setPathText) {
-					this.Path = newState.Directory.FullName;
-				}
+			// push the old state to history
+			if (addCurrentStateToHistory) {
+				history.Push (State, clearForward);
+			}
 
-				this.State = newState;
-				this.tbPath.Autocomplete.GenerateSuggestions (
-					new AutocompleteFilepathContext (tbPath.Text, tbPath.CursorPosition, this.State));
+			tbPath.Autocomplete.ClearSuggestions ();
 
-				this.WriteStateToTableView ();
+			if (pathText != null) {
+				Path = pathText;
+			} else if (setPathText) {
+				Path = newState.Directory.FullName;
+			}
 
-				if (clearForward) {
-					this.history.ClearForward ();
-				}
+			State = newState;
+			tbPath.Autocomplete.GenerateSuggestions (
+				new AutocompleteFilepathContext (tbPath.Text, tbPath.CursorPosition, State));
 
-				this.tableView.RowOffset = 0;
-				this.tableView.SelectedRow = 0;
+			WriteStateToTableView ();
 
-				this.SetNeedsDisplay ();
-				this.UpdateNavigationVisibility ();
+			if (clearForward) {
+				history.ClearForward ();
+			}
 
-			} finally {
+			tableView.RowOffset = 0;
+			tableView.SelectedRow = 0;
 
-				this.pushingState = false;
-			}
-			ClearFeedback ();
-		}
+			SetNeedsDisplay ();
+			UpdateNavigationVisibility ();
 
-		private void WriteStateToTableView ()
-		{
-			if (this.State == null) {
-				return;
-			}
-			this.tableView.Table = new FileDialogTableSource (this, this.State, this.Style, currentSortColumn, currentSortIsAsc);
+		} finally {
 
-			this.ApplySort ();
-			this.tableView.Update ();
+			pushingState = false;
 		}
+		ClearFeedback ();
+	}
 
-		private ColorScheme ColorGetter (CellColorGetterArgs args)
-		{
-			var stats = this.RowToStats (args.RowIndex);
-
-			if (!Style.UseColors) {
-				return tableView.ColorScheme;
-			}
+	void WriteStateToTableView ()
+	{
+		if (State == null) {
+			return;
+		}
+		tableView.Table = new FileDialogTableSource (this, State, Style, currentSortColumn, currentSortIsAsc);
 
+		ApplySort ();
+		tableView.Update ();
+	}
 
-			var color = Style.ColorProvider.GetColor (stats.FileSystemInfo) ?? new Color (Color.White);
-			var black = new Color (Color.Black);
+	ColorScheme ColorGetter (CellColorGetterArgs args)
+	{
+		var stats = RowToStats (args.RowIndex);
 
-			// TODO: Add some kind of cache for this
-			return new ColorScheme {
-				Normal = new Attribute (color, black),
-				HotNormal = new Attribute (color, black),
-				Focus = new Attribute (black, color),
-				HotFocus = new Attribute (black, color),
-			};
+		if (!Style.UseColors) {
+			return tableView.ColorScheme;
 		}
 
-		/// <summary>
-		/// If <see cref="TableView.MultiSelect"/> is this returns a union of all
-		/// <see cref="FileSystemInfoStats"/> in the selection.
-		/// </summary>
-		/// <returns></returns>
-		private IEnumerable<FileSystemInfoStats> MultiRowToStats ()
-		{
-			var toReturn = new HashSet<FileSystemInfoStats> ();
-
-			if (this.AllowsMultipleSelection && this.tableView.MultiSelectedRegions.Any ()) {
 
-				foreach (var p in this.tableView.GetAllSelectedCells ()) {
+		var color = Style.ColorProvider.GetColor (stats.FileSystemInfo) ?? new Color (Color.White);
+		var black = new Color (Color.Black);
 
-					var add = this.State?.Children [p.Y];
-					if (add != null) {
-						toReturn.Add (add);
-					}
-				}
-			}
+		// TODO: Add some kind of cache for this
+		return new ColorScheme {
+			Normal = new Attribute (color, black),
+			HotNormal = new Attribute (color, black),
+			Focus = new Attribute (black, color),
+			HotFocus = new Attribute (black, color)
+		};
+	}
 
-			return toReturn;
-		}
-		private FileSystemInfoStats RowToStats (int rowIndex)
-		{
-			return this.State?.Children [rowIndex];
-		}
+	/// <summary>
+	/// If <see cref="TableView.MultiSelect"/> is this returns a union of all
+	/// <see cref="FileSystemInfoStats"/> in the selection.
+	/// </summary>
+	/// <returns></returns>
+	IEnumerable<FileSystemInfoStats> MultiRowToStats ()
+	{
+		var toReturn = new HashSet<FileSystemInfoStats> ();
 
-		private void PathChanged ()
-		{
-			// avoid re-entry
-			if (this.pushingState) {
-				return;
-			}
+		if (AllowsMultipleSelection && tableView.MultiSelectedRegions.Any ()) {
 
-			var path = this.tbPath.Text;
+			foreach (var p in tableView.GetAllSelectedCells ()) {
 
-			if (string.IsNullOrWhiteSpace (path)) {
-				return;
+				var add = State?.Children [p.Y];
+				if (add != null) {
+					toReturn.Add (add);
+				}
 			}
+		}
 
-			var dir = this.StringToDirectoryInfo (path);
+		return toReturn;
+	}
 
-			if (dir.Exists) {
-				this.PushState (dir, true, false);
-			} else
-			if (dir.Parent?.Exists ?? false) {
-				this.PushState (dir.Parent, true, false);
-			}
+	FileSystemInfoStats RowToStats (int rowIndex) => State?.Children [rowIndex];
 
-			tbPath.Autocomplete.GenerateSuggestions (new AutocompleteFilepathContext (tbPath.Text, tbPath.CursorPosition, State));
+	void PathChanged ()
+	{
+		// avoid re-entry
+		if (pushingState) {
+			return;
 		}
 
-		private IDirectoryInfo StringToDirectoryInfo (string path)
-		{
-			// if you pass new DirectoryInfo("C:") you get a weird object
-			// where the FullName is in fact the current working directory.
-			// really not what most users would expect
-			if (Regex.IsMatch (path, "^\\w:$")) {
-				return fileSystem.DirectoryInfo.New (path + System.IO.Path.DirectorySeparatorChar);
-			}
+		var path = tbPath.Text;
 
-			return fileSystem.DirectoryInfo.New (path);
+		if (string.IsNullOrWhiteSpace (path)) {
+			return;
 		}
 
-		/// <summary>
-		/// Select <paramref name="toRestore"/> in the table view (if present)
-		/// </summary>
-		/// <param name="toRestore"></param>
-		internal void RestoreSelection (IFileSystemInfo toRestore)
-		{
-			tableView.SelectedRow = State.Children.IndexOf (r => r.FileSystemInfo == toRestore);
-			tableView.EnsureSelectedCellIsVisible ();
+		var dir = StringToDirectoryInfo (path);
+
+		if (dir.Exists) {
+			PushState (dir, true, false);
+		} else if (dir.Parent?.Exists ?? false) {
+			PushState (dir.Parent, true, false);
 		}
 
-		internal void ApplySort ()
-		{
-			var stats = State?.Children ?? new FileSystemInfoStats [0];
+		tbPath.Autocomplete.GenerateSuggestions (new AutocompleteFilepathContext (tbPath.Text, tbPath.CursorPosition, State));
+	}
 
-			// This portion is never reordered (aways .. at top then folders)
-			var forcedOrder = stats
-			.OrderByDescending (f => f.IsParent)
-					.ThenBy (f => f.IsDir ? -1 : 100);
+	IDirectoryInfo StringToDirectoryInfo (string path)
+	{
+		// if you pass new DirectoryInfo("C:") you get a weird object
+		// where the FullName is in fact the current working directory.
+		// really not what most users would expect
+		if (Regex.IsMatch (path, "^\\w:$")) {
+			return fileSystem.DirectoryInfo.New (path + System.IO.Path.DirectorySeparatorChar);
+		}
 
-			// This portion is flexible based on the column clicked (e.g. alphabetical)
-			var ordered =
-				this.currentSortIsAsc ?
-					forcedOrder.ThenBy (f => FileDialogTableSource.GetRawColumnValue (currentSortColumn, f)) :
-					forcedOrder.ThenByDescending (f => FileDialogTableSource.GetRawColumnValue (currentSortColumn, f));
+		return fileSystem.DirectoryInfo.New (path);
+	}
 
-			State.Children = ordered.ToArray ();
+	/// <summary>
+	/// Select <paramref name="toRestore"/> in the table view (if present)
+	/// </summary>
+	/// <param name="toRestore"></param>
+	internal void RestoreSelection (IFileSystemInfo toRestore)
+	{
+		tableView.SelectedRow = State.Children.IndexOf (r => r.FileSystemInfo == toRestore);
+		tableView.EnsureSelectedCellIsVisible ();
+	}
 
-			this.tableView.Update ();
-		}
+	internal void ApplySort ()
+	{
+		var stats = State?.Children ?? new FileSystemInfoStats [0];
 
-		private void SortColumn (int clickedCol)
-		{
-			this.GetProposedNewSortOrder (clickedCol, out var isAsc);
-			this.SortColumn (clickedCol, isAsc);
-			this.tableView.Table = new FileDialogTableSource (this, State, Style, currentSortColumn, currentSortIsAsc);
-		}
+		// This portion is never reordered (aways .. at top then folders)
+		var forcedOrder = stats
+				  .OrderByDescending (f => f.IsParent)
+				  .ThenBy (f => f.IsDir ? -1 : 100);
 
-		internal void SortColumn (int col, bool isAsc)
-		{
-			// set a sort order
-			this.currentSortColumn = col;
-			this.currentSortIsAsc = isAsc;
+		// This portion is flexible based on the column clicked (e.g. alphabetical)
+		var ordered =
+			currentSortIsAsc ?
+				forcedOrder.ThenBy (f => FileDialogTableSource.GetRawColumnValue (currentSortColumn, f)) :
+				forcedOrder.ThenByDescending (f => FileDialogTableSource.GetRawColumnValue (currentSortColumn, f));
 
-			this.ApplySort ();
-		}
+		State.Children = ordered.ToArray ();
 
-		private string GetProposedNewSortOrder (int clickedCol, out bool isAsc)
-		{
-			// work out new sort order
-			if (this.currentSortColumn == clickedCol && this.currentSortIsAsc) {
-				isAsc = false;
-				return string.Format (Strings.fdCtxSortDesc, tableView.Table.ColumnNames [clickedCol]);
-			} else {
-				isAsc = true;
-				return string.Format (Strings.fdCtxSortAsc, tableView.Table.ColumnNames [clickedCol]);
-			}
-		}
+		tableView.Update ();
+	}
 
-		private void ShowHeaderContextMenu (int clickedCol, MouseEventEventArgs e)
-		{
-			var sort = this.GetProposedNewSortOrder (clickedCol, out var isAsc);
+	void SortColumn (int clickedCol)
+	{
+		GetProposedNewSortOrder (clickedCol, out var isAsc);
+		SortColumn (clickedCol, isAsc);
+		tableView.Table = new FileDialogTableSource (this, State, Style, currentSortColumn, currentSortIsAsc);
+	}
 
-			var contextMenu = new ContextMenu (
-				e.MouseEvent.X + 1,
-				e.MouseEvent.Y + 1,
-				new MenuBarItem (new MenuItem []
-				{
-					new MenuItem(string.Format (Strings.fdCtxHide, StripArrows (tableView.Table.ColumnNames[clickedCol])), string.Empty, () => this.HideColumn (clickedCol)),
-					new MenuItem(StripArrows (sort), string.Empty, () => this.SortColumn (clickedCol, isAsc)),
-				})
-			);
+	internal void SortColumn (int col, bool isAsc)
+	{
+		// set a sort order
+		currentSortColumn = col;
+		currentSortIsAsc = isAsc;
 
-			contextMenu.Show ();
-		}
+		ApplySort ();
+	}
 
-		private static string StripArrows (string columnName)
-		{
-			return columnName.Replace (" (▼)", string.Empty).Replace (" (▲)", string.Empty);
+	string GetProposedNewSortOrder (int clickedCol, out bool isAsc)
+	{
+		// work out new sort order
+		if (currentSortColumn == clickedCol && currentSortIsAsc) {
+			isAsc = false;
+			return string.Format (Strings.fdCtxSortDesc, tableView.Table.ColumnNames [clickedCol]);
 		}
+		isAsc = true;
+		return string.Format (Strings.fdCtxSortAsc, tableView.Table.ColumnNames [clickedCol]);
+	}
 
-		private void ShowCellContextMenu (Point? clickedCell, MouseEventEventArgs e)
-		{
-			if (clickedCell == null) {
-				return;
-			}
+	void ShowHeaderContextMenu (int clickedCol, MouseEventEventArgs e)
+	{
+		var sort = GetProposedNewSortOrder (clickedCol, out var isAsc);
 
-			var contextMenu = new ContextMenu (
-				e.MouseEvent.X + 1,
-				e.MouseEvent.Y + 1,
-				new MenuBarItem (new MenuItem []
-				{
-					new MenuItem(Strings.fdCtxNew, string.Empty, New),
-					new MenuItem(Strings.fdCtxRename, string.Empty, Rename),
-					new MenuItem(Strings.fdCtxDelete,string.Empty, Delete),
-				})
-			);
+		var contextMenu = new ContextMenu (
+			e.MouseEvent.X + 1,
+			e.MouseEvent.Y + 1,
+			new MenuBarItem (new MenuItem [] {
+				new (string.Format (Strings.fdCtxHide, StripArrows (tableView.Table.ColumnNames [clickedCol])), string.Empty, () => HideColumn (clickedCol)),
+				new (StripArrows (sort), string.Empty, () => SortColumn (clickedCol, isAsc))
+			})
+		);
 
-			tableView.SetSelection (clickedCell.Value.X, clickedCell.Value.Y, false);
+		contextMenu.Show ();
+	}
 
-			contextMenu.Show ();
-		}
+	static string StripArrows (string columnName) => columnName.Replace (" (▼)", string.Empty).Replace (" (▲)", string.Empty);
 
-		private void HideColumn (int clickedCol)
-		{
-			var style = this.tableView.Style.GetOrCreateColumnStyle (clickedCol);
-			style.Visible = false;
-			this.tableView.Update ();
+	void ShowCellContextMenu (Point? clickedCell, MouseEventEventArgs e)
+	{
+		if (clickedCell == null) {
+			return;
 		}
 
-		/// <summary>
-		/// State representing a recursive search from <see cref="FileDialogState.Directory"/>
-		/// downwards.
-		/// </summary>
-		internal class SearchState : FileDialogState {
+		var contextMenu = new ContextMenu (
+			e.MouseEvent.X + 1,
+			e.MouseEvent.Y + 1,
+			new MenuBarItem (new MenuItem [] {
+				new (Strings.fdCtxNew, string.Empty, New),
+				new (Strings.fdCtxRename, string.Empty, Rename),
+				new (Strings.fdCtxDelete, string.Empty, Delete)
+			})
+		);
 
-			bool cancel = false;
-			bool finished = false;
+		tableView.SetSelection (clickedCell.Value.X, clickedCell.Value.Y, false);
 
-			// TODO: Add thread safe child adding
-			List<FileSystemInfoStats> found = new List<FileSystemInfoStats> ();
-			object oLockFound = new object ();
-			CancellationTokenSource token = new CancellationTokenSource ();
+		contextMenu.Show ();
+	}
 
-			public SearchState (IDirectoryInfo dir, FileDialog parent, string searchTerms) : base (dir, parent)
-			{
-				parent.SearchMatcher.Initialize (searchTerms);
-				Children = new FileSystemInfoStats [0];
-				BeginSearch ();
-			}
+	void HideColumn (int clickedCol)
+	{
+		var style = tableView.Style.GetOrCreateColumnStyle (clickedCol);
+		style.Visible = false;
+		tableView.Update ();
+	}
 
-			private void BeginSearch ()
-			{
-				Task.Run (() => {
-					RecursiveFind (Directory);
-					finished = true;
-				});
+	/// <summary>
+	/// State representing a recursive search from <see cref="FileDialogState.Directory"/>
+	/// downwards.
+	/// </summary>
+	internal class SearchState : FileDialogState {
+		bool cancel;
+		bool finished;
 
-				Task.Run (() => {
-					UpdateChildren ();
-				});
-			}
+		// TODO: Add thread safe child adding
+		readonly List<FileSystemInfoStats> found = new ();
+		readonly object oLockFound = new ();
+		readonly CancellationTokenSource token = new ();
 
-			private void UpdateChildren ()
-			{
-				lock (Parent.onlyOneSearchLock) {
-					while (!cancel && !finished) {
+		public SearchState (IDirectoryInfo dir, FileDialog parent, string searchTerms) : base (dir, parent)
+		{
+			parent.SearchMatcher.Initialize (searchTerms);
+			Children = new FileSystemInfoStats [0];
+			BeginSearch ();
+		}
 
-						try {
-							Task.Delay (250).Wait (token.Token);
-						} catch (OperationCanceledException) {
-							cancel = true;
-						}
+		void BeginSearch ()
+		{
+			Task.Run (() => {
+				RecursiveFind (Directory);
+				finished = true;
+			});
+
+			Task.Run (() => {
+				UpdateChildren ();
+			});
+		}
 
-						if (cancel || finished) {
-							break;
-						}
+		void UpdateChildren ()
+		{
+			lock (Parent.onlyOneSearchLock) {
+				while (!cancel && !finished) {
 
-						UpdateChildrenToFound ();
+					try {
+						Task.Delay (250).Wait (token.Token);
+					} catch (OperationCanceledException) {
+						cancel = true;
 					}
 
-					if (finished && !cancel) {
-						UpdateChildrenToFound ();
+					if (cancel || finished) {
+						break;
 					}
 
-					Application.Invoke (() => {
-						Parent.spinnerView.Visible = false;
-					});
+					UpdateChildrenToFound ();
 				}
-			}
 
-			private void UpdateChildrenToFound ()
-			{
-				lock (oLockFound) {
-					Children = found.ToArray ();
+				if (finished && !cancel) {
+					UpdateChildrenToFound ();
 				}
 
 				Application.Invoke (() => {
-					Parent.tbPath.Autocomplete.GenerateSuggestions (
-						new AutocompleteFilepathContext (Parent.tbPath.Text, Parent.tbPath.CursorPosition, this)
-						);
-					Parent.WriteStateToTableView ();
-
-					Parent.spinnerView.Visible = true;
-					Parent.spinnerView.SetNeedsDisplay ();
+					Parent.spinnerView.Visible = false;
 				});
 			}
+		}
+
+		void UpdateChildrenToFound ()
+		{
+			lock (oLockFound) {
+				Children = found.ToArray ();
+			}
 
-			private void RecursiveFind (IDirectoryInfo directory)
-			{
-				foreach (var f in GetChildren (directory)) {
+			Application.Invoke (() => {
+				Parent.tbPath.Autocomplete.GenerateSuggestions (
+					new AutocompleteFilepathContext (Parent.tbPath.Text, Parent.tbPath.CursorPosition, this)
+				);
+				Parent.WriteStateToTableView ();
 
-					if (cancel) {
-						return;
-					}
+				Parent.spinnerView.Visible = true;
+				Parent.spinnerView.SetNeedsDisplay ();
+			});
+		}
 
-					if (f.IsParent) {
-						continue;
-					}
+		void RecursiveFind (IDirectoryInfo directory)
+		{
+			foreach (var f in GetChildren (directory)) {
 
-					lock (oLockFound) {
-						if (found.Count >= FileDialog.MaxSearchResults) {
-							finished = true;
-							return;
-						}
-					}
+				if (cancel) {
+					return;
+				}
+
+				if (f.IsParent) {
+					continue;
+				}
 
-					if (Parent.SearchMatcher.IsMatch (f.FileSystemInfo)) {
-						lock (oLockFound) {
-							found.Add (f);
-						}
+				lock (oLockFound) {
+					if (found.Count >= MaxSearchResults) {
+						finished = true;
+						return;
 					}
+				}
 
-					if (f.FileSystemInfo is IDirectoryInfo sub) {
-						RecursiveFind (sub);
+				if (Parent.SearchMatcher.IsMatch (f.FileSystemInfo)) {
+					lock (oLockFound) {
+						found.Add (f);
 					}
 				}
-			}
 
-			internal override void RefreshChildren ()
-			{
+				if (f.FileSystemInfo is IDirectoryInfo sub) {
+					RecursiveFind (sub);
+				}
 			}
+		}
 
-			/// <summary>
-			/// Cancels the current search (if any).  Returns true if a search
-			/// was running and cancellation was successfully set.
-			/// </summary>
-			/// <returns></returns>
-			internal bool Cancel ()
-			{
-				var alreadyCancelled = token.IsCancellationRequested || cancel;
+		internal override void RefreshChildren () { }
+
+		/// <summary>
+		/// Cancels the current search (if any).  Returns true if a search
+		/// was running and cancellation was successfully set.
+		/// </summary>
+		/// <returns></returns>
+		internal bool Cancel ()
+		{
+			var alreadyCancelled = token.IsCancellationRequested || cancel;
 
-				cancel = true;
-				token.Cancel ();
+			cancel = true;
+			token.Cancel ();
 
-				return !alreadyCancelled;
-			}
+			return !alreadyCancelled;
 		}
-		internal class FileDialogCollectionNavigator : CollectionNavigatorBase {
-			private FileDialog fileDialog;
+	}
 
-			public FileDialogCollectionNavigator (FileDialog fileDialog)
-			{
-				this.fileDialog = fileDialog;
-			}
+	internal class FileDialogCollectionNavigator : CollectionNavigatorBase {
+		readonly FileDialog fileDialog;
 
-			protected override object ElementAt (int idx)
-			{
-				var val = FileDialogTableSource.GetRawColumnValue (fileDialog.tableView.SelectedColumn, fileDialog.State?.Children [idx]);
-				if (val == null) {
-					return string.Empty;
-				}
+		public FileDialogCollectionNavigator (FileDialog fileDialog) => this.fileDialog = fileDialog;
 
-				return val.ToString ().Trim ('.');
+		protected override object ElementAt (int idx)
+		{
+			var val = FileDialogTableSource.GetRawColumnValue (fileDialog.tableView.SelectedColumn, fileDialog.State?.Children [idx]);
+			if (val == null) {
+				return string.Empty;
 			}
 
-			protected override int GetCollectionLength ()
-			{
-				return fileDialog.State?.Children.Length ?? 0;
-			}
+			return val.ToString ().Trim ('.');
 		}
+
+		protected override int GetCollectionLength () => fileDialog.State?.Children.Length ?? 0;
 	}
 }

Terminal.Gui/Views/HexView.cs

@@ -95,6 +95,17 @@ public partial class HexView : View {
 		KeyBindings.Add (KeyCode.CursorRight | KeyCode.CtrlMask, Command.EndOfLine);
 		KeyBindings.Add (KeyCode.CursorUp | KeyCode.CtrlMask, Command.StartOfPage);
 		KeyBindings.Add (KeyCode.CursorDown | KeyCode.CtrlMask, Command.EndOfPage);
+
+		LayoutComplete += HexView_LayoutComplete;
+	}
+
+	private void HexView_LayoutComplete (object sender, LayoutEventArgs e)
+	{
+		// Small buffers will just show the position, with the bsize field value (4 bytes)
+		bytesPerLine = bsize;
+		if (Bounds.Width - displayWidth > 17) {
+			bytesPerLine = bsize * ((Bounds.Width - displayWidth) / 18);
+		}
 	}
 
 	/// <summary>
@@ -174,20 +185,6 @@ public partial class HexView : View {
 		}
 	}
 
-	/// <inheritdoc/>
-	public override Rect Frame {
-		get => base.Frame;
-		set {
-			base.Frame = value;
-
-			// Small buffers will just show the position, with the bsize field value (4 bytes)
-			bytesPerLine = bsize;
-			if (value.Width - displayWidth > 17) {
-				bytesPerLine = bsize * ((value.Width - displayWidth) / 18);
-			}
-		}
-	}
-
 	//
 	// This is used to support editing of the buffer on a peer List<>, 
 	// the offset corresponds to an offset relative to DisplayStart, and
@@ -214,6 +211,7 @@ public partial class HexView : View {
 		Driver.SetAttribute (current);
 		Move (0, 0);
 
+		// BUGBUG: Bounds!!!!
 		var frame = Frame;
 
 		int nblocks = bytesPerLine / bsize;
@@ -309,6 +307,7 @@ public partial class HexView : View {
 		int delta = (int)(pos - DisplayStart);
 		int line = delta / bytesPerLine;
 
+		// BUGBUG: Bounds!
 		SetNeedsDisplay (new Rect (0, line, Frame.Width, 1));
 	}
 
@@ -331,6 +330,7 @@ public partial class HexView : View {
 	bool MoveEnd ()
 	{
 		position = source.Length;
+		// BUGBUG: Bounds!
 		if (position >= DisplayStart + bytesPerLine * Frame.Height) {
 			SetDisplayStart (position);
 			SetNeedsDisplay ();
@@ -396,6 +396,7 @@ public partial class HexView : View {
 		if (position < source.Length) {
 			position++;
 		}
+		// BUGBUG: Bounds!
 		if (position >= DisplayStart + bytesPerLine * Frame.Height) {
 			SetDisplayStart (DisplayStart + bytesPerLine);
 			SetNeedsDisplay ();
@@ -424,6 +425,7 @@ public partial class HexView : View {
 
 	bool MoveDown (int bytes)
 	{
+		// BUGBUG: Bounds!
 		RedisplayLine (position);
 		if (position + bytes < source.Length) {
 			position += bytes;
@@ -513,6 +515,8 @@ public partial class HexView : View {
 	/// <inheritdoc/>
 	public override bool MouseEvent (MouseEvent me)
 	{
+		// BUGBUG: Test this with a border! Assumes Frame == Bounds!
+
 		if (!me.Flags.HasFlag (MouseFlags.Button1Clicked) && !me.Flags.HasFlag (MouseFlags.Button1DoubleClicked)
 								&& !me.Flags.HasFlag (MouseFlags.WheeledDown) && !me.Flags.HasFlag (MouseFlags.WheeledUp)) {
 			return false;
@@ -595,6 +599,9 @@ public partial class HexView : View {
 	/// </summary>
 	public Point CursorPosition {
 		get {
+			if (!IsInitialized) {
+				return new Point (0, 0);
+			}
 			int delta = (int)position;
 			int line = delta / bytesPerLine + 1;
 			int item = delta % bytesPerLine + 1;

Terminal.Gui/Views/Label.cs

@@ -1,141 +1,116 @@
-//
-// Label.cs: Label control
-//
-// Authors:
-//   Miguel de Icaza ([email protected])
-//
+using System;
+
+namespace Terminal.Gui; 
+
+/// <summary>
+/// The Label <see cref="View"/> displays a string at a given position and supports multiple lines separated by newline
+/// characters.
+/// Multi-line Labels support word wrap.
+/// </summary>
+/// <remarks>
+/// The <see cref="Label"/> view is functionality identical to <see cref="View"/> and is included for API backwards
+/// compatibility.
+/// </remarks>
+public class Label : View {
+	/// <inheritdoc/>
+	public Label () => SetInitialProperties ();
+
+	/// <inheritdoc/>
+	public Label (Rect frame, bool autosize = false) : base (frame) => SetInitialProperties (autosize);
+
+	/// <inheritdoc/>
+	public Label (string text, bool autosize = true) : base (text) => SetInitialProperties (autosize);
+
+	/// <inheritdoc/>
+	public Label (Rect rect, string text, bool autosize = false) : base (rect, text) => SetInitialProperties (autosize);
+
+	/// <inheritdoc/>
+	public Label (int x, int y, string text, bool autosize = true) : base (x, y, text) => SetInitialProperties (autosize);
+
+	/// <inheritdoc/>
+	public Label (string text, TextDirection direction, bool autosize = true)
+		: base (text, direction) => SetInitialProperties (autosize);
+
+	void SetInitialProperties (bool autosize = true)
+	{
+		Height   = 1;
+		AutoSize = autosize;
+		// Things this view knows how to do
+		AddCommand (Command.Default, () => {
+			// BUGBUG: This is a hack, but it does work.
+			var can = CanFocus;
+			CanFocus = true;
+			SetFocus ();
+			SuperView.FocusNext ();
+			CanFocus = can;
+			return true;
+		});
+		AddCommand (Command.Accept, () => AcceptKey ());
+
+		// Default key bindings for this view
+		KeyBindings.Add (KeyCode.Space, Command.Accept);
+	}
 
-using System;
-using System.Text;
+	bool AcceptKey ()
+	{
+		if (!HasFocus) {
+			SetFocus ();
+		}
+		OnClicked ();
+		return true;
+	}
 
-namespace Terminal.Gui {
 	/// <summary>
-	/// The Label <see cref="View"/> displays a string at a given position and supports multiple lines separated by newline characters.
-	/// Multi-line Labels support word wrap.
+	/// The event fired when the user clicks the primary mouse button within the Bounds of this <see cref="View"/>
+	/// or if the user presses the action key while this view is focused. (TODO: IsDefault)
 	/// </summary>
 	/// <remarks>
-	/// The <see cref="Label"/> view is functionality identical to <see cref="View"/> and is included for API backwards compatibility.
+	/// Client code can hook up to this event, it is
+	/// raised when the button is activated either with
+	/// the mouse or the keyboard.
 	/// </remarks>
-	public class Label : View {
-		/// <inheritdoc/>
-		public Label ()
-		{
-			SetInitialProperties ();
-		}
-
-		/// <inheritdoc/>
-		public Label (Rect frame, bool autosize = false) : base (frame)
-		{
-			SetInitialProperties (autosize);
-		}
+	public event EventHandler Clicked;
 
-		/// <inheritdoc/>
-		public Label (string text, bool autosize = true) : base (text)
-		{
-			SetInitialProperties (autosize);
-		}
-
-		/// <inheritdoc/>
-		public Label (Rect rect, string text, bool autosize = false) : base (rect, text)
-		{
-			SetInitialProperties (autosize);
-		}
-
-		/// <inheritdoc/>
-		public Label (int x, int y, string text, bool autosize = true) : base (x, y, text)
-		{
-			SetInitialProperties (autosize);
-		}
-
-		/// <inheritdoc/>
-		public Label (string text, TextDirection direction, bool autosize = true)
-			: base (text, direction)
-		{
-			SetInitialProperties (autosize);
+	/// <summary>
+	/// Method invoked when a mouse event is generated
+	/// </summary>
+	/// <param name="mouseEvent"></param>
+	/// <returns><c>true</c>, if the event was handled, <c>false</c> otherwise.</returns>
+	public override bool OnMouseEvent (MouseEvent mouseEvent)
+	{
+		var args = new MouseEventEventArgs (mouseEvent);
+		if (OnMouseClick (args)) {
+			return true;
 		}
-
-		void SetInitialProperties (bool autosize = true)
-		{
-			Height = 1;
-			AutoSize = autosize;
-			// Things this view knows how to do
-			AddCommand (Command.Default, () => {
-				// BUGBUG: This is a hack, but it does work.
-				var can = CanFocus;
-				CanFocus = true;
-				SetFocus ();
-				SuperView.FocusNext ();
-				CanFocus = can;
-				return true;
-			});
-			AddCommand (Command.Accept, () => AcceptKey ());
-
-			// Default key bindings for this view
-			KeyBindings.Add (KeyCode.Space, Command.Accept);
+		if (MouseEvent (mouseEvent)) {
+			return true;
 		}
 
-		bool AcceptKey ()
-		{
-			if (!HasFocus) {
+		if (mouseEvent.Flags == MouseFlags.Button1Clicked) {
+			if (!HasFocus && SuperView != null) {
+				if (!SuperView.HasFocus) {
+					SuperView.SetFocus ();
+				}
 				SetFocus ();
+				SetNeedsDisplay ();
 			}
+
 			OnClicked ();
 			return true;
 		}
-		
-		/// <summary>
-		///   The event fired when the user clicks the primary mouse button within the Bounds of this <see cref="View"/>
-		///   or if the user presses the action key while this view is focused. (TODO: IsDefault)
-		/// </summary>
-		/// <remarks>
-		///   Client code can hook up to this event, it is
-		///   raised when the button is activated either with
-		///   the mouse or the keyboard.
-		/// </remarks>
-		public event EventHandler Clicked;
-
-		/// <summary>
-		/// Method invoked when a mouse event is generated
-		/// </summary>
-		/// <param name="mouseEvent"></param>
-		/// <returns><c>true</c>, if the event was handled, <c>false</c> otherwise.</returns>
-		public override bool OnMouseEvent (MouseEvent mouseEvent)
-		{
-			MouseEventEventArgs args = new MouseEventEventArgs (mouseEvent);
-			if (OnMouseClick (args))
-				return true;
-			if (MouseEvent (mouseEvent))
-				return true;
-
-			if (mouseEvent.Flags == MouseFlags.Button1Clicked) {
-				if (!HasFocus && SuperView != null) {
-					if (!SuperView.HasFocus) {
-						SuperView.SetFocus ();
-					}
-					SetFocus ();
-					SetNeedsDisplay ();
-				}
-
-				OnClicked ();
-				return true;
-			}
-			return false;
-		}
-
-		///<inheritdoc/>
-		public override bool OnEnter (View view)
-		{
-			Application.Driver.SetCursorVisibility (CursorVisibility.Invisible);
+		return false;
+	}
 
-			return base.OnEnter (view);
-		}
+	///<inheritdoc/>
+	public override bool OnEnter (View view)
+	{
+		Application.Driver.SetCursorVisibility (CursorVisibility.Invisible);
 
-		/// <summary>
-		/// Virtual method to invoke the <see cref="Clicked"/> event.
-		/// </summary>
-		public virtual void OnClicked ()
-		{
-			Clicked?.Invoke (this, EventArgs.Empty);
-		}
+		return base.OnEnter (view);
 	}
-}
+
+	/// <summary>
+	/// Virtual method to invoke the <see cref="Clicked"/> event.
+	/// </summary>
+	public virtual void OnClicked () => Clicked?.Invoke (this, EventArgs.Empty);
+}

Terminal.Gui/Views/Menu/ContextMenu.cs

@@ -99,7 +99,7 @@ public sealed class ContextMenu : IDisposable {
 		}
 		_container = Application.Current;
 		_container.Closing += Container_Closing;
-		var frame = new Rect (0, 0, View.Driver.Cols, View.Driver.Rows);
+		var frame = Application.Driver.Bounds;
 		var position = Position;
 		if (Host != null) {
 			Host.BoundsToScreen (frame.X, frame.Y, out int x, out int y);

Terminal.Gui/Views/Menu/MenuBar.cs

@@ -1445,7 +1445,7 @@ public class MenuBar : View {
 		if (Driver == null) {
 			return Point.Empty;
 		}
-		var superViewFrame = SuperView == null ? new Rect (0, 0, Driver.Cols, Driver.Rows) : SuperView.Frame;
+		var superViewFrame = SuperView == null ? Driver.Bounds : SuperView.Frame;
 		var sv = SuperView == null ? Application.Current : SuperView;
 		var boundsOffset = sv.GetBoundsOffset ();
 		return new Point (superViewFrame.X - sv.Frame.X - boundsOffset.X,
@@ -1458,7 +1458,7 @@ public class MenuBar : View {
 	/// <returns>The location offset.</returns>
 	internal Point GetScreenOffsetFromCurrent ()
 	{
-		var screen = new Rect (0, 0, Driver.Cols, Driver.Rows);
+		var screen = Driver.Bounds;
 		var currentFrame = Application.Current.Frame;
 		var boundsOffset = Application.Top.GetBoundsOffset ();
 		return new Point (screen.X - currentFrame.X - boundsOffset.X

Terminal.Gui/Views/ProgressBar.cs

@@ -82,7 +82,8 @@ public class ProgressBar : View {
 
 	void ProgressBar_LayoutStarted (object sender, EventArgs e)
 	{
-		Bounds = new Rect (Bounds.Location, new Size (Bounds.Width, 1));
+		// TODO: use Dim.Auto
+		Height = 1 + GetFramesThickness ().Vertical;
 	}
 
 	float _fraction;

Terminal.Gui/Views/RadioGroup.cs

@@ -10,7 +10,7 @@ namespace Terminal.Gui;
 public class RadioGroup : View {
 	int _selected = -1;
 	int _cursor;
-	DisplayModeLayout _displayMode;
+	Orientation _orientation = Orientation.Vertical;
 	int _horizontalSpace = 2;
 	List<(int pos, int length)> _horizontal;
 
@@ -26,7 +26,7 @@ public class RadioGroup : View {
 	/// <param name="selected">The index of the item to be selected, the value is clamped to the number of items.</param>
 	public RadioGroup (string [] radioLabels, int selected = 0) : base ()
 	{
-		SetInitialProperties (Rect.Empty, radioLabels, selected);
+		SetInitialProperties (radioLabels, selected);
 	}
 
 	/// <summary>
@@ -37,22 +37,10 @@ public class RadioGroup : View {
 	/// <param name="selected">The index of item to be selected, the value is clamped to the number of items.</param>
 	public RadioGroup (Rect rect, string [] radioLabels, int selected = 0) : base (rect)
 	{
-		SetInitialProperties (rect, radioLabels, selected);
+		SetInitialProperties (radioLabels, selected);
 	}
 
-	/// <summary>
-	/// Initializes a new instance of the <see cref="RadioGroup"/> class using <see cref="LayoutStyle.Absolute"/> layout.
-	/// The <see cref="View"/> frame is computed from the provided radio labels.
-	/// </summary>
-	/// <param name="x">The x coordinate.</param>
-	/// <param name="y">The y coordinate.</param>
-	/// <param name="radioLabels">The radio labels; an array of strings that can contain hotkeys using an underscore before the letter.</param>
-	/// <param name="selected">The item to be selected, the value is clamped to the number of items.</param>
-	public RadioGroup (int x, int y, string [] radioLabels, int selected = 0) :
-		this (MakeRect (x, y, radioLabels != null ? radioLabels.ToList () : null), radioLabels, selected)
-	{ }
-
-	void SetInitialProperties (Rect rect, string [] radioLabels, int selected)
+	void SetInitialProperties (string [] radioLabels, int selected)
 	{
 		HotKeySpecifier = new Rune ('_');
 
@@ -61,7 +49,6 @@ public class RadioGroup : View {
 		}
 
 		_selected = selected;
-		Frame = rect;
 		CanFocus = true;
 
 		// Things this view knows how to do
@@ -87,26 +74,42 @@ public class RadioGroup : View {
 	}
 
 	/// <summary>
-	/// Gets or sets the <see cref="DisplayModeLayout"/> for this <see cref="RadioGroup"/>.
+	/// Gets or sets the <see cref="Orientation"/> for this <see cref="RadioGroup"/>. The default is <see cref="Orientation.Vertical"/>.
 	/// </summary>
-	public DisplayModeLayout DisplayMode {
-		get { return _displayMode; }
-		set {
-			if (_displayMode != value) {
-				_displayMode = value;
-				SetWidthHeight (_radioLabels);
-				SetNeedsDisplay ();
-			}
+	public Orientation Orientation {
+		get => _orientation;
+		set => OnOrientationChanged (value);
+	}
+
+	/// <summary>
+	/// Fired when the view orientation has changed. Can be cancelled by setting
+	/// <see cref="OrientationEventArgs.Cancel"/> to true.
+	/// </summary>
+	public event EventHandler<OrientationEventArgs> OrientationChanged;
+
+	/// <summary>
+	/// Called when the view orientation has changed. Invokes the <see cref="OrientationChanged"/> event.
+	/// </summary>
+	/// <param name="newOrientation"></param>
+	/// <returns>True of the event was cancelled.</returns>
+	public virtual bool OnOrientationChanged (Orientation newOrientation)
+	{
+		var args = new OrientationEventArgs (newOrientation);
+		OrientationChanged?.Invoke (this, args);
+		if (!args.Cancel) {
+			_orientation = newOrientation;
+			SetNeedsLayout ();
 		}
+		return args.Cancel;
 	}
 
 	/// <summary>
-	/// Gets or sets the horizontal space for this <see cref="RadioGroup"/> if the <see cref="DisplayMode"/> is <see cref="DisplayModeLayout.Horizontal"/>
+	/// Gets or sets the horizontal space for this <see cref="RadioGroup"/> if the <see cref="Orientation"/> is <see cref="Orientation.Horizontal"/>
 	/// </summary>
 	public int HorizontalSpace {
 		get { return _horizontalSpace; }
 		set {
-			if (_horizontalSpace != value && _displayMode == DisplayModeLayout.Horizontal) {
+			if (_horizontalSpace != value && _orientation == Orientation.Horizontal) {
 				_horizontalSpace = value;
 				SetWidthHeight (_radioLabels);
 				UpdateTextFormatterText ();
@@ -117,24 +120,24 @@ public class RadioGroup : View {
 
 	void SetWidthHeight (List<string> radioLabels)
 	{
-		switch (_displayMode) {
-		case DisplayModeLayout.Vertical:
+		switch (_orientation) {
+		case Orientation.Vertical:
 			var r = MakeRect (0, 0, radioLabels);
-			Bounds = new Rect (Bounds.Location, new Size (r.Width, radioLabels.Count));
+			if (IsInitialized) {
+				Width = r.Width + GetFramesThickness ().Horizontal;
+				Height = radioLabels.Count + GetFramesThickness ().Vertical;
+			}
 			break;
 
-		case DisplayModeLayout.Horizontal:
+		case Orientation.Horizontal:
 			CalculateHorizontalPositions ();
 			var length = 0;
 			foreach (var item in _horizontal) {
 				length += item.length;
 			}
-			var hr = new Rect (0, 0, length, 1);
-			if (IsAdded && LayoutStyle == LayoutStyle.Computed) {
-				Width = hr.Width;
-				Height = 1;
-			} else {
-				Bounds = new Rect (Bounds.Location, new Size (hr.Width, radioLabels.Count));
+			if (IsInitialized) {
+				Width = length + GetFramesThickness ().Vertical;
+				Height = 1 + GetFramesThickness ().Horizontal;
 			}
 			break;
 		}
@@ -199,7 +202,7 @@ public class RadioGroup : View {
 		if (KeyBindings.TryGet (key, out _)) {
 			// Search RadioLabels 
 			for (int i = 0; i < _radioLabels.Count; i++) {
-				if (TextFormatter.FindHotKey (_radioLabels [i], HotKeySpecifier, true, out _, out var hotKey) 
+				if (TextFormatter.FindHotKey (_radioLabels [i], HotKeySpecifier, true, out _, out var hotKey)
 					&& (key.NoAlt.NoCtrl.NoShift) == hotKey) {
 					SelectedItem = i;
 					keyEvent.Scope = KeyBindingScope.HotKey;
@@ -213,7 +216,7 @@ public class RadioGroup : View {
 
 	void CalculateHorizontalPositions ()
 	{
-		if (_displayMode == DisplayModeLayout.Horizontal) {
+		if (_orientation == Orientation.Horizontal) {
 			_horizontal = new List<(int pos, int length)> ();
 			int start = 0;
 			int length = 0;
@@ -232,11 +235,11 @@ public class RadioGroup : View {
 
 		Driver.SetAttribute (GetNormalColor ());
 		for (int i = 0; i < _radioLabels.Count; i++) {
-			switch (DisplayMode) {
-			case DisplayModeLayout.Vertical:
+			switch (Orientation) {
+			case Orientation.Vertical:
 				Move (0, i);
 				break;
-			case DisplayModeLayout.Horizontal:
+			case Orientation.Horizontal:
 				Move (_horizontal [i].pos, 0);
 				break;
 			}
@@ -276,11 +279,11 @@ public class RadioGroup : View {
 	///<inheritdoc/>
 	public override void PositionCursor ()
 	{
-		switch (DisplayMode) {
-		case DisplayModeLayout.Vertical:
+		switch (Orientation) {
+		case Orientation.Vertical:
 			Move (0, _cursor);
 			break;
-		case DisplayModeLayout.Horizontal:
+		case Orientation.Horizontal:
 			Move (_horizontal [_cursor].pos, 0);
 			break;
 		}
@@ -374,11 +377,11 @@ public class RadioGroup : View {
 		int boundsX = me.X;
 		int boundsY = me.Y;
 
-		var pos = _displayMode == DisplayModeLayout.Horizontal ? boundsX : boundsY;
-		var rCount = _displayMode == DisplayModeLayout.Horizontal ? _horizontal.Last ().pos + _horizontal.Last ().length : _radioLabels.Count;
+		var pos = _orientation == Orientation.Horizontal ? boundsX : boundsY;
+		var rCount = _orientation == Orientation.Horizontal ? _horizontal.Last ().pos + _horizontal.Last ().length : _radioLabels.Count;
 
 		if (pos < rCount) {
-			var c = _displayMode == DisplayModeLayout.Horizontal ? _horizontal.FindIndex ((x) => x.pos <= boundsX && x.pos + x.length - 2 >= boundsX) : boundsY;
+			var c = _orientation == Orientation.Horizontal ? _horizontal.FindIndex ((x) => x.pos <= boundsX && x.pos + x.length - 2 >= boundsX) : boundsY;
 			if (c > -1) {
 				_cursor = SelectedItem = c;
 				SetNeedsDisplay ();
@@ -396,16 +399,3 @@ public class RadioGroup : View {
 	}
 }
 
-/// <summary>
-/// Used for choose the display mode of this <see cref="RadioGroup"/>
-/// </summary>
-public enum DisplayModeLayout {
-	/// <summary>
-	/// Vertical mode display. It's the default.
-	/// </summary>
-	Vertical,
-	/// <summary>
-	/// Horizontal mode display.
-	/// </summary>
-	Horizontal
-}

Terminal.Gui/Views/ScrollBarView.cs

@@ -8,816 +8,824 @@
 using System;
 using System.Text;
 
-namespace Terminal.Gui {
+namespace Terminal.Gui; 
+
+/// <summary>
+/// ScrollBarViews are views that display a 1-character scrollbar, either horizontal or vertical
+/// </summary>
+/// <remarks>
+///         <para>
+///         The scrollbar is drawn to be a representation of the Size, assuming that the
+///         scroll position is set at Position.
+///         </para>
+///         <para>
+///         If the region to display the scrollbar is larger than three characters,
+///         arrow indicators are drawn.
+///         </para>
+/// </remarks>
+public class ScrollBarView : View {
+	bool _autoHideScrollBars = true;
+	View _contentBottomRightCorner;
+	bool _hosted;
+	bool _keepContentAlwaysInViewport = true;
+
+	int _lastLocation = -1;
+	ScrollBarView _otherScrollBarView;
+	int _posBarOffset;
+	int _posBottomTee;
+	int _posLeftTee;
+	int _posRightTee;
+
+	int _posTopTee;
+	bool _showScrollIndicator;
+	int _size, _position;
+	bool _vertical;
+
 	/// <summary>
-	/// ScrollBarViews are views that display a 1-character scrollbar, either horizontal or vertical
+	/// Initializes a new instance of the <see cref="Gui.ScrollBarView"/> class using <see cref="LayoutStyle.Absolute"/>
+	/// layout.
 	/// </summary>
-	/// <remarks>
-	/// <para>
-	///   The scrollbar is drawn to be a representation of the Size, assuming that the 
-	///   scroll position is set at Position.
-	/// </para>
-	/// <para>
-	///   If the region to display the scrollbar is larger than three characters, 
-	///   arrow indicators are drawn.
-	/// </para>
-	/// </remarks>
-	public class ScrollBarView : View {
-		bool _vertical;
-		int _size, _position;
-		bool _showScrollIndicator;
-		bool _keepContentAlwaysInViewport = true;
-		bool _autoHideScrollBars = true;
-		bool _hosted;
-		ScrollBarView _otherScrollBarView;
-		View _contentBottomRightCorner;
-
-		bool _showBothScrollIndicator => OtherScrollBarView?._showScrollIndicator == true && _showScrollIndicator;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Gui.ScrollBarView"/> class using <see cref="LayoutStyle.Absolute"/> layout.
-		/// </summary>
-		/// <param name="rect">Frame for the scrollbar.</param>
-		public ScrollBarView (Rect rect) : this (rect, 0, 0, false) { }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Gui.ScrollBarView"/> class using <see cref="LayoutStyle.Absolute"/> layout.
-		/// </summary>
-		/// <param name="rect">Frame for the scrollbar.</param>
-		/// <param name="size">The size that this scrollbar represents. Sets the <see cref="Size"/> property.</param>
-		/// <param name="position">The position within this scrollbar. Sets the <see cref="Position"/> property.</param>
-		/// <param name="isVertical">If set to <c>true</c> this is a vertical scrollbar, otherwise, the scrollbar is horizontal. Sets the <see cref="IsVertical"/> property.</param>
-		public ScrollBarView (Rect rect, int size, int position, bool isVertical) : base (rect)
-		{
-			SetInitialProperties (size, position, isVertical);
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Gui.ScrollBarView"/> class using <see cref="LayoutStyle.Computed"/> layout.
-		/// </summary>
-		public ScrollBarView () : this (0, 0, false) { }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Gui.ScrollBarView"/> class using <see cref="LayoutStyle.Computed"/> layout.
-		/// </summary>
-		/// <param name="size">The size that this scrollbar represents.</param>
-		/// <param name="position">The position within this scrollbar.</param>
-		/// <param name="isVertical">If set to <c>true</c> this is a vertical scrollbar, otherwise, the scrollbar is horizontal.</param>
-		public ScrollBarView (int size, int position, bool isVertical) : base ()
-		{
-			SetInitialProperties (size, position, isVertical);
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Gui.ScrollBarView"/> class using <see cref="LayoutStyle.Computed"/> layout.
-		/// </summary>
-		/// <param name="host">The view that will host this scrollbar.</param>
-		/// <param name="isVertical">If set to <c>true</c> this is a vertical scrollbar, otherwise, the scrollbar is horizontal.</param>
-		/// <param name="showBothScrollIndicator">If set to <c>true (default)</c> will have the other scrollbar, otherwise will have only one.</param>
-		public ScrollBarView (View host, bool isVertical, bool showBothScrollIndicator = true) : this (0, 0, isVertical)
-		{
-			if (host == null) {
-				throw new ArgumentNullException ("The host parameter can't be null.");
-			} else if (host.SuperView == null) {
-				throw new ArgumentNullException ("The host SuperView parameter can't be null.");
-			}
-			_hosted = true;
-			ColorScheme = host.ColorScheme;
-			X = isVertical ? Pos.Right (host) - 1 : Pos.Left (host);
-			Y = isVertical ? Pos.Top (host) : Pos.Bottom (host) - 1;
-			Host = host;
-			CanFocus = false;
-			Enabled = host.Enabled;
-			Visible = host.Visible;
-			//Host.CanFocusChanged += Host_CanFocusChanged;
-			Host.EnabledChanged += Host_EnabledChanged;
-			Host.VisibleChanged += Host_VisibleChanged;
-			Host.SuperView.Add (this);
-			AutoHideScrollBars = true;
-			if (showBothScrollIndicator) {
-				OtherScrollBarView = new ScrollBarView (0, 0, !isVertical) {
-					Id = "OtherScrollBarView",
-					ColorScheme = host.ColorScheme,
-					Host = host,
-					CanFocus = false,
-					Enabled = host.Enabled,
-					Visible = host.Visible,
-					OtherScrollBarView = this
-				};
-				OtherScrollBarView._hosted = true;
-				OtherScrollBarView.X = OtherScrollBarView.IsVertical ? Pos.Right (host) - 1 : Pos.Left (host);
-				OtherScrollBarView.Y = OtherScrollBarView.IsVertical ? Pos.Top (host) : Pos.Bottom (host) - 1;
-				OtherScrollBarView.Host.SuperView.Add (OtherScrollBarView);
-				OtherScrollBarView.ShowScrollIndicator = true;
-			}
-			ShowScrollIndicator = true;
-			CreateBottomRightCorner ();
-			ClearOnVisibleFalse = false;
-		}
-
-		private void CreateBottomRightCorner ()
-		{
-			if (Host != null && (_contentBottomRightCorner == null && OtherScrollBarView == null
-				|| (_contentBottomRightCorner == null && OtherScrollBarView != null && OtherScrollBarView._contentBottomRightCorner == null))) {
-
-				_contentBottomRightCorner = new View () {
-					Id = "contentBottomRightCorner",
-					Visible = Host.Visible,
-					ClearOnVisibleFalse = false,
-					ColorScheme = ColorScheme
-				};
-				if (_hosted) {
-					Host.SuperView.Add (_contentBottomRightCorner);
-				} else {
-					Host.Add (_contentBottomRightCorner);
-				}
-				_contentBottomRightCorner.X = Pos.Right (Host) - 1;
-				_contentBottomRightCorner.Y = Pos.Bottom (Host) - 1;
-				_contentBottomRightCorner.Width = 1;
-				_contentBottomRightCorner.Height = 1;
-				_contentBottomRightCorner.MouseClick += ContentBottomRightCorner_MouseClick;
-				_contentBottomRightCorner.DrawContent += _contentBottomRightCorner_DrawContent;
-			}
-		}
-
-		private void _contentBottomRightCorner_DrawContent (object sender, DrawEventArgs e)
-		{
-			Driver.SetAttribute (Host.HasFocus ? ColorScheme.Focus : GetNormalColor ());
-		}
+	/// <param name="rect">Frame for the scrollbar.</param>
+	public ScrollBarView (Rect rect) : this (rect, 0, 0, false) { }
 
-		private void Host_VisibleChanged (object sender, EventArgs e)
-		{
-			if (!Host.Visible) {
-				Visible = Host.Visible;
-				if (_otherScrollBarView != null) {
-					_otherScrollBarView.Visible = Visible;
-				}
-				_contentBottomRightCorner.Visible = Visible;
-			} else {
-				ShowHideScrollBars ();
-			}
-		}
-
-		private void Host_EnabledChanged (object sender, EventArgs e)
-		{
-			Enabled = Host.Enabled;
-			if (_otherScrollBarView != null) {
-				_otherScrollBarView.Enabled = Enabled;
-			}
-			_contentBottomRightCorner.Enabled = Enabled;
-		}
-
-		//private void Host_CanFocusChanged ()
-		//{
-		//	CanFocus = Host.CanFocus;
-		//	if (otherScrollBarView != null) {
-		//		otherScrollBarView.CanFocus = CanFocus;
-		//	}
-		//}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Gui.ScrollBarView"/> class using <see cref="LayoutStyle.Absolute"/>
+	/// layout.
+	/// </summary>
+	/// <param name="rect">Frame for the scrollbar.</param>
+	/// <param name="size">The size that this scrollbar represents. Sets the <see cref="Size"/> property.</param>
+	/// <param name="position">The position within this scrollbar. Sets the <see cref="Position"/> property.</param>
+	/// <param name="isVertical">
+	/// If set to <c>true</c> this is a vertical scrollbar, otherwise, the scrollbar is horizontal. Sets the
+	/// <see cref="IsVertical"/> property.
+	/// </param>
+	public ScrollBarView (Rect rect, int size, int position, bool isVertical) : base (rect) => SetInitialProperties (size, position, isVertical);
 
-		void ContentBottomRightCorner_MouseClick (object sender, MouseEventEventArgs me)
-		{
-			if (me.MouseEvent.Flags == MouseFlags.WheeledDown || me.MouseEvent.Flags == MouseFlags.WheeledUp
-			    || me.MouseEvent.Flags == MouseFlags.WheeledRight || me.MouseEvent.Flags == MouseFlags.WheeledLeft) {
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Gui.ScrollBarView"/> class using <see cref="LayoutStyle.Computed"/>
+	/// layout.
+	/// </summary>
+	public ScrollBarView () : this (0, 0, false) { }
 
-				MouseEvent (me.MouseEvent);
-			} else if (me.MouseEvent.Flags == MouseFlags.Button1Clicked) {
-				Host.SetFocus ();
-			}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Gui.ScrollBarView"/> class using <see cref="LayoutStyle.Computed"/>
+	/// layout.
+	/// </summary>
+	/// <param name="size">The size that this scrollbar represents.</param>
+	/// <param name="position">The position within this scrollbar.</param>
+	/// <param name="isVertical">If set to <c>true</c> this is a vertical scrollbar, otherwise, the scrollbar is horizontal.</param>
+	public ScrollBarView (int size, int position, bool isVertical) => SetInitialProperties (size, position, isVertical);
 
-			me.Handled = true;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Gui.ScrollBarView"/> class using <see cref="LayoutStyle.Computed"/>
+	/// layout.
+	/// </summary>
+	/// <param name="host">The view that will host this scrollbar.</param>
+	/// <param name="isVertical">If set to <c>true</c> this is a vertical scrollbar, otherwise, the scrollbar is horizontal.</param>
+	/// <param name="showBothScrollIndicator">
+	/// If set to <c>true (default)</c> will have the other scrollbar, otherwise will
+	/// have only one.
+	/// </param>
+	public ScrollBarView (View host, bool isVertical, bool showBothScrollIndicator = true) : this (0, 0, isVertical)
+	{
+		if (host == null) {
+			throw new ArgumentNullException ("The host parameter can't be null.");
 		}
+		if (host.SuperView == null) {
+			throw new ArgumentNullException ("The host SuperView parameter can't be null.");
+		}
+		_hosted = true;
+		ColorScheme = host.ColorScheme;
+		X = isVertical ? Pos.Right (host) - 1 : Pos.Left (host);
+		Y = isVertical ? Pos.Top (host) : Pos.Bottom (host) - 1;
+		Host = host;
+		CanFocus = false;
+		Enabled = host.Enabled;
+		Visible = host.Visible;
+		//Host.CanFocusChanged += Host_CanFocusChanged;
+		Host.EnabledChanged += Host_EnabledChanged;
+		Host.VisibleChanged += Host_VisibleChanged;
+		Host.SuperView.Add (this);
+		AutoHideScrollBars = true;
+		if (showBothScrollIndicator) {
+			OtherScrollBarView = new ScrollBarView (0, 0, !isVertical) {
+				Id = "OtherScrollBarView",
+				ColorScheme = host.ColorScheme,
+				Host = host,
+				CanFocus = false,
+				Enabled = host.Enabled,
+				Visible = host.Visible,
+				OtherScrollBarView = this
+			};
+			OtherScrollBarView._hosted = true;
+			OtherScrollBarView.X = OtherScrollBarView.IsVertical ? Pos.Right (host) - 1 : Pos.Left (host);
+			OtherScrollBarView.Y = OtherScrollBarView.IsVertical ? Pos.Top (host) : Pos.Bottom (host) - 1;
+			OtherScrollBarView.Host.SuperView.Add (OtherScrollBarView);
+			OtherScrollBarView.ShowScrollIndicator = true;
+		}
+		ShowScrollIndicator = true;
+		CreateBottomRightCorner ();
+		ClearOnVisibleFalse = false;
+	}
 
-		void SetInitialProperties (int size, int position, bool isVertical)
-		{
-			Id = "ScrollBarView";
-			_vertical = isVertical;
-			this._position = position;
-			this._size = size;
-			WantContinuousButtonPressed = true;
-			ClearOnVisibleFalse = false;
-
-			Added += (s, e) => CreateBottomRightCorner ();
+	bool _showBothScrollIndicator => OtherScrollBarView?._showScrollIndicator == true && _showScrollIndicator;
 
-			Initialized += (s, e) => {
+	/// <summary>
+	/// If set to <c>true</c> this is a vertical scrollbar, otherwise, the scrollbar is horizontal.
+	/// </summary>
+	public bool IsVertical {
+		get => _vertical;
+		set {
+			_vertical = value;
+			if (IsInitialized) {
 				SetWidthHeight ();
-				SetRelativeLayout (SuperView?.Frame ?? Host?.Frame ?? Frame);
-				if (Id == "OtherScrollBarView" || OtherScrollBarView == null) {
-					// Only do this once if both scrollbars are enabled
-					ShowHideScrollBars ();
-				}
-				SetPosition (position);
-			};
+			}
 		}
+	}
 
-		/// <summary>
-		/// If set to <c>true</c> this is a vertical scrollbar, otherwise, the scrollbar is horizontal.
-		/// </summary>
-		public bool IsVertical {
-			get => _vertical;
-			set {
-				_vertical = value;
-				if (IsInitialized) {
-					SetWidthHeight ();
-				}
+	/// <summary>
+	/// The size of content the scrollbar represents.
+	/// </summary>
+	/// <value>The size.</value>
+	/// <remarks>
+	/// The <see cref="Size"/> is typically the size of the virtual content. E.g. when a Scrollbar is
+	/// part of a <see cref="View"/> the Size is set to the appropriate dimension of <see cref="Host"/>.
+	/// </remarks>
+	public int Size {
+		get => _size;
+		set {
+			_size = value;
+			if (IsInitialized) {
+				SetRelativeLayout (SuperView?.Frame ?? Host.Frame);
+				ShowHideScrollBars (false);
+				SetNeedsDisplay ();
 			}
 		}
+	}
 
-		/// <summary>
-		/// The size of content the scrollbar represents.
-		/// </summary>
-		/// <value>The size.</value>
-		/// <remarks>The <see cref="Size"/> is typically the size of the virtual content. E.g. when a Scrollbar is
-		/// part of a <see cref="View"/> the Size is set to the appropriate dimension of <see cref="Host"/>.</remarks>
-		public int Size {
-			get => _size;
-			set {
-				_size = value;
-				if (IsInitialized) {
-					SetRelativeLayout (SuperView?.Frame ?? Host.Frame);
-					ShowHideScrollBars (false);
-					SetNeedsDisplay ();
-				}
+	/// <summary>
+	/// The position, relative to <see cref="Size"/>, to set the scrollbar at.
+	/// </summary>
+	/// <value>The position.</value>
+	public int Position {
+		get => _position;
+		set {
+			_position = value;
+			if (IsInitialized) {
+				// We're not initialized so we can't do anything fancy. Just cache value.
+				SetPosition (value);
 			}
 		}
+	}
 
-		/// <summary>
-		/// This event is raised when the position on the scrollbar has changed.
-		/// </summary>
-		public event EventHandler ChangedPosition;
+	// BUGBUG: v2 - for consistency this should be named "Parent" not "Host"
+	/// <summary>
+	/// Get or sets the view that host this <see cref="ScrollBarView"/>
+	/// </summary>
+	public View Host { get; internal set; }
 
-		/// <summary>
-		/// The position, relative to <see cref="Size"/>, to set the scrollbar at.
-		/// </summary>
-		/// <value>The position.</value>
-		public int Position {
-			get => _position;
-			set {
-				_position = value;
-				if (IsInitialized) {
-					// We're not initialized so we can't do anything fancy. Just cache value.
-					SetPosition (value);
-				}
+	/// <summary>
+	/// Represent a vertical or horizontal ScrollBarView other than this.
+	/// </summary>
+	public ScrollBarView OtherScrollBarView {
+		get => _otherScrollBarView;
+		set {
+			if (value != null && (value.IsVertical && _vertical || !value.IsVertical && !_vertical)) {
+				throw new ArgumentException ($"There is already a {(_vertical ? "vertical" : "horizontal")} ScrollBarView.");
 			}
+			_otherScrollBarView = value;
 		}
+	}
 
-		// Helper to assist Initialized event handler
-		private void SetPosition (int newPosition)
-		{
-			if (CanScroll (newPosition - _position, out int max, _vertical)) {
-				if (max == newPosition - _position) {
-					_position = newPosition;
+	// BUGBUG: v2 - Why can't we get rid of this and just use Visible?
+	/// <summary>
+	/// Gets or sets the visibility for the vertical or horizontal scroll indicator.
+	/// </summary>
+	/// <value><c>true</c> if show vertical or horizontal scroll indicator; otherwise, <c>false</c>.</value>
+	public bool ShowScrollIndicator {
+		get => _showScrollIndicator;
+		set {
+			//if (value == showScrollIndicator) {
+			//	return;
+			//}
+
+			_showScrollIndicator = value;
+			if (IsInitialized) {
+				SetNeedsLayout ();
+				if (value) {
+					Visible = true;
 				} else {
-					_position = Math.Max (_position + max, 0);
-				}
-			} else if (max < 0) {
-				_position = Math.Max (_position + max, 0);
-			} else {
-				_position = Math.Max (newPosition, 0);
-			}
-			OnChangedPosition ();
-			SetNeedsDisplay ();
-		}
-
-		// BUGBUG: v2 - for consistency this should be named "Parent" not "Host"
-		/// <summary>
-		/// Get or sets the view that host this <see cref="ScrollBarView"/>
-		/// </summary>
-		public View Host { get; internal set; }
-
-		/// <summary>
-		/// Represent a vertical or horizontal ScrollBarView other than this.
-		/// </summary>
-		public ScrollBarView OtherScrollBarView {
-			get => _otherScrollBarView;
-			set {
-				if (value != null && (value.IsVertical && _vertical || !value.IsVertical && !_vertical)) {
-					throw new ArgumentException ($"There is already a {(_vertical ? "vertical" : "horizontal")} ScrollBarView.");
-				}
-				_otherScrollBarView = value;
-			}
-		}
-
-		// BUGBUG: v2 - Why can't we get rid of this and just use Visible?
-		/// <summary>
-		/// Gets or sets the visibility for the vertical or horizontal scroll indicator.
-		/// </summary>
-		/// <value><c>true</c> if show vertical or horizontal scroll indicator; otherwise, <c>false</c>.</value>
-		public bool ShowScrollIndicator {
-			get => _showScrollIndicator;
-			set {
-				//if (value == showScrollIndicator) {
-				//	return;
-				//}
-
-				_showScrollIndicator = value;
-				if (IsInitialized) {
-					SetNeedsLayout ();
-					if (value) {
-						Visible = true;
-					} else {
-						Visible = false;
-						Position = 0;
-					}
-					SetWidthHeight ();
+					Visible = false;
+					Position = 0;
 				}
+				SetWidthHeight ();
 			}
 		}
+	}
 
-		/// <summary>
-		/// Get or sets if the view-port is kept always visible in the area of this <see cref="ScrollBarView"/>
-		/// </summary>
-		public bool KeepContentAlwaysInViewport {
-			get { return _keepContentAlwaysInViewport; }
-			set {
-				if (_keepContentAlwaysInViewport != value) {
-					_keepContentAlwaysInViewport = value;
-					int pos = 0;
-					if (value && !_vertical && _position + Host.Bounds.Width > _size) {
-						pos = _size - Host.Bounds.Width + (_showBothScrollIndicator ? 1 : 0);
-					}
-					if (value && _vertical && _position + Host.Bounds.Height > _size) {
-						pos = _size - Host.Bounds.Height + (_showBothScrollIndicator ? 1 : 0);
-					}
-					if (pos != 0) {
-						Position = pos;
-					}
-					if (OtherScrollBarView != null && OtherScrollBarView._keepContentAlwaysInViewport != value) {
-						OtherScrollBarView.KeepContentAlwaysInViewport = value;
-					}
-					if (pos == 0) {
-						Refresh ();
-					}
+	/// <summary>
+	/// Get or sets if the view-port is kept always visible in the area of this <see cref="ScrollBarView"/>
+	/// </summary>
+	public bool KeepContentAlwaysInViewport {
+		get => _keepContentAlwaysInViewport;
+		set {
+			if (_keepContentAlwaysInViewport != value) {
+				_keepContentAlwaysInViewport = value;
+				var pos = 0;
+				if (value && !_vertical && _position + Host.Bounds.Width > _size) {
+					pos = _size - Host.Bounds.Width + (_showBothScrollIndicator ? 1 : 0);
+				}
+				if (value && _vertical && _position + Host.Bounds.Height > _size) {
+					pos = _size - Host.Bounds.Height + (_showBothScrollIndicator ? 1 : 0);
+				}
+				if (pos != 0) {
+					Position = pos;
+				}
+				if (OtherScrollBarView != null && OtherScrollBarView._keepContentAlwaysInViewport != value) {
+					OtherScrollBarView.KeepContentAlwaysInViewport = value;
+				}
+				if (pos == 0) {
+					Refresh ();
 				}
 			}
 		}
+	}
 
-		/// <summary>
-		/// If true the vertical/horizontal scroll bars won't be showed if it's not needed.
-		/// </summary>
-		public bool AutoHideScrollBars {
-			get => _autoHideScrollBars;
-			set {
-				if (_autoHideScrollBars != value) {
-					_autoHideScrollBars = value;
-					SetNeedsDisplay ();
-				}
+	/// <summary>
+	/// If true the vertical/horizontal scroll bars won't be showed if it's not needed.
+	/// </summary>
+	public bool AutoHideScrollBars {
+		get => _autoHideScrollBars;
+		set {
+			if (_autoHideScrollBars != value) {
+				_autoHideScrollBars = value;
+				SetNeedsDisplay ();
 			}
 		}
+	}
 
-		/// <summary>
-		/// Virtual method to invoke the <see cref="ChangedPosition"/> action event.
-		/// </summary>
-		public virtual void OnChangedPosition ()
-		{
-			ChangedPosition?.Invoke (this, EventArgs.Empty);
+	void CreateBottomRightCorner ()
+	{
+		if (Host != null &&
+		    (_contentBottomRightCorner == null && OtherScrollBarView == null ||
+		     _contentBottomRightCorner == null && OtherScrollBarView != null && OtherScrollBarView._contentBottomRightCorner == null)) {
+
+			_contentBottomRightCorner = new View {
+				Id = "contentBottomRightCorner",
+				Visible = Host.Visible,
+				ClearOnVisibleFalse = false,
+				ColorScheme = ColorScheme
+			};
+			if (_hosted) {
+				Host.SuperView.Add (_contentBottomRightCorner);
+			} else {
+				Host.Add (_contentBottomRightCorner);
+			}
+			_contentBottomRightCorner.X = Pos.Right (Host) - 1;
+			_contentBottomRightCorner.Y = Pos.Bottom (Host) - 1;
+			_contentBottomRightCorner.Width = 1;
+			_contentBottomRightCorner.Height = 1;
+			_contentBottomRightCorner.MouseClick += ContentBottomRightCorner_MouseClick;
+			_contentBottomRightCorner.DrawContent += _contentBottomRightCorner_DrawContent;
 		}
+	}
 
-		/// <summary>
-		/// Only used for a hosted view that will update and redraw the scrollbars.
-		/// </summary>
-		public virtual void Refresh ()
-		{
+	void _contentBottomRightCorner_DrawContent (object sender, DrawEventArgs e) => Driver.SetAttribute (Host.HasFocus ? ColorScheme.Focus : GetNormalColor ());
+
+	void Host_VisibleChanged (object sender, EventArgs e)
+	{
+		if (!Host.Visible) {
+			Visible = Host.Visible;
+			if (_otherScrollBarView != null) {
+				_otherScrollBarView.Visible = Visible;
+			}
+			_contentBottomRightCorner.Visible = Visible;
+		} else {
 			ShowHideScrollBars ();
 		}
+	}
 
-		void ShowHideScrollBars (bool redraw = true)
-		{
-			if (!_hosted || (_hosted && !_autoHideScrollBars)) {
-				if (_contentBottomRightCorner != null && _contentBottomRightCorner.Visible) {
-					_contentBottomRightCorner.Visible = false;
-				} else if (_otherScrollBarView != null && _otherScrollBarView._contentBottomRightCorner != null && _otherScrollBarView._contentBottomRightCorner.Visible) {
-					_otherScrollBarView._contentBottomRightCorner.Visible = false;
-				}
-				return;
-			}
+	void Host_EnabledChanged (object sender, EventArgs e)
+	{
+		Enabled = Host.Enabled;
+		if (_otherScrollBarView != null) {
+			_otherScrollBarView.Enabled = Enabled;
+		}
+		_contentBottomRightCorner.Enabled = Enabled;
+	}
 
-			var pending = CheckBothScrollBars (this);
-			if (_otherScrollBarView != null) {
-				CheckBothScrollBars (_otherScrollBarView, pending);
-			}
+	//private void Host_CanFocusChanged ()
+	//{
+	//	CanFocus = Host.CanFocus;
+	//	if (otherScrollBarView != null) {
+	//		otherScrollBarView.CanFocus = CanFocus;
+	//	}
+	//}
+
+	void ContentBottomRightCorner_MouseClick (object sender, MouseEventEventArgs me)
+	{
+		if (me.MouseEvent.Flags == MouseFlags.WheeledDown ||
+		    me.MouseEvent.Flags == MouseFlags.WheeledUp ||
+		    me.MouseEvent.Flags == MouseFlags.WheeledRight ||
+		    me.MouseEvent.Flags == MouseFlags.WheeledLeft) {
+
+			MouseEvent (me.MouseEvent);
+		} else if (me.MouseEvent.Flags == MouseFlags.Button1Clicked) {
+			Host.SetFocus ();
+		}
 
+		me.Handled = true;
+	}
+
+	void SetInitialProperties (int size, int position, bool isVertical)
+	{
+		Id = "ScrollBarView";
+		_vertical = isVertical;
+		_position = position;
+		_size = size;
+		WantContinuousButtonPressed = true;
+		ClearOnVisibleFalse = false;
+
+		Added += (s, e) => CreateBottomRightCorner ();
+
+		Initialized += (s, e) => {
 			SetWidthHeight ();
-			SetRelativeLayout (SuperView?.Frame ?? Host.Frame);
-			if (_otherScrollBarView != null) {
-				OtherScrollBarView.SetRelativeLayout (SuperView?.Frame ?? Host.Frame);
+			SetRelativeLayout (SuperView?.Frame ?? Host?.Frame ?? Frame);
+			// BUGBUG: We're not supposed to use Id internally!
+			if (Id == "OtherScrollBarView" || OtherScrollBarView == null) {
+				// Only do this once if both scrollbars are enabled
+				ShowHideScrollBars ();
 			}
+			SetPosition (position);
+		};
+	}
 
-			if (_showBothScrollIndicator) {
-				if (_contentBottomRightCorner != null) {
-					_contentBottomRightCorner.Visible = true;
-				} else if (_otherScrollBarView != null && _otherScrollBarView._contentBottomRightCorner != null) {
-					_otherScrollBarView._contentBottomRightCorner.Visible = true;
-				}
-			} else if (!_showScrollIndicator) {
-				if (_contentBottomRightCorner != null) {
-					_contentBottomRightCorner.Visible = false;
-				} else if (_otherScrollBarView != null && _otherScrollBarView._contentBottomRightCorner != null) {
-					_otherScrollBarView._contentBottomRightCorner.Visible = false;
-				}
-				if (Application.MouseGrabView != null && Application.MouseGrabView == this) {
-					Application.UngrabMouse ();
-				}
-			} else if (_contentBottomRightCorner != null) {
+	/// <summary>
+	/// This event is raised when the position on the scrollbar has changed.
+	/// </summary>
+	public event EventHandler ChangedPosition;
+
+	// Helper to assist Initialized event handler
+	void SetPosition (int newPosition)
+	{
+		if (CanScroll (newPosition - _position, out var max, _vertical)) {
+			if (max == newPosition - _position) {
+				_position = newPosition;
+			} else {
+				_position = Math.Max (_position + max, 0);
+			}
+		} else if (max < 0) {
+			_position = Math.Max (_position + max, 0);
+		} else {
+			_position = Math.Max (newPosition, 0);
+		}
+		OnChangedPosition ();
+		SetNeedsDisplay ();
+	}
+
+	/// <summary>
+	/// Virtual method to invoke the <see cref="ChangedPosition"/> action event.
+	/// </summary>
+	public virtual void OnChangedPosition () => ChangedPosition?.Invoke (this, EventArgs.Empty);
+
+	/// <summary>
+	/// Only used for a hosted view that will update and redraw the scrollbars.
+	/// </summary>
+	public virtual void Refresh () => ShowHideScrollBars ();
+
+	void ShowHideScrollBars (bool redraw = true)
+	{
+		if (!_hosted || _hosted && !_autoHideScrollBars) {
+			if (_contentBottomRightCorner != null && _contentBottomRightCorner.Visible) {
 				_contentBottomRightCorner.Visible = false;
-			} else if (_otherScrollBarView != null && _otherScrollBarView._contentBottomRightCorner != null) {
+			} else if (_otherScrollBarView != null && _otherScrollBarView._contentBottomRightCorner != null && _otherScrollBarView._contentBottomRightCorner.Visible) {
 				_otherScrollBarView._contentBottomRightCorner.Visible = false;
 			}
-			if (Host?.Visible == true && _showScrollIndicator && !Visible) {
-				Visible = true;
-			}
-			if (Host?.Visible == true && _otherScrollBarView?._showScrollIndicator == true && !_otherScrollBarView.Visible) {
-				_otherScrollBarView.Visible = true;
-			}
+			return;
+		}
 
-			if (!redraw) {
-				return;
-			}
+		var pending = CheckBothScrollBars (this);
+		if (_otherScrollBarView != null) {
+			CheckBothScrollBars (_otherScrollBarView, pending);
+		}
+
+		SetWidthHeight ();
+		SetRelativeLayout (SuperView?.Frame ?? Host.Frame);
+		if (_otherScrollBarView != null) {
+			OtherScrollBarView.SetRelativeLayout (SuperView?.Frame ?? Host.Frame);
+		}
 
-			if (_showScrollIndicator) {
-				Draw ();
+		if (_showBothScrollIndicator) {
+			if (_contentBottomRightCorner != null) {
+				_contentBottomRightCorner.Visible = true;
+			} else if (_otherScrollBarView != null && _otherScrollBarView._contentBottomRightCorner != null) {
+				_otherScrollBarView._contentBottomRightCorner.Visible = true;
 			}
-			if (_otherScrollBarView != null && _otherScrollBarView._showScrollIndicator) {
-				_otherScrollBarView.Draw ();
+		} else if (!_showScrollIndicator) {
+			if (_contentBottomRightCorner != null) {
+				_contentBottomRightCorner.Visible = false;
+			} else if (_otherScrollBarView != null && _otherScrollBarView._contentBottomRightCorner != null) {
+				_otherScrollBarView._contentBottomRightCorner.Visible = false;
 			}
-			if (_contentBottomRightCorner != null && _contentBottomRightCorner.Visible) {
-				_contentBottomRightCorner.Draw ();
-			} else if (_otherScrollBarView != null && _otherScrollBarView._contentBottomRightCorner != null && _otherScrollBarView._contentBottomRightCorner.Visible) {
-				_otherScrollBarView._contentBottomRightCorner.Draw ();
+			if (Application.MouseGrabView != null && Application.MouseGrabView == this) {
+				Application.UngrabMouse ();
 			}
+		} else if (_contentBottomRightCorner != null) {
+			_contentBottomRightCorner.Visible = false;
+		} else if (_otherScrollBarView != null && _otherScrollBarView._contentBottomRightCorner != null) {
+			_otherScrollBarView._contentBottomRightCorner.Visible = false;
+		}
+		if (Host?.Visible == true && _showScrollIndicator && !Visible) {
+			Visible = true;
+		}
+		if (Host?.Visible == true && _otherScrollBarView?._showScrollIndicator == true && !_otherScrollBarView.Visible) {
+			_otherScrollBarView.Visible = true;
 		}
 
-		bool CheckBothScrollBars (ScrollBarView scrollBarView, bool pending = false)
-		{
-			int barsize = scrollBarView._vertical ? scrollBarView.Bounds.Height : scrollBarView.Bounds.Width;
+		if (!redraw) {
+			return;
+		}
 
-			if (barsize == 0 || barsize >= scrollBarView._size) {
-				if (scrollBarView._showScrollIndicator) {
-					scrollBarView.ShowScrollIndicator = false;
-				}
-				if (scrollBarView.Visible) {
-					scrollBarView.Visible = false;
-				}
-			} else if (barsize > 0 && barsize == scrollBarView._size && scrollBarView.OtherScrollBarView != null && pending) {
-				if (scrollBarView._showScrollIndicator) {
-					scrollBarView.ShowScrollIndicator = false;
-				}
-				if (scrollBarView.Visible) {
-					scrollBarView.Visible = false;
-				}
-				if (scrollBarView.OtherScrollBarView != null && scrollBarView._showBothScrollIndicator) {
-					scrollBarView.OtherScrollBarView.ShowScrollIndicator = false;
-				}
-				if (scrollBarView.OtherScrollBarView.Visible) {
-					scrollBarView.OtherScrollBarView.Visible = false;
-				}
-			} else if (barsize > 0 && barsize == _size && scrollBarView.OtherScrollBarView != null && !pending) {
-				pending = true;
-			} else {
-				if (scrollBarView.OtherScrollBarView != null && pending) {
-					if (!scrollBarView._showBothScrollIndicator) {
-						scrollBarView.OtherScrollBarView.ShowScrollIndicator = true;
-					}
-					if (!scrollBarView.OtherScrollBarView.Visible) {
-						scrollBarView.OtherScrollBarView.Visible = true;
-					}
-				}
-				if (!scrollBarView._showScrollIndicator) {
-					scrollBarView.ShowScrollIndicator = true;
+		if (_showScrollIndicator) {
+			Draw ();
+		}
+		if (_otherScrollBarView != null && _otherScrollBarView._showScrollIndicator) {
+			_otherScrollBarView.Draw ();
+		}
+		if (_contentBottomRightCorner != null && _contentBottomRightCorner.Visible) {
+			_contentBottomRightCorner.Draw ();
+		} else if (_otherScrollBarView != null && _otherScrollBarView._contentBottomRightCorner != null && _otherScrollBarView._contentBottomRightCorner.Visible) {
+			_otherScrollBarView._contentBottomRightCorner.Draw ();
+		}
+	}
+
+	bool CheckBothScrollBars (ScrollBarView scrollBarView, bool pending = false)
+	{
+		var barsize = scrollBarView._vertical ? scrollBarView.Bounds.Height : scrollBarView.Bounds.Width;
+
+		if (barsize == 0 || barsize >= scrollBarView._size) {
+			if (scrollBarView._showScrollIndicator) {
+				scrollBarView.ShowScrollIndicator = false;
+			}
+			if (scrollBarView.Visible) {
+				scrollBarView.Visible = false;
+			}
+		} else if (barsize > 0 && barsize == scrollBarView._size && scrollBarView.OtherScrollBarView != null && pending) {
+			if (scrollBarView._showScrollIndicator) {
+				scrollBarView.ShowScrollIndicator = false;
+			}
+			if (scrollBarView.Visible) {
+				scrollBarView.Visible = false;
+			}
+			if (scrollBarView.OtherScrollBarView != null && scrollBarView._showBothScrollIndicator) {
+				scrollBarView.OtherScrollBarView.ShowScrollIndicator = false;
+			}
+			if (scrollBarView.OtherScrollBarView.Visible) {
+				scrollBarView.OtherScrollBarView.Visible = false;
+			}
+		} else if (barsize > 0 && barsize == _size && scrollBarView.OtherScrollBarView != null && !pending) {
+			pending = true;
+		} else {
+			if (scrollBarView.OtherScrollBarView != null && pending) {
+				if (!scrollBarView._showBothScrollIndicator) {
+					scrollBarView.OtherScrollBarView.ShowScrollIndicator = true;
 				}
-				if (!scrollBarView.Visible) {
-					scrollBarView.Visible = true;
+				if (!scrollBarView.OtherScrollBarView.Visible) {
+					scrollBarView.OtherScrollBarView.Visible = true;
 				}
 			}
-
-			return pending;
+			if (!scrollBarView._showScrollIndicator) {
+				scrollBarView.ShowScrollIndicator = true;
+			}
+			if (!scrollBarView.Visible) {
+				scrollBarView.Visible = true;
+			}
 		}
 
-		// BUGBUG: v2 - rationalize this with View.SetMinWidthHeight
-		void SetWidthHeight ()
-		{
-			// BUGBUG: v2 - If Host is also the ScrollBarView's superview, this is all bogus because it's not
-			// supported that a view can reference it's superview's Dims. This code also assumes the host does 
-			//  not have a margin/borderframe/padding.
-			if (!IsInitialized) {
-				return;
-			}
+		return pending;
+	}
 
-			if (_showBothScrollIndicator) {
-				Width = _vertical ? 1 : Host != SuperView ? Dim.Width (Host) - 1 : Dim.Fill () - 1;
-				Height = _vertical ? Host != SuperView ? Dim.Height (Host) - 1 : Dim.Fill () - 1 : 1;
+	// BUGBUG: v2 - rationalize this with View.SetMinWidthHeight
+	void SetWidthHeight ()
+	{
+		// BUGBUG: v2 - If Host is also the ScrollBarView's superview, this is all bogus because it's not
+		// supported that a view can reference it's superview's Dims. This code also assumes the host does 
+		//  not have a margin/borderframe/padding.
+		if (!IsInitialized) {
+			return;
+		}
+
+		if (_showBothScrollIndicator) {
+			Width = _vertical ? 1 : Host != SuperView ? Dim.Width (Host) - 1 : Dim.Fill () - 1;
+			Height = _vertical ? Host != SuperView ? Dim.Height (Host) - 1 : Dim.Fill () - 1 : 1;
+
+			_otherScrollBarView.Width = _otherScrollBarView._vertical ? 1 : Host != SuperView ? Dim.Width (Host) - 1 : Dim.Fill () - 1;
+			_otherScrollBarView.Height = _otherScrollBarView._vertical ? Host != SuperView ? Dim.Height (Host) - 1 : Dim.Fill () - 1 : 1;
+		} else if (_showScrollIndicator) {
+			Width = _vertical ? 1 : Host != SuperView ? Dim.Width (Host) : Dim.Fill ();
+			Height = _vertical ? Host != SuperView ? Dim.Height (Host) : Dim.Fill () : 1;
+		} else if (_otherScrollBarView?._showScrollIndicator == true) {
+			_otherScrollBarView.Width = _otherScrollBarView._vertical ? 1 : Host != SuperView ? Dim.Width (Host) : Dim.Fill () - 0;
+			_otherScrollBarView.Height = _otherScrollBarView._vertical ? Host != SuperView ? Dim.Height (Host) : Dim.Fill () - 0 : 1;
+		}
+	}
 
-				_otherScrollBarView.Width = _otherScrollBarView._vertical ? 1 : Host != SuperView ? Dim.Width (Host) - 1 : Dim.Fill () - 1;
-				_otherScrollBarView.Height = _otherScrollBarView._vertical ? Host != SuperView ? Dim.Height (Host) - 1 : Dim.Fill () - 1 : 1;
-			} else if (_showScrollIndicator) {
-				Width = _vertical ? 1 : Host != SuperView ? Dim.Width (Host) : Dim.Fill ();
-				Height = _vertical ? Host != SuperView ? Dim.Height (Host) : Dim.Fill () : 1;
-			} else if (_otherScrollBarView?._showScrollIndicator == true) {
-				_otherScrollBarView.Width = _otherScrollBarView._vertical ? 1 : Host != SuperView ? Dim.Width (Host) : Dim.Fill () - 0;
-				_otherScrollBarView.Height = _otherScrollBarView._vertical ? Host != SuperView ? Dim.Height (Host) : Dim.Fill () - 0 : 1;
+	///<inheritdoc/>
+	public override void OnDrawContent (Rect contentArea)
+	{
+		if (ColorScheme == null || (!_showScrollIndicator || Size == 0) && AutoHideScrollBars && Visible) {
+			if ((!_showScrollIndicator || Size == 0) && AutoHideScrollBars && Visible) {
+				ShowHideScrollBars (false);
 			}
+			return;
 		}
 
-		int _posTopTee;
-		int _posLeftTee;
-		int _posBottomTee;
-		int _posRightTee;
+		if (Size == 0 || _vertical && Bounds.Height == 0 || !_vertical && Bounds.Width == 0) {
+			return;
+		}
 
-		///<inheritdoc/>
-		public override void OnDrawContent (Rect contentArea)
-		{
-			if (ColorScheme == null || ((!_showScrollIndicator || Size == 0) && AutoHideScrollBars && Visible)) {
-				if ((!_showScrollIndicator || Size == 0) && AutoHideScrollBars && Visible) {
-					ShowHideScrollBars (false);
-				}
-				return;
-			}
+		Driver.SetAttribute (Host.HasFocus ? ColorScheme.Focus : GetNormalColor ());
 
-			if (Size == 0 || (_vertical && Bounds.Height == 0) || (!_vertical && Bounds.Width == 0)) {
+		if (_vertical) {
+			if (Bounds.Right < Bounds.Width - 1) {
 				return;
 			}
 
-			Driver.SetAttribute (Host.HasFocus ? ColorScheme.Focus : GetNormalColor ());
+			var col = Bounds.Width - 1;
+			var bh = Bounds.Height;
+			Rune special;
 
-			if (_vertical) {
-				if (Bounds.Right < Bounds.Width - 1) {
-					return;
-				}
-
-				var col = Bounds.Width - 1;
-				var bh = Bounds.Height;
-				Rune special;
+			if (bh < 4) {
+				var by1 = _position * bh / Size;
+				var by2 = (_position + bh) * bh / Size;
 
-				if (bh < 4) {
-					var by1 = _position * bh / Size;
-					var by2 = (_position + bh) * bh / Size;
-
-					Move (col, 0);
-					if (Bounds.Height == 1) {
-						Driver.AddRune (CM.Glyphs.Diamond);
-					} else {
-						Driver.AddRune (CM.Glyphs.UpArrow);
-					}
-					if (Bounds.Height == 3) {
-						Move (col, 1);
-						Driver.AddRune (CM.Glyphs.Diamond);
-					}
-					if (Bounds.Height > 1) {
-						Move (col, Bounds.Height - 1);
-						Driver.AddRune (CM.Glyphs.DownArrow);
-					}
+				Move (col, 0);
+				if (Bounds.Height == 1) {
+					Driver.AddRune (Glyphs.Diamond);
 				} else {
-					bh -= 2;
-					var by1 = KeepContentAlwaysInViewport ? _position * bh / Size : _position * bh / (Size + bh);
-					var by2 = KeepContentAlwaysInViewport ? Math.Min (((_position + bh) * bh / Size) + 1, bh - 1) : (_position + bh) * bh / (Size + bh);
-					if (KeepContentAlwaysInViewport && by1 == by2) {
-						by1 = Math.Max (by1 - 1, 0);
-					}
-
-					Move (col, 0);
-					Driver.AddRune (CM.Glyphs.UpArrow);
-
-					bool hasTopTee = false;
-					bool hasDiamond = false;
-					bool hasBottomTee = false;
-					for (int y = 0; y < bh; y++) {
-						Move (col, y + 1);
-						if ((y < by1 || y > by2) && ((_position > 0 && !hasTopTee) || (hasTopTee && hasBottomTee))) {
-							special = CM.Glyphs.Stipple;
+					Driver.AddRune (Glyphs.UpArrow);
+				}
+				if (Bounds.Height == 3) {
+					Move (col, 1);
+					Driver.AddRune (Glyphs.Diamond);
+				}
+				if (Bounds.Height > 1) {
+					Move (col, Bounds.Height - 1);
+					Driver.AddRune (Glyphs.DownArrow);
+				}
+			} else {
+				bh -= 2;
+				var by1 = KeepContentAlwaysInViewport ? _position * bh / Size : _position * bh / (Size + bh);
+				var by2 = KeepContentAlwaysInViewport ? Math.Min ((_position + bh) * bh / Size + 1, bh - 1) : (_position + bh) * bh / (Size + bh);
+				if (KeepContentAlwaysInViewport && by1 == by2) {
+					by1 = Math.Max (by1 - 1, 0);
+				}
+
+				Move (col, 0);
+				Driver.AddRune (Glyphs.UpArrow);
+
+				var hasTopTee = false;
+				var hasDiamond = false;
+				var hasBottomTee = false;
+				for (var y = 0; y < bh; y++) {
+					Move (col, y + 1);
+					if ((y < by1 || y > by2) && (_position > 0 && !hasTopTee || hasTopTee && hasBottomTee)) {
+						special = Glyphs.Stipple;
+					} else {
+						if (y != by2 && y > 1 && by2 - by1 == 0 && by1 < bh - 1 && hasTopTee && !hasDiamond) {
+							hasDiamond = true;
+							special = Glyphs.Diamond;
 						} else {
-							if (y != by2 && y > 1 && by2 - by1 == 0 && by1 < bh - 1 && hasTopTee && !hasDiamond) {
-								hasDiamond = true;
-								special = CM.Glyphs.Diamond;
+							if (y == by1 && !hasTopTee) {
+								hasTopTee = true;
+								_posTopTee = y;
+								special = Glyphs.TopTee;
+							} else if ((_position == 0 && y == bh - 1 || y >= by2 || by2 == 0) && !hasBottomTee) {
+								hasBottomTee = true;
+								_posBottomTee = y;
+								special = Glyphs.BottomTee;
 							} else {
-								if (y == by1 && !hasTopTee) {
-									hasTopTee = true;
-									_posTopTee = y;
-									special = CM.Glyphs.TopTee;
-								} else if ((_position == 0 && y == bh - 1 || y >= by2 || by2 == 0) && !hasBottomTee) {
-									hasBottomTee = true;
-									_posBottomTee = y;
-									special = CM.Glyphs.BottomTee;
-								} else {
-									special = CM.Glyphs.VLine;
-								}
+								special = Glyphs.VLine;
 							}
 						}
-						Driver.AddRune (special);
 					}
-					if (!hasTopTee) {
-						Move (col, Bounds.Height - 2);
-						Driver.AddRune (CM.Glyphs.TopTee);
-					}
-					Move (col, Bounds.Height - 1);
-					Driver.AddRune (CM.Glyphs.DownArrow);
+					Driver.AddRune (special);
 				}
-			} else {
-				if (Bounds.Bottom < Bounds.Height - 1) {
-					return;
+				if (!hasTopTee) {
+					Move (col, Bounds.Height - 2);
+					Driver.AddRune (Glyphs.TopTee);
 				}
+				Move (col, Bounds.Height - 1);
+				Driver.AddRune (Glyphs.DownArrow);
+			}
+		} else {
+			if (Bounds.Bottom < Bounds.Height - 1) {
+				return;
+			}
 
-				var row = Bounds.Height - 1;
-				var bw = Bounds.Width;
-				Rune special;
-
-				if (bw < 4) {
-					var bx1 = _position * bw / Size;
-					var bx2 = (_position + bw) * bw / Size;
-
-					Move (0, row);
-					Driver.AddRune (CM.Glyphs.LeftArrow);
-					Driver.AddRune (CM.Glyphs.RightArrow);
-				} else {
-					bw -= 2;
-					var bx1 = KeepContentAlwaysInViewport ? _position * bw / Size : _position * bw / (Size + bw);
-					var bx2 = KeepContentAlwaysInViewport ? Math.Min (((_position + bw) * bw / Size) + 1, bw - 1) : (_position + bw) * bw / (Size + bw);
-					if (KeepContentAlwaysInViewport && bx1 == bx2) {
-						bx1 = Math.Max (bx1 - 1, 0);
-					}
+			var row = Bounds.Height - 1;
+			var bw = Bounds.Width;
+			Rune special;
 
-					Move (0, row);
-					Driver.AddRune (CM.Glyphs.LeftArrow);
+			if (bw < 4) {
+				var bx1 = _position * bw / Size;
+				var bx2 = (_position + bw) * bw / Size;
 
-					bool hasLeftTee = false;
-					bool hasDiamond = false;
-					bool hasRightTee = false;
-					for (int x = 0; x < bw; x++) {
-						if ((x < bx1 || x >= bx2 + 1) && ((_position > 0 && !hasLeftTee) || (hasLeftTee && hasRightTee))) {
-							special = CM.Glyphs.Stipple;
+				Move (0, row);
+				Driver.AddRune (Glyphs.LeftArrow);
+				Driver.AddRune (Glyphs.RightArrow);
+			} else {
+				bw -= 2;
+				var bx1 = KeepContentAlwaysInViewport ? _position * bw / Size : _position * bw / (Size + bw);
+				var bx2 = KeepContentAlwaysInViewport ? Math.Min ((_position + bw) * bw / Size + 1, bw - 1) : (_position + bw) * bw / (Size + bw);
+				if (KeepContentAlwaysInViewport && bx1 == bx2) {
+					bx1 = Math.Max (bx1 - 1, 0);
+				}
+
+				Move (0, row);
+				Driver.AddRune (Glyphs.LeftArrow);
+
+				var hasLeftTee = false;
+				var hasDiamond = false;
+				var hasRightTee = false;
+				for (var x = 0; x < bw; x++) {
+					if ((x < bx1 || x >= bx2 + 1) && (_position > 0 && !hasLeftTee || hasLeftTee && hasRightTee)) {
+						special = Glyphs.Stipple;
+					} else {
+						if (x != bx2 && x > 1 && bx2 - bx1 == 0 && bx1 < bw - 1 && hasLeftTee && !hasDiamond) {
+							hasDiamond = true;
+							special = Glyphs.Diamond;
 						} else {
-							if (x != bx2 && x > 1 && bx2 - bx1 == 0 && bx1 < bw - 1 && hasLeftTee && !hasDiamond) {
-								hasDiamond = true;
-								special = CM.Glyphs.Diamond;
+							if (x == bx1 && !hasLeftTee) {
+								hasLeftTee = true;
+								_posLeftTee = x;
+								special = Glyphs.LeftTee;
+							} else if ((_position == 0 && x == bw - 1 || x >= bx2 || bx2 == 0) && !hasRightTee) {
+								hasRightTee = true;
+								_posRightTee = x;
+								special = Glyphs.RightTee;
 							} else {
-								if (x == bx1 && !hasLeftTee) {
-									hasLeftTee = true;
-									_posLeftTee = x;
-									special = CM.Glyphs.LeftTee;
-								} else if ((_position == 0 && x == bw - 1 || x >= bx2 || bx2 == 0) && !hasRightTee) {
-									hasRightTee = true;
-									_posRightTee = x;
-									special = CM.Glyphs.RightTee;
-								} else {
-									special = CM.Glyphs.HLine;
-								}
+								special = Glyphs.HLine;
 							}
 						}
-						Driver.AddRune (special);
 					}
-					if (!hasLeftTee) {
-						Move (Bounds.Width - 2, row);
-						Driver.AddRune (CM.Glyphs.LeftTee);
-					}
-
-					Driver.AddRune (CM.Glyphs.RightArrow);
+					Driver.AddRune (special);
+				}
+				if (!hasLeftTee) {
+					Move (Bounds.Width - 2, row);
+					Driver.AddRune (Glyphs.LeftTee);
 				}
-			}
-		}
-
-		int _lastLocation = -1;
-		int _posBarOffset;
-
-		///<inheritdoc/>
-		public override bool MouseEvent (MouseEvent mouseEvent)
-		{
-			if (mouseEvent.Flags != MouseFlags.Button1Pressed && mouseEvent.Flags != MouseFlags.Button1DoubleClicked &&
-				!mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition) &&
-				mouseEvent.Flags != MouseFlags.Button1Released && mouseEvent.Flags != MouseFlags.WheeledDown &&
-				mouseEvent.Flags != MouseFlags.WheeledUp && mouseEvent.Flags != MouseFlags.WheeledRight &&
-				mouseEvent.Flags != MouseFlags.WheeledLeft && mouseEvent.Flags != MouseFlags.Button1TripleClicked) {
 
-				return false;
+				Driver.AddRune (Glyphs.RightArrow);
 			}
+		}
+	}
 
-			if (!Host.CanFocus) {
-				return true;
-			}
-			if (Host?.HasFocus == false) {
-				Host.SetFocus ();
-			}
+	///<inheritdoc/>
+	public override bool MouseEvent (MouseEvent mouseEvent)
+	{
+		if (mouseEvent.Flags != MouseFlags.Button1Pressed &&
+		    mouseEvent.Flags != MouseFlags.Button1DoubleClicked &&
+		    !mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition) &&
+		    mouseEvent.Flags != MouseFlags.Button1Released &&
+		    mouseEvent.Flags != MouseFlags.WheeledDown &&
+		    mouseEvent.Flags != MouseFlags.WheeledUp &&
+		    mouseEvent.Flags != MouseFlags.WheeledRight &&
+		    mouseEvent.Flags != MouseFlags.WheeledLeft &&
+		    mouseEvent.Flags != MouseFlags.Button1TripleClicked) {
 
-			int location = _vertical ? mouseEvent.Y : mouseEvent.X;
-			int barsize = _vertical ? Bounds.Height : Bounds.Width;
-			int posTopLeftTee = _vertical ? _posTopTee + 1 : _posLeftTee + 1;
-			int posBottomRightTee = _vertical ? _posBottomTee + 1 : _posRightTee + 1;
-			barsize -= 2;
-			var pos = Position;
+			return false;
+		}
 
-			if (mouseEvent.Flags != MouseFlags.Button1Released
-				&& (Application.MouseGrabView == null || Application.MouseGrabView != this)) {
-				Application.GrabMouse (this);
-			} else if (mouseEvent.Flags == MouseFlags.Button1Released && Application.MouseGrabView != null && Application.MouseGrabView == this) {
-				_lastLocation = -1;
-				Application.UngrabMouse ();
-				return true;
-			}
-			if (_showScrollIndicator && (mouseEvent.Flags == MouseFlags.WheeledDown || mouseEvent.Flags == MouseFlags.WheeledUp ||
-				mouseEvent.Flags == MouseFlags.WheeledRight || mouseEvent.Flags == MouseFlags.WheeledLeft)) {
+		if (!Host.CanFocus) {
+			return true;
+		}
+		if (Host?.HasFocus == false) {
+			Host.SetFocus ();
+		}
 
-				return Host.MouseEvent (mouseEvent);
-			}
+		var location = _vertical ? mouseEvent.Y : mouseEvent.X;
+		var barsize = _vertical ? Bounds.Height : Bounds.Width;
+		var posTopLeftTee = _vertical ? _posTopTee + 1 : _posLeftTee + 1;
+		var posBottomRightTee = _vertical ? _posBottomTee + 1 : _posRightTee + 1;
+		barsize -= 2;
+		var pos = Position;
+
+		if (mouseEvent.Flags != MouseFlags.Button1Released && (Application.MouseGrabView == null || Application.MouseGrabView != this)) {
+			Application.GrabMouse (this);
+		} else if (mouseEvent.Flags == MouseFlags.Button1Released && Application.MouseGrabView != null && Application.MouseGrabView == this) {
+			_lastLocation = -1;
+			Application.UngrabMouse ();
+			return true;
+		}
+		if (_showScrollIndicator &&
+		    (mouseEvent.Flags == MouseFlags.WheeledDown ||
+		     mouseEvent.Flags == MouseFlags.WheeledUp ||
+		     mouseEvent.Flags == MouseFlags.WheeledRight ||
+		     mouseEvent.Flags == MouseFlags.WheeledLeft)) {
 
-			if (mouseEvent.Flags == MouseFlags.Button1Pressed && location == 0) {
-				if (pos > 0) {
-					Position = pos - 1;
-				}
-			} else if (mouseEvent.Flags == MouseFlags.Button1Pressed && location == barsize + 1) {
-				if (CanScroll (1, out _, _vertical)) {
-					Position = pos + 1;
-				}
-			} else if (location > 0 && location < barsize + 1) {
-				//var b1 = pos * (Size > 0 ? barsize / Size : 0);
-				//var b2 = Size > 0
-				//	? (KeepContentAlwaysInViewport ? Math.Min (((pos + barsize) * barsize / Size) + 1, barsize - 1) : (pos + barsize) * barsize / Size)
-				//	: 0;
-				//if (KeepContentAlwaysInViewport && b1 == b2) {
-				//	b1 = Math.Max (b1 - 1, 0);
-				//}
-
-				if (_lastLocation > -1 || (location >= posTopLeftTee && location <= posBottomRightTee
-				&& mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition))) {
-					if (_lastLocation == -1) {
-						_lastLocation = location;
-						_posBarOffset = _keepContentAlwaysInViewport ? Math.Max (location - posTopLeftTee, 1) : 0;
-						return true;
-					}
+			return Host.MouseEvent (mouseEvent);
+		}
 
-					if (location > _lastLocation) {
-						if (location - _posBarOffset < barsize) {
-							var np = ((location - _posBarOffset) * Size / barsize) + (Size / barsize);
-							if (CanScroll (np - pos, out int nv, _vertical)) {
-								Position = pos + nv;
-							}
-						} else if (CanScroll (Size - pos, out int nv, _vertical)) {
-							Position = Math.Min (pos + nv, Size);
-						}
-					} else if (location < _lastLocation) {
-						if (location - _posBarOffset > 0) {
-							var np = ((location - _posBarOffset) * Size / barsize) - (Size / barsize);
-							if (CanScroll (np - pos, out int nv, _vertical)) {
-								Position = pos + nv;
-							}
-						} else {
-							Position = 0;
+		if (mouseEvent.Flags == MouseFlags.Button1Pressed && location == 0) {
+			if (pos > 0) {
+				Position = pos - 1;
+			}
+		} else if (mouseEvent.Flags == MouseFlags.Button1Pressed && location == barsize + 1) {
+			if (CanScroll (1, out _, _vertical)) {
+				Position = pos + 1;
+			}
+		} else if (location > 0 && location < barsize + 1) {
+			//var b1 = pos * (Size > 0 ? barsize / Size : 0);
+			//var b2 = Size > 0
+			//	? (KeepContentAlwaysInViewport ? Math.Min (((pos + barsize) * barsize / Size) + 1, barsize - 1) : (pos + barsize) * barsize / Size)
+			//	: 0;
+			//if (KeepContentAlwaysInViewport && b1 == b2) {
+			//	b1 = Math.Max (b1 - 1, 0);
+			//}
+
+			if (_lastLocation > -1 || location >= posTopLeftTee && location <= posBottomRightTee && mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition)) {
+				if (_lastLocation == -1) {
+					_lastLocation = location;
+					_posBarOffset = _keepContentAlwaysInViewport ? Math.Max (location - posTopLeftTee, 1) : 0;
+					return true;
+				}
+
+				if (location > _lastLocation) {
+					if (location - _posBarOffset < barsize) {
+						var np = (location - _posBarOffset) * Size / barsize + Size / barsize;
+						if (CanScroll (np - pos, out var nv, _vertical)) {
+							Position = pos + nv;
 						}
-					} else if (location - _posBarOffset >= barsize && posBottomRightTee - posTopLeftTee >= 3 && CanScroll (Size - pos, out int nv, _vertical)) {
-						Position = Math.Min (pos + nv, Size);
-					} else if (location - _posBarOffset >= barsize - 1 && posBottomRightTee - posTopLeftTee <= 3 && CanScroll (Size - pos, out nv, _vertical)) {
+					} else if (CanScroll (Size - pos, out var nv, _vertical)) {
 						Position = Math.Min (pos + nv, Size);
-					} else if (location - _posBarOffset <= 0 && posBottomRightTee - posTopLeftTee <= 3) {
-						Position = 0;
-					}
-				} else if (location > posBottomRightTee) {
-					if (CanScroll (barsize, out int nv, _vertical)) {
-						Position = pos + nv;
 					}
-				} else if (location < posTopLeftTee) {
-					if (CanScroll (-barsize, out int nv, _vertical)) {
-						Position = pos + nv;
+				} else if (location < _lastLocation) {
+					if (location - _posBarOffset > 0) {
+						var np = (location - _posBarOffset) * Size / barsize - Size / barsize;
+						if (CanScroll (np - pos, out var nv, _vertical)) {
+							Position = pos + nv;
+						}
+					} else {
+						Position = 0;
 					}
-				} else if (location == 1 && posTopLeftTee <= 3) {
+				} else if (location - _posBarOffset >= barsize && posBottomRightTee - posTopLeftTee >= 3 && CanScroll (Size - pos, out var nv, _vertical)) {
+					Position = Math.Min (pos + nv, Size);
+				} else if (location - _posBarOffset >= barsize - 1 && posBottomRightTee - posTopLeftTee <= 3 && CanScroll (Size - pos, out nv, _vertical)) {
+					Position = Math.Min (pos + nv, Size);
+				} else if (location - _posBarOffset <= 0 && posBottomRightTee - posTopLeftTee <= 3) {
 					Position = 0;
-				} else if (location == barsize) {
-					if (CanScroll (Size - pos, out int nv, _vertical)) {
-						Position = Math.Min (pos + nv, Size);
-					}
+				}
+			} else if (location > posBottomRightTee) {
+				if (CanScroll (barsize, out var nv, _vertical)) {
+					Position = pos + nv;
+				}
+			} else if (location < posTopLeftTee) {
+				if (CanScroll (-barsize, out var nv, _vertical)) {
+					Position = pos + nv;
+				}
+			} else if (location == 1 && posTopLeftTee <= 3) {
+				Position = 0;
+			} else if (location == barsize) {
+				if (CanScroll (Size - pos, out var nv, _vertical)) {
+					Position = Math.Min (pos + nv, Size);
 				}
 			}
-
-			return true;
 		}
 
-		internal bool CanScroll (int n, out int max, bool isVertical = false)
-		{
-			if (Host?.Bounds.IsEmpty != false) {
-				max = 0;
-				return false;
-			}
-			int s = GetBarsize (isVertical);
-			var newSize = Math.Max (Math.Min (_size - s, _position + n), 0);
-			max = _size > s + newSize ? (newSize == 0 ? -_position : n) : _size - (s + _position) - 1;
-			if (_size >= s + newSize && max != 0) {
-				return true;
-			}
+		return true;
+	}
+
+	internal bool CanScroll (int n, out int max, bool isVertical = false)
+	{
+		if (Host?.Bounds.IsEmpty != false) {
+			max = 0;
 			return false;
 		}
+		var s = GetBarsize (isVertical);
+		var newSize = Math.Max (Math.Min (_size - s, _position + n), 0);
+		max = _size > s + newSize ? newSize == 0 ? -_position : n : _size - (s + _position) - 1;
+		if (_size >= s + newSize && max != 0) {
+			return true;
+		}
+		return false;
+	}
 
-		int GetBarsize (bool isVertical)
-		{
-			if (Host?.Bounds.IsEmpty != false) {
-				return 0;
-			}
-			return isVertical ?
-				(KeepContentAlwaysInViewport ? Host.Bounds.Height + (_showBothScrollIndicator ? -2 : -1) : 0) :
-				(KeepContentAlwaysInViewport ? Host.Bounds.Width + (_showBothScrollIndicator ? -2 : -1) : 0);
+	int GetBarsize (bool isVertical)
+	{
+		if (Host?.Bounds.IsEmpty != false) {
+			return 0;
 		}
+		return isVertical ?
+			KeepContentAlwaysInViewport ? Host.Bounds.Height + (_showBothScrollIndicator ? -2 : -1) : 0 :
+			KeepContentAlwaysInViewport ? Host.Bounds.Width + (_showBothScrollIndicator ? -2 : -1) : 0;
+	}
 
-		///<inheritdoc/>
-		public override bool OnEnter (View view)
-		{
-			Application.Driver.SetCursorVisibility (CursorVisibility.Invisible);
+	///<inheritdoc/>
+	public override bool OnEnter (View view)
+	{
+		Application.Driver.SetCursorVisibility (CursorVisibility.Invisible);
 
-			return base.OnEnter (view);
-		}
+		return base.OnEnter (view);
 	}
-}
+}

Terminal.Gui/Views/Slider.cs

@@ -804,20 +804,17 @@ public class Slider<T> : View {
 		if (!IsInitialized || AutoSize == false) {
 			return;
 		}
-		// Hack???  Otherwise we can't go back to Dim.Absolute.
-		LayoutStyle = LayoutStyle.Absolute;
 		Width = 0;
 		Height = 0;
 		if (_config._sliderOrientation == Orientation.Horizontal) {
 			Bounds = new Rect (Bounds.Location,
 				new Size (int.Min (SuperView.Bounds.Width - GetFramesThickness ().Horizontal, CalcBestLength ()),
-					int.Min (SuperView.Bounds.Height - GetFramesThickness ().Vertical,    CalcThickness ())));
+					int.Min (SuperView.Bounds.Height - GetFramesThickness ().Vertical, CalcThickness ())));
 		} else {
 			Bounds = new Rect (Bounds.Location,
 				new Size (int.Min (SuperView.Bounds.Width - GetFramesThickness ().Horizontal, CalcThickness ()),
-					int.Min (SuperView.Bounds.Height - GetFramesThickness ().Vertical,    CalcBestLength ())));
+					int.Min (SuperView.Bounds.Height - GetFramesThickness ().Vertical, CalcBestLength ())));
 		}
-		LayoutStyle = LayoutStyle.Computed;
 	}
 
 	/// <summary>
@@ -1050,7 +1047,7 @@ public class Slider<T> : View {
 		// Attributes
 
 		var normalAttr = new Attribute (Color.White, Color.Black);
-		var setAtrr = new Attribute (Color.Black,    Color.White);
+		var setAtrr = new Attribute (Color.Black, Color.White);
 		if (IsInitialized) {
 			normalAttr = ColorScheme?.Normal ?? Application.Current.ColorScheme.Normal;
 			setAtrr = Style.SetChar.Attribute ?? ColorScheme.HotNormal;
@@ -1190,7 +1187,7 @@ public class Slider<T> : View {
 	{
 		// Attributes
 		var normalAttr = new Attribute (Color.White, Color.Black);
-		var setAttr = new Attribute (Color.Black,    Color.White);
+		var setAttr = new Attribute (Color.Black, Color.White);
 		var spaceAttr = normalAttr;
 		if (IsInitialized) {
 			normalAttr = Style.LegendAttributes.NormalAttribute ?? ColorScheme?.Normal ?? ColorScheme.Disabled;
@@ -1462,15 +1459,15 @@ public class Slider<T> : View {
 
 	void SetCommands ()
 	{
-		AddCommand (Command.Right,       () => MovePlus ());
-		AddCommand (Command.LineDown,    () => MovePlus ());
-		AddCommand (Command.Left,        () => MoveMinus ());
-		AddCommand (Command.LineUp,      () => MoveMinus ());
-		AddCommand (Command.LeftHome,    () => MoveStart ());
-		AddCommand (Command.RightEnd,    () => MoveEnd ());
+		AddCommand (Command.Right, () => MovePlus ());
+		AddCommand (Command.LineDown, () => MovePlus ());
+		AddCommand (Command.Left, () => MoveMinus ());
+		AddCommand (Command.LineUp, () => MoveMinus ());
+		AddCommand (Command.LeftHome, () => MoveStart ());
+		AddCommand (Command.RightEnd, () => MoveEnd ());
 		AddCommand (Command.RightExtend, () => ExtendPlus ());
-		AddCommand (Command.LeftExtend,  () => ExtendMinus ());
-		AddCommand (Command.Accept,      () => Set ());
+		AddCommand (Command.LeftExtend, () => ExtendMinus ());
+		AddCommand (Command.Accept, () => Set ());
 
 		SetKeyBindings ();
 	}
@@ -1500,8 +1497,8 @@ public class Slider<T> : View {
 			KeyBindings.Add (KeyCode.CursorUp | KeyCode.CtrlMask, Command.LeftExtend);
 
 		}
-		KeyBindings.Add (KeyCode.Home,  Command.LeftHome);
-		KeyBindings.Add (KeyCode.End,   Command.RightEnd);
+		KeyBindings.Add (KeyCode.Home, Command.LeftHome);
+		KeyBindings.Add (KeyCode.End, Command.RightEnd);
 		KeyBindings.Add (KeyCode.Enter, Command.Accept);
 		KeyBindings.Add (KeyCode.Space, Command.Accept);
 

Terminal.Gui/Views/TextField.cs

@@ -1,1378 +1,1454 @@
-//
-// TextField.cs: single-line text editor with Emacs keybindings
-//
-// Authors:
-//   Miguel de Icaza ([email protected])
-//
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Threading;
 using System.Text;
+using System.Threading;
 using Terminal.Gui.Resources;
 
-namespace Terminal.Gui {
-	/// <summary>
-	///   Single-line text entry <see cref="View"/>
-	/// </summary>
-	/// <remarks>
-	///   The <see cref="TextField"/> <see cref="View"/> provides editing functionality and mouse support.
-	/// </remarks>
-	public class TextField : View {
-		List<Rune> _text;
-		int _first, _cursorPosition;
-		int _selectedStart = -1; // -1 represents there is no text selection.
-		string _selectedText;
-		HistoryText _historyText = new HistoryText ();
-		CultureInfo _currentCulture;
-
-		/// <summary>
-		/// Gets or sets the text to render in control when no value has 
-		/// been entered yet and the <see cref="View"/> does not yet have
-		/// input focus.
-		/// </summary>
-		public string Caption { get; set; }
-
-		/// <summary>
-		/// Gets or sets the foreground <see cref="Color"/> to use when 
-		/// rendering <see cref="Caption"/>.
-		/// </summary>
-		public Color CaptionColor { get; set; } = new Color (Color.DarkGray);
-
-		/// <summary>
-		/// Tracks whether the text field should be considered "used", that is, that the user has moved in the entry, so new input should be appended at the cursor position, rather than clearing the entry
-		/// </summary>
-		public bool Used { get; set; }
-
-		/// <summary>
-		/// If set to true its not allow any changes in the text.
-		/// </summary>
-		public bool ReadOnly { get; set; } = false;
-
-		/// <summary>
-		/// Changing event, raised before the <see cref="Text"/> changes and can be canceled or changing the new text.
-		/// </summary>
-		public event EventHandler<TextChangingEventArgs> TextChanging;
-
-		/// <summary>
-		/// Changed event, raised when the text has changed.
-		/// <remarks>
-		///   This event is raised when the <see cref="Text"/> changes. 
-		///   The passed <see cref="EventArgs"/> is a <see cref="string"/> containing the old value. 
-		/// </remarks>
-		/// </summary>
-		public event EventHandler<TextChangedEventArgs> TextChanged;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="TextField"/> class using <see cref="LayoutStyle.Computed"/> positioning.
-		/// </summary>
-		public TextField () : this (string.Empty) { }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="TextField"/> class using <see cref="LayoutStyle.Computed"/> positioning.
-		/// </summary>
-		/// <param name="text">Initial text contents.</param>
-		public TextField (string text) : base (text)
-		{
-			SetInitialProperties (text, text.GetRuneCount () + 1);
-		}
+namespace Terminal.Gui;
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="TextField"/> class using <see cref="LayoutStyle.Absolute"/> positioning.
-		/// </summary>
-		/// <param name="x">The x coordinate.</param>
-		/// <param name="y">The y coordinate.</param>
-		/// <param name="w">The width.</param>
-		/// <param name="text">Initial text contents.</param>
-		public TextField (int x, int y, int w, string text) : base (new Rect (x, y, w, 1))
-		{
-			SetInitialProperties (text, w);
-		}
+/// <summary>
+/// Single-line text entry <see cref="View"/>
+/// </summary>
+/// <remarks>
+/// The <see cref="TextField"/> <see cref="View"/> provides editing functionality and mouse support.
+/// </remarks>
+public class TextField : View {
+	CultureInfo _currentCulture;
 
-		void SetInitialProperties (string text, int w)
-		{
-			Height = 1;
+	CursorVisibility _desiredCursorVisibility = CursorVisibility.Default;
+	int _cursorPosition;
+	readonly HistoryText _historyText = new ();
+	bool _isButtonPressed;
+	bool _isButtonReleased = true;
 
-			if (text == null)
-				text = "";
-
-			this._text = text.Split ("\n") [0].EnumerateRunes ().ToList ();
-			_cursorPosition = text.GetRuneCount ();
-			_first = _cursorPosition > w + 1 ? _cursorPosition - w + 1 : 0;
-			CanFocus = true;
-			Used = true;
-			WantMousePositionReports = true;
-			_savedCursorVisibility = _desiredCursorVisibility;
-
-			_historyText.ChangeText += HistoryText_ChangeText;
-
-			Initialized += TextField_Initialized;
-
-			// Things this view knows how to do
-			AddCommand (Command.DeleteCharRight, () => { DeleteCharRight (); return true; });
-			AddCommand (Command.DeleteCharLeft, () => { DeleteCharLeft (false); return true; });
-			AddCommand (Command.LeftHomeExtend, () => { MoveHomeExtend (); return true; });
-			AddCommand (Command.RightEndExtend, () => { MoveEndExtend (); return true; });
-			AddCommand (Command.LeftHome, () => { MoveHome (); return true; });
-			AddCommand (Command.LeftExtend, () => { MoveLeftExtend (); return true; });
-			AddCommand (Command.RightExtend, () => { MoveRightExtend (); return true; });
-			AddCommand (Command.WordLeftExtend, () => { MoveWordLeftExtend (); return true; });
-			AddCommand (Command.WordRightExtend, () => { MoveWordRightExtend (); return true; });
-			AddCommand (Command.Left, () => { MoveLeft (); return true; });
-			AddCommand (Command.RightEnd, () => { MoveEnd (); return true; });
-			AddCommand (Command.Right, () => { MoveRight (); return true; });
-			AddCommand (Command.CutToEndLine, () => { KillToEnd (); return true; });
-			AddCommand (Command.CutToStartLine, () => { KillToStart (); return true; });
-			AddCommand (Command.Undo, () => { Undo (); return true; });
-			AddCommand (Command.Redo, () => { Redo (); return true; });
-			AddCommand (Command.WordLeft, () => { MoveWordLeft (); return true; });
-			AddCommand (Command.WordRight, () => { MoveWordRight (); return true; });
-			AddCommand (Command.KillWordForwards, () => { KillWordForwards (); return true; });
-			AddCommand (Command.KillWordBackwards, () => { KillWordBackwards (); return true; });
-			AddCommand (Command.ToggleOverwrite, () => { SetOverwrite (!Used); return true; });
-			AddCommand (Command.EnableOverwrite, () => { SetOverwrite (true); return true; });
-			AddCommand (Command.DisableOverwrite, () => { SetOverwrite (false); return true; });
-			AddCommand (Command.Copy, () => { Copy (); return true; });
-			AddCommand (Command.Cut, () => { Cut (); return true; });
-			AddCommand (Command.Paste, () => { Paste (); return true; });
-			AddCommand (Command.SelectAll, () => { SelectAll (); return true; });
-			AddCommand (Command.DeleteAll, () => { DeleteAll (); return true; });
-			AddCommand (Command.ShowContextMenu, () => { ShowContextMenu (); return true; });
-
-			// Default keybindings for this view
-			// We follow this as closely as possible: https://en.wikipedia.org/wiki/Table_of_keyboard_shortcuts
-			KeyBindings.Add (KeyCode.Delete, Command.DeleteCharRight);
-			KeyBindings.Add (KeyCode.D | KeyCode.CtrlMask, Command.DeleteCharRight);
-
-			KeyBindings.Add (KeyCode.Backspace, Command.DeleteCharLeft);
-
-			KeyBindings.Add (KeyCode.Home | KeyCode.ShiftMask, Command.LeftHomeExtend);
-			KeyBindings.Add (KeyCode.Home | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.LeftHomeExtend);
-			KeyBindings.Add (KeyCode.A | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.LeftHomeExtend);
-
-			KeyBindings.Add (KeyCode.End | KeyCode.ShiftMask, Command.RightEndExtend);
-			KeyBindings.Add (KeyCode.End | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.RightEndExtend);
-			KeyBindings.Add (KeyCode.E | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.RightEndExtend);
-
-			KeyBindings.Add (KeyCode.Home, Command.LeftHome);
-			KeyBindings.Add (KeyCode.Home | KeyCode.CtrlMask, Command.LeftHome);
-			KeyBindings.Add (KeyCode.A | KeyCode.CtrlMask, Command.LeftHome);
-
-			KeyBindings.Add (KeyCode.CursorLeft | KeyCode.ShiftMask, Command.LeftExtend);
-			KeyBindings.Add (KeyCode.CursorUp | KeyCode.ShiftMask, Command.LeftExtend);
-
-			KeyBindings.Add (KeyCode.CursorRight | KeyCode.ShiftMask, Command.RightExtend);
-			KeyBindings.Add (KeyCode.CursorDown | KeyCode.ShiftMask, Command.RightExtend);
-
-			KeyBindings.Add (KeyCode.CursorLeft | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.WordLeftExtend);
-			KeyBindings.Add (KeyCode.CursorUp | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.WordLeftExtend);
-			KeyBindings.Add ((KeyCode)((int)'B' + KeyCode.ShiftMask | KeyCode.AltMask), Command.WordLeftExtend);
-
-			KeyBindings.Add (KeyCode.CursorRight | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.WordRightExtend);
-			KeyBindings.Add (KeyCode.CursorDown | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.WordRightExtend);
-			KeyBindings.Add ((KeyCode)((int)'F' + KeyCode.ShiftMask | KeyCode.AltMask), Command.WordRightExtend);
-
-			KeyBindings.Add (KeyCode.CursorLeft, Command.Left);
-			KeyBindings.Add (KeyCode.B | KeyCode.CtrlMask, Command.Left);
-
-			KeyBindings.Add (KeyCode.End, Command.RightEnd);
-			KeyBindings.Add (KeyCode.End | KeyCode.CtrlMask, Command.RightEnd);
-			KeyBindings.Add (KeyCode.E | KeyCode.CtrlMask, Command.RightEnd);
-
-			KeyBindings.Add (KeyCode.CursorRight, Command.Right);
-			KeyBindings.Add (KeyCode.F | KeyCode.CtrlMask, Command.Right);
-
-			KeyBindings.Add (KeyCode.K | KeyCode.CtrlMask, Command.CutToEndLine);
-			KeyBindings.Add (KeyCode.K | KeyCode.AltMask, Command.CutToStartLine);
-
-			KeyBindings.Add (KeyCode.Z | KeyCode.CtrlMask, Command.Undo);
-			KeyBindings.Add (KeyCode.Backspace | KeyCode.AltMask, Command.Undo);
-
-			KeyBindings.Add (KeyCode.Y | KeyCode.CtrlMask, Command.Redo);
-
-			KeyBindings.Add (KeyCode.CursorLeft | KeyCode.CtrlMask, Command.WordLeft);
-			KeyBindings.Add (KeyCode.CursorUp | KeyCode.CtrlMask, Command.WordLeft);
-			KeyBindings.Add ((KeyCode)((int)'B' + KeyCode.AltMask), Command.WordLeft);
-
-			KeyBindings.Add (KeyCode.CursorRight | KeyCode.CtrlMask, Command.WordRight);
-			KeyBindings.Add (KeyCode.CursorDown | KeyCode.CtrlMask, Command.WordRight);
-			KeyBindings.Add ((KeyCode)((int)'F' + KeyCode.AltMask), Command.WordRight);
-
-			KeyBindings.Add (KeyCode.Delete | KeyCode.CtrlMask, Command.KillWordForwards);
-			KeyBindings.Add (KeyCode.Backspace | KeyCode.CtrlMask, Command.KillWordBackwards);
-			KeyBindings.Add (KeyCode.Insert, Command.ToggleOverwrite);
-			KeyBindings.Add (KeyCode.C | KeyCode.CtrlMask, Command.Copy);
-			KeyBindings.Add (KeyCode.X | KeyCode.CtrlMask, Command.Cut);
-			KeyBindings.Add (KeyCode.V | KeyCode.CtrlMask, Command.Paste);
-			KeyBindings.Add (KeyCode.T | KeyCode.CtrlMask, Command.SelectAll);
-
-			KeyBindings.Add (KeyCode.R | KeyCode.CtrlMask, Command.DeleteAll);
-			KeyBindings.Add (KeyCode.D | KeyCode.CtrlMask | KeyCode.ShiftMask, Command.DeleteAll);
+	bool _isDrawing;
 
-			_currentCulture = Thread.CurrentThread.CurrentUICulture;
+	int _preTextChangedCursorPos;
 
-			ContextMenu = new ContextMenu (this, BuildContextMenuBarItem ());
-			ContextMenu.KeyChanged += ContextMenu_KeyChanged;
+	CursorVisibility _savedCursorVisibility;
+	int _selectedStart = -1; // -1 represents there is no text selection.
+	string _selectedText;
 
-			KeyBindings.Add (ContextMenu.Key.KeyCode, KeyBindingScope.HotKey, Command.ShowContextMenu);
-		}
+	int _start;
+	List<Rune> _text;
 
-		private MenuBarItem BuildContextMenuBarItem ()
-		{
-			return new MenuBarItem (new MenuItem [] {
-					new MenuItem (Strings.ctxSelectAll, "", () => SelectAll (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.SelectAll)),
-					new MenuItem (Strings.ctxDeleteAll, "", () => DeleteAll (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.DeleteAll)),
-					new MenuItem (Strings.ctxCopy, "", () => Copy (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.Copy)),
-					new MenuItem (Strings.ctxCut, "", () => Cut (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.Cut)),
-					new MenuItem (Strings.ctxPaste, "", () => Paste (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.Paste)),
-					new MenuItem (Strings.ctxUndo, "", () => Undo (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.Undo)),
-					new MenuItem (Strings.ctxRedo, "", () => Redo (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.Redo)),
-				});
-		}
-
-		private void ContextMenu_KeyChanged (object sender, KeyChangedEventArgs e)
-		{
-			KeyBindings.Replace (e.OldKey.KeyCode, e.NewKey.KeyCode);
-		}
+	CursorVisibility _visibility;
 
-		private void HistoryText_ChangeText (object sender, HistoryText.HistoryTextItem obj)
-		{
-			if (obj == null)
-				return;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="TextField"/> class using <see cref="LayoutStyle.Computed"/> positioning.
+	/// </summary>
+	public TextField () : this (string.Empty) { }
 
-			Text = TextModel.ToString (obj?.Lines [obj.CursorPosition.Y]);
-			CursorPosition = obj.CursorPosition.X;
-			Adjust ();
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="TextField"/> class using <see cref="LayoutStyle.Computed"/> positioning.
+	/// </summary>
+	/// <param name="text">Initial text contents.</param>
+	public TextField (string text) : base (text) => SetInitialProperties (text, text.GetRuneCount () + 1);
 
-		void TextField_Initialized (object sender, EventArgs e)
-		{
-			Autocomplete.HostControl = this;
-			Autocomplete.PopupInsideContainer = false;
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="TextField"/> class using <see cref="LayoutStyle.Absolute"/> positioning.
+	/// </summary>
+	/// <param name="x">The x coordinate.</param>
+	/// <param name="y">The y coordinate.</param>
+	/// <param name="w">The width.</param>
+	/// <param name="text">Initial text contents.</param>
+	public TextField (int x, int y, int w, string text) : base (new Rect (x, y, w, 1)) => SetInitialProperties (text, w);
 
-		///<inheritdoc/>
-		public override bool OnEnter (View view)
-		{
-			if (IsInitialized) {
-				Application.Driver.SetCursorVisibility (DesiredCursorVisibility);
-			}
+	/// <summary>
+	/// Gets or sets the text to render in control when no value has
+	/// been entered yet and the <see cref="View"/> does not yet have
+	/// input focus.
+	/// </summary>
+	public string Caption { get; set; }
 
-			return base.OnEnter (view);
-		}
+	/// <summary>
+	/// Gets or sets the foreground <see cref="Color"/> to use when
+	/// rendering <see cref="Caption"/>.
+	/// </summary>
+	public Color CaptionColor { get; set; } = new (Color.DarkGray);
 
-		///<inheritdoc/>
-		public override bool OnLeave (View view)
-		{
-			if (Application.MouseGrabView != null && Application.MouseGrabView == this)
-				Application.UngrabMouse ();
-			//if (SelectedLength != 0 && !(Application.MouseGrabView is MenuBar))
-			//	ClearAllSelection ();
-
-			return base.OnLeave (view);
-		}
-
-		/// <summary>
-		/// Provides autocomplete context menu based on suggestions at the current cursor
-		/// position. Configure <see cref="ISuggestionGenerator"/> to enable this feature.
-		/// </summary>
-		public IAutocomplete Autocomplete { get; set; } = new TextFieldAutocomplete ();
-
-		///<inheritdoc/>
-		public override Rect Frame {
-			get => base.Frame;
-			set {
-				if (value.Height > 1) {
-					base.Frame = new Rect (value.X, value.Y, value.Width, 1);
-					Height = 1;
-				} else {
-					base.Frame = value;
-				}
-				Adjust ();
-			}
-		}
+	/// <summary>
+	/// Tracks whether the text field should be considered "used", that is, that the user has moved in the entry, so new input
+	/// should be appended at the cursor position, rather than clearing the entry
+	/// </summary>
+	public bool Used { get; set; }
 
-		/// <summary>
-		///   Sets or gets the text held by the view.
-		/// </summary>
-		public new string Text {
-			get {
-				return StringExtensions.ToString (_text);
-			}
+	/// <summary>
+	/// If set to true its not allow any changes in the text.
+	/// </summary>
+	public bool ReadOnly { get; set; } = false;
 
-			set {
-				var oldText = StringExtensions.ToString (_text);
+	/// <summary>
+	/// Provides autocomplete context menu based on suggestions at the current cursor
+	/// position. Configure <see cref="ISuggestionGenerator"/> to enable this feature.
+	/// </summary>
+	public IAutocomplete Autocomplete { get; set; } = new TextFieldAutocomplete ();
 
-				if (oldText == value)
-					return;
+	/// <summary>
+	/// Sets or gets the text held by the view.
+	/// </summary>
+	public new string Text {
+		get => StringExtensions.ToString (_text);
+		set {
+			var oldText = StringExtensions.ToString (_text);
 
-				var newText = OnTextChanging (value.Replace ("\t", "").Split ("\n") [0]);
-				if (newText.Cancel) {
-					if (_cursorPosition > _text.Count) {
-						_cursorPosition = _text.Count;
-					}
-					return;
-				}
-				ClearAllSelection ();
-				_text = newText.NewText.EnumerateRunes ().ToList ();
+			if (oldText == value) {
+				return;
+			}
 
-				if (!Secret && !_historyText.IsFromHistory) {
-					_historyText.Add (new List<List<RuneCell>> () { TextModel.ToRuneCellList (oldText) },
-						new Point (_cursorPosition, 0));
-					_historyText.Add (new List<List<RuneCell>> () { TextModel.ToRuneCells (_text) }, new Point (_cursorPosition, 0)
-						, HistoryText.LineStatus.Replaced);
+			var newText = OnTextChanging (value.Replace ("\t", "").Split ("\n") [0]);
+			if (newText.Cancel) {
+				if (_cursorPosition > _text.Count) {
+					_cursorPosition = _text.Count;
 				}
+				return;
+			}
+			ClearAllSelection ();
+			_text = newText.NewText.EnumerateRunes ().ToList ();
 
-				TextChanged?.Invoke (this, new TextChangedEventArgs (oldText));
+			if (!Secret && !_historyText.IsFromHistory) {
+				_historyText.Add (new List<List<RuneCell>> { TextModel.ToRuneCellList (oldText) },
+					new Point (_cursorPosition, 0));
+				_historyText.Add (new List<List<RuneCell>> { TextModel.ToRuneCells (_text) }, new Point (_cursorPosition, 0)
+					, HistoryText.LineStatus.Replaced);
+			}
 
-				ProcessAutocomplete ();
+			TextChanged?.Invoke (this, new TextChangedEventArgs (oldText));
 
-				if (_cursorPosition > _text.Count) {
-					_cursorPosition = Math.Max (TextModel.DisplaySize (_text, 0).size - 1, 0);
-				}
+			ProcessAutocomplete ();
 
-				Adjust ();
-				SetNeedsDisplay ();
+			if (_cursorPosition > _text.Count) {
+				_cursorPosition = Math.Max (TextModel.DisplaySize (_text, 0).size - 1, 0);
 			}
+
+			Adjust ();
+			SetNeedsDisplay ();
 		}
+	}
 
-		/// <summary>
-		///   Sets the secret property.
-		/// <remarks>
-		///   This makes the text entry suitable for entering passwords.
-		/// </remarks>
-		/// </summary>
-		public bool Secret { get; set; }
-
-		/// <summary>
-		///    Sets or gets the current cursor position.
-		/// </summary>
-		public virtual int CursorPosition {
-			get { return _cursorPosition; }
-			set {
-				if (value < 0) {
-					_cursorPosition = 0;
-				} else if (value > _text.Count) {
-					_cursorPosition = _text.Count;
-				} else {
-					_cursorPosition = value;
-				}
-				PrepareSelection (_selectedStart, _cursorPosition - _selectedStart);
+	/// <summary>
+	/// Sets the secret property.
+	/// <remarks>
+	/// This makes the text entry suitable for entering passwords.
+	/// </remarks>
+	/// </summary>
+	public bool Secret { get; set; }
+
+	/// <summary>
+	/// Sets or gets the current cursor position.
+	/// </summary>
+	public virtual int CursorPosition {
+		get => _cursorPosition;
+		set {
+			if (value < 0) {
+				_cursorPosition = 0;
+			} else if (value > _text.Count) {
+				_cursorPosition = _text.Count;
+			} else {
+				_cursorPosition = value;
 			}
+			PrepareSelection (_selectedStart, _cursorPosition - _selectedStart);
 		}
+	}
 
-		/// <summary>
-		/// Gets the left offset position.
-		/// </summary>
-		public int ScrollOffset => _first;
-
-		/// <summary>
-		/// Indicates whatever the text was changed or not.
-		/// <see langword="true"/> if the text was changed <see langword="false"/> otherwise.
-		/// </summary>
-		public bool IsDirty => _historyText.IsDirty (Text);
-
-		/// <summary>
-		/// Indicates whatever the text has history changes or not.
-		/// <see langword="true"/> if the text has history changes <see langword="false"/> otherwise.
-		/// </summary>
-		public bool HasHistoryChanges => _historyText.HasHistoryChanges;
-
-		/// <summary>
-		/// Get the <see cref="ContextMenu"/> for this view.
-		/// </summary>
-		public ContextMenu ContextMenu { get; private set; }
-
-		/// <summary>
-		///   Sets the cursor position.
-		/// </summary>
-		public override void PositionCursor ()
-		{
-			if (!IsInitialized) {
-				return;
-			}
-			ProcessAutocomplete ();
+	/// <summary>
+	/// Gets the left offset position.
+	/// </summary>
+	public int ScrollOffset { get; private set; }
 
-			var col = 0;
-			for (int idx = _first < 0 ? 0 : _first; idx < _text.Count; idx++) {
-				if (idx == _cursorPosition)
-					break;
-				var cols = _text [idx].GetColumns ();
-				TextModel.SetCol (ref col, Frame.Width - 1, cols);
-			}
-			var pos = _cursorPosition - _first + Math.Min (Frame.X, 0);
-			var offB = OffSetBackground ();
-			var containerFrame = SuperView?.BoundsToScreen (SuperView.Bounds) ?? default;
-			var thisFrame = BoundsToScreen (Bounds);
-			if (pos > -1 && col >= pos && pos < Frame.Width + offB
-				&& containerFrame.IntersectsWith (thisFrame)) {
-				RestoreCursorVisibility ();
-				Move (col, 0);
+	/// <summary>
+	/// Indicates whatever the text was changed or not.
+	/// <see langword="true"/> if the text was changed <see langword="false"/> otherwise.
+	/// </summary>
+	public bool IsDirty => _historyText.IsDirty (Text);
+
+	/// <summary>
+	/// Indicates whatever the text has history changes or not.
+	/// <see langword="true"/> if the text has history changes <see langword="false"/> otherwise.
+	/// </summary>
+	public bool HasHistoryChanges => _historyText.HasHistoryChanges;
+
+	/// <summary>
+	/// Get the <see cref="ContextMenu"/> for this view.
+	/// </summary>
+	public ContextMenu ContextMenu { get; private set; }
+
+	///<inheritdoc/>
+	public override bool CanFocus {
+		get => base.CanFocus;
+		set => base.CanFocus = value;
+	}
+
+	/// <summary>
+	/// Start position of the selected text.
+	/// </summary>
+	public int SelectedStart {
+		get => _selectedStart;
+		set {
+			if (value < -1) {
+				_selectedStart = -1;
+			} else if (value > _text.Count) {
+				_selectedStart = _text.Count;
 			} else {
-				HideCursorVisibility ();
-				if (pos < 0) {
-					Move (pos, 0);
-				} else {
-					Move (pos - offB, 0);
-				}
+				_selectedStart = value;
 			}
+			PrepareSelection (_selectedStart, _cursorPosition - _selectedStart);
 		}
+	}
 
-		CursorVisibility _savedCursorVisibility;
+	/// <summary>
+	/// Length of the selected text.
+	/// </summary>
+	public int SelectedLength { get; private set; }
 
-		void HideCursorVisibility ()
-		{
-			if (_desiredCursorVisibility != CursorVisibility.Invisible) {
-				DesiredCursorVisibility = CursorVisibility.Invisible;
+	/// <summary>
+	/// The selected text.
+	/// </summary>
+	public string SelectedText {
+		get => Secret ? null : _selectedText;
+		private set => _selectedText = value;
+	}
+
+	/// <summary>
+	/// Get / Set the wished cursor when the field is focused
+	/// </summary>
+	public CursorVisibility DesiredCursorVisibility {
+		get => _desiredCursorVisibility;
+		set {
+			if ((_desiredCursorVisibility != value || _visibility != value) && HasFocus) {
+				Application.Driver.SetCursorVisibility (value);
 			}
+
+			_desiredCursorVisibility = _visibility = value;
 		}
+	}
 
-		CursorVisibility _visibility;
+	/// <summary>
+	/// Changing event, raised before the <see cref="Text"/> changes and can be canceled or changing the new text.
+	/// </summary>
+	public event EventHandler<TextChangingEventArgs> TextChanging;
 
-		void RestoreCursorVisibility ()
-		{
-			Application.Driver.GetCursorVisibility (out _visibility);
-			if (_desiredCursorVisibility != _savedCursorVisibility || _visibility != _savedCursorVisibility) {
-				DesiredCursorVisibility = _savedCursorVisibility;
-			}
+	/// <summary>
+	/// Changed event, raised when the text has changed.
+	/// <remarks>
+	/// This event is raised when the <see cref="Text"/> changes.
+	/// The passed <see cref="EventArgs"/> is a <see cref="string"/> containing the old value.
+	/// </remarks>
+	/// </summary>
+	public event EventHandler<TextChangedEventArgs> TextChanged;
+
+	void SetInitialProperties (string text, int w)
+	{
+		Height = 1;
+
+		if (text == null) {
+			text = "";
 		}
 
-		bool _isDrawing = false;
+		_text = text.Split ("\n") [0].EnumerateRunes ().ToList ();
+		_cursorPosition = text.GetRuneCount ();
+		ScrollOffset = _cursorPosition > w + 1 ? _cursorPosition - w + 1 : 0;
+		CanFocus = true;
+		Used = true;
+		WantMousePositionReports = true;
+		_savedCursorVisibility = _desiredCursorVisibility;
 
-		///<inheritdoc/>
-		public override void OnDrawContent (Rect contentArea)
-		{
-			_isDrawing = true;
+		_historyText.ChangeText += HistoryText_ChangeText;
 
-			var selColor = new Attribute (ColorScheme.Focus.Background, ColorScheme.Focus.Foreground);
-			SetSelectedStartSelectedLength ();
+		Initialized += TextField_Initialized;
 
-			Driver.SetAttribute (GetNormalColor ());
-			Move (0, 0);
-
-			int p = _first;
-			int col = 0;
-			int width = Frame.Width + OffSetBackground ();
-			var tcount = _text.Count;
-			var roc = GetReadOnlyColor ();
-			for (int idx = p; idx < tcount; idx++) {
-				var rune = _text [idx];
-				var cols = rune.GetColumns ();
-				if (idx == _cursorPosition && HasFocus && !Used && _length == 0 && !ReadOnly) {
-					Driver.SetAttribute (selColor);
-				} else if (ReadOnly) {
-					Driver.SetAttribute (idx >= _start && _length > 0 && idx < _start + _length ? selColor : roc);
-				} else if (!HasFocus && Enabled) {
-					Driver.SetAttribute (ColorScheme.Focus);
-				} else if (!Enabled) {
-					Driver.SetAttribute (roc);
-				} else {
-					Driver.SetAttribute (idx >= _start && _length > 0 && idx < _start + _length ? selColor : ColorScheme.Focus);
-				}
-				if (col + cols <= width) {
-					Driver.AddRune ((Secret ? CM.Glyphs.Dot : rune));
-				}
-				if (!TextModel.SetCol (ref col, width, cols)) {
-					break;
-				}
-				if (idx + 1 < tcount && col + _text [idx + 1].GetColumns () > width) {
-					break;
-				}
-			}
+		LayoutComplete += TextField_LayoutComplete;
 
-			Driver.SetAttribute (ColorScheme.Focus);
-			for (int i = col; i < width; i++) {
-				Driver.AddRune ((Rune)' ');
-			}
+		// Things this view knows how to do
+		AddCommand (Command.DeleteCharRight, () => {
+			DeleteCharRight ();
+			return true;
+		});
+		AddCommand (Command.DeleteCharLeft, () => {
+			DeleteCharLeft (false);
+			return true;
+		});
+		AddCommand (Command.LeftHomeExtend, () => {
+			MoveHomeExtend ();
+			return true;
+		});
+		AddCommand (Command.RightEndExtend, () => {
+			MoveEndExtend ();
+			return true;
+		});
+		AddCommand (Command.LeftHome, () => {
+			MoveHome ();
+			return true;
+		});
+		AddCommand (Command.LeftExtend, () => {
+			MoveLeftExtend ();
+			return true;
+		});
+		AddCommand (Command.RightExtend, () => {
+			MoveRightExtend ();
+			return true;
+		});
+		AddCommand (Command.WordLeftExtend, () => {
+			MoveWordLeftExtend ();
+			return true;
+		});
+		AddCommand (Command.WordRightExtend, () => {
+			MoveWordRightExtend ();
+			return true;
+		});
+		AddCommand (Command.Left, () => {
+			MoveLeft ();
+			return true;
+		});
+		AddCommand (Command.RightEnd, () => {
+			MoveEnd ();
+			return true;
+		});
+		AddCommand (Command.Right, () => {
+			MoveRight ();
+			return true;
+		});
+		AddCommand (Command.CutToEndLine, () => {
+			KillToEnd ();
+			return true;
+		});
+		AddCommand (Command.CutToStartLine, () => {
+			KillToStart ();
+			return true;
+		});
+		AddCommand (Command.Undo, () => {
+			Undo ();
+			return true;
+		});
+		AddCommand (Command.Redo, () => {
+			Redo ();
+			return true;
+		});
+		AddCommand (Command.WordLeft, () => {
+			MoveWordLeft ();
+			return true;
+		});
+		AddCommand (Command.WordRight, () => {
+			MoveWordRight ();
+			return true;
+		});
+		AddCommand (Command.KillWordForwards, () => {
+			KillWordForwards ();
+			return true;
+		});
+		AddCommand (Command.KillWordBackwards, () => {
+			KillWordBackwards ();
+			return true;
+		});
+		AddCommand (Command.ToggleOverwrite, () => {
+			SetOverwrite (!Used);
+			return true;
+		});
+		AddCommand (Command.EnableOverwrite, () => {
+			SetOverwrite (true);
+			return true;
+		});
+		AddCommand (Command.DisableOverwrite, () => {
+			SetOverwrite (false);
+			return true;
+		});
+		AddCommand (Command.Copy, () => {
+			Copy ();
+			return true;
+		});
+		AddCommand (Command.Cut, () => {
+			Cut ();
+			return true;
+		});
+		AddCommand (Command.Paste, () => {
+			Paste ();
+			return true;
+		});
+		AddCommand (Command.SelectAll, () => {
+			SelectAll ();
+			return true;
+		});
+		AddCommand (Command.DeleteAll, () => {
+			DeleteAll ();
+			return true;
+		});
+		AddCommand (Command.ShowContextMenu, () => {
+			ShowContextMenu ();
+			return true;
+		});
 
-			PositionCursor ();
+		// Default keybindings for this view
+		// We follow this as closely as possible: https://en.wikipedia.org/wiki/Table_of_keyboard_shortcuts
+		KeyBindings.Add (KeyCode.Delete, Command.DeleteCharRight);
+		KeyBindings.Add (KeyCode.D | KeyCode.CtrlMask, Command.DeleteCharRight);
 
-			RenderCaption ();
+		KeyBindings.Add (KeyCode.Backspace, Command.DeleteCharLeft);
 
-			ProcessAutocomplete ();
+		KeyBindings.Add (KeyCode.Home | KeyCode.ShiftMask, Command.LeftHomeExtend);
+		KeyBindings.Add (KeyCode.Home | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.LeftHomeExtend);
+		KeyBindings.Add (KeyCode.A | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.LeftHomeExtend);
 
-			_isDrawing = false;
-		}
+		KeyBindings.Add (KeyCode.End | KeyCode.ShiftMask, Command.RightEndExtend);
+		KeyBindings.Add (KeyCode.End | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.RightEndExtend);
+		KeyBindings.Add (KeyCode.E | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.RightEndExtend);
 
-		private void ProcessAutocomplete ()
-		{
-			if (_isDrawing) {
-				return;
-			}
-			if (SelectedLength > 0) {
-				return;
-			}
+		KeyBindings.Add (KeyCode.Home, Command.LeftHome);
+		KeyBindings.Add (KeyCode.Home | KeyCode.CtrlMask, Command.LeftHome);
+		KeyBindings.Add (KeyCode.A | KeyCode.CtrlMask, Command.LeftHome);
 
-			// draw autocomplete
-			GenerateSuggestions ();
+		KeyBindings.Add (KeyCode.CursorLeft | KeyCode.ShiftMask, Command.LeftExtend);
+		KeyBindings.Add (KeyCode.CursorUp | KeyCode.ShiftMask, Command.LeftExtend);
 
-			var renderAt = new Point (
-				Autocomplete.Context.CursorPosition, 0);
+		KeyBindings.Add (KeyCode.CursorRight | KeyCode.ShiftMask, Command.RightExtend);
+		KeyBindings.Add (KeyCode.CursorDown | KeyCode.ShiftMask, Command.RightExtend);
 
-			Autocomplete.RenderOverlay (renderAt);
-		}
+		KeyBindings.Add (KeyCode.CursorLeft | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.WordLeftExtend);
+		KeyBindings.Add (KeyCode.CursorUp | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.WordLeftExtend);
+		KeyBindings.Add ('B' + KeyCode.ShiftMask | KeyCode.AltMask, Command.WordLeftExtend);
 
-		private void RenderCaption ()
-		{
-			if (HasFocus || Caption == null || Caption.Length == 0
-				|| Text?.Length > 0) {
-				return;
-			}
+		KeyBindings.Add (KeyCode.CursorRight | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.WordRightExtend);
+		KeyBindings.Add (KeyCode.CursorDown | KeyCode.ShiftMask | KeyCode.CtrlMask, Command.WordRightExtend);
+		KeyBindings.Add ('F' + KeyCode.ShiftMask | KeyCode.AltMask, Command.WordRightExtend);
 
-			var color = new Attribute (CaptionColor, GetNormalColor ().Background);
-			Driver.SetAttribute (color);
+		KeyBindings.Add (KeyCode.CursorLeft, Command.Left);
+		KeyBindings.Add (KeyCode.B | KeyCode.CtrlMask, Command.Left);
 
-			Move (0, 0);
-			var render = Caption;
+		KeyBindings.Add (KeyCode.End, Command.RightEnd);
+		KeyBindings.Add (KeyCode.End | KeyCode.CtrlMask, Command.RightEnd);
+		KeyBindings.Add (KeyCode.E | KeyCode.CtrlMask, Command.RightEnd);
 
-			if (render.GetColumns () > Bounds.Width) {
-				render = render [..Bounds.Width];
-			}
+		KeyBindings.Add (KeyCode.CursorRight, Command.Right);
+		KeyBindings.Add (KeyCode.F | KeyCode.CtrlMask, Command.Right);
+
+		KeyBindings.Add (KeyCode.K | KeyCode.CtrlMask, Command.CutToEndLine);
+		KeyBindings.Add (KeyCode.K | KeyCode.AltMask, Command.CutToStartLine);
+
+		KeyBindings.Add (KeyCode.Z | KeyCode.CtrlMask, Command.Undo);
+		KeyBindings.Add (KeyCode.Backspace | KeyCode.AltMask, Command.Undo);
+
+		KeyBindings.Add (KeyCode.Y | KeyCode.CtrlMask, Command.Redo);
+
+		KeyBindings.Add (KeyCode.CursorLeft | KeyCode.CtrlMask, Command.WordLeft);
+		KeyBindings.Add (KeyCode.CursorUp | KeyCode.CtrlMask, Command.WordLeft);
+		KeyBindings.Add ('B' + KeyCode.AltMask, Command.WordLeft);
 
-			Driver.AddStr (render);
+		KeyBindings.Add (KeyCode.CursorRight | KeyCode.CtrlMask, Command.WordRight);
+		KeyBindings.Add (KeyCode.CursorDown | KeyCode.CtrlMask, Command.WordRight);
+		KeyBindings.Add ('F' + KeyCode.AltMask, Command.WordRight);
+
+		KeyBindings.Add (KeyCode.Delete | KeyCode.CtrlMask, Command.KillWordForwards);
+		KeyBindings.Add (KeyCode.Backspace | KeyCode.CtrlMask, Command.KillWordBackwards);
+		KeyBindings.Add (KeyCode.Insert, Command.ToggleOverwrite);
+		KeyBindings.Add (KeyCode.C | KeyCode.CtrlMask, Command.Copy);
+		KeyBindings.Add (KeyCode.X | KeyCode.CtrlMask, Command.Cut);
+		KeyBindings.Add (KeyCode.V | KeyCode.CtrlMask, Command.Paste);
+		KeyBindings.Add (KeyCode.T | KeyCode.CtrlMask, Command.SelectAll);
+
+		KeyBindings.Add (KeyCode.R | KeyCode.CtrlMask, Command.DeleteAll);
+		KeyBindings.Add (KeyCode.D | KeyCode.CtrlMask | KeyCode.ShiftMask, Command.DeleteAll);
+
+		_currentCulture = Thread.CurrentThread.CurrentUICulture;
+
+		ContextMenu = new ContextMenu (this, BuildContextMenuBarItem ());
+		ContextMenu.KeyChanged += ContextMenu_KeyChanged;
+
+		KeyBindings.Add (ContextMenu.Key.KeyCode, KeyBindingScope.HotKey, Command.ShowContextMenu);
+	}
+
+	void TextField_LayoutComplete (object sender, LayoutEventArgs e)
+	{
+		// Don't let height > 1
+		if (Frame.Height > 1) {
+			Height = 1;
 		}
+	}
 
-		private void GenerateSuggestions ()
-		{
-			var currentLine = TextModel.ToRuneCellList (Text);
-			var cursorPosition = Math.Min (this.CursorPosition, currentLine.Count);
-			Autocomplete.Context = new AutocompleteContext (currentLine, cursorPosition,
-				Autocomplete.Context != null ? Autocomplete.Context.Canceled : false);
 
-			Autocomplete.GenerateSuggestions (
-				Autocomplete.Context);
+	MenuBarItem BuildContextMenuBarItem () => new (new MenuItem [] {
+		new (Strings.ctxSelectAll, "", () => SelectAll (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.SelectAll)),
+		new (Strings.ctxDeleteAll, "", () => DeleteAll (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.DeleteAll)),
+		new (Strings.ctxCopy, "", () => Copy (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.Copy)),
+		new (Strings.ctxCut, "", () => Cut (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.Cut)),
+		new (Strings.ctxPaste, "", () => Paste (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.Paste)),
+		new (Strings.ctxUndo, "", () => Undo (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.Undo)),
+		new (Strings.ctxRedo, "", () => Redo (), null, null, (KeyCode)KeyBindings.GetKeyFromCommands (Command.Redo))
+	});
+
+	void ContextMenu_KeyChanged (object sender, KeyChangedEventArgs e) => KeyBindings.Replace (e.OldKey.KeyCode, e.NewKey.KeyCode);
+
+	void HistoryText_ChangeText (object sender, HistoryText.HistoryTextItem obj)
+	{
+		if (obj == null) {
+			return;
 		}
 
-		/// <inheritdoc/>
-		public override Attribute GetNormalColor ()
-		{
-			return Enabled ? ColorScheme.Focus : ColorScheme.Disabled;
+		Text = TextModel.ToString (obj?.Lines [obj.CursorPosition.Y]);
+		CursorPosition = obj.CursorPosition.X;
+		Adjust ();
+	}
+
+	void TextField_Initialized (object sender, EventArgs e)
+	{
+		Autocomplete.HostControl = this;
+		Autocomplete.PopupInsideContainer = false;
+	}
+
+	///<inheritdoc/>
+	public override bool OnEnter (View view)
+	{
+		if (IsInitialized) {
+			Application.Driver.SetCursorVisibility (DesiredCursorVisibility);
 		}
 
-		Attribute GetReadOnlyColor ()
-		{
-			if (ColorScheme.Disabled.Foreground == ColorScheme.Focus.Background) {
-				return new Attribute (ColorScheme.Focus.Foreground, ColorScheme.Focus.Background);
-			}
-			return new Attribute (ColorScheme.Disabled.Foreground, ColorScheme.Focus.Background);
+		return base.OnEnter (view);
+	}
+
+	///<inheritdoc/>
+	public override bool OnLeave (View view)
+	{
+		if (Application.MouseGrabView != null && Application.MouseGrabView == this) {
+			Application.UngrabMouse ();
 		}
+		//if (SelectedLength != 0 && !(Application.MouseGrabView is MenuBar))
+		//	ClearAllSelection ();
 
-		void Adjust ()
-		{
-			if (!IsAdded) {
-				return;
-			}
+		return base.OnLeave (view);
+	}
+
+	/// <summary>
+	/// Sets the cursor position.
+	/// </summary>
+	public override void PositionCursor ()
+	{
+		if (!IsInitialized) {
+			return;
+		}
+		ProcessAutocomplete ();
 
-			int offB = OffSetBackground ();
-			bool need = NeedsDisplay || !Used;
-			if (_cursorPosition < _first) {
-				_first = _cursorPosition;
-				need = true;
-			} else if (Frame.Width > 0 && (_first + _cursorPosition - (Frame.Width + offB) == 0 ||
-				  TextModel.DisplaySize (_text, _first, _cursorPosition).size >= Frame.Width + offB)) {
-
-				_first = Math.Max (TextModel.CalculateLeftColumn (_text, _first,
-					_cursorPosition, Frame.Width + offB), 0);
-				need = true;
+		var col = 0;
+		for (var idx = ScrollOffset < 0 ? 0 : ScrollOffset; idx < _text.Count; idx++) {
+			if (idx == _cursorPosition) {
+				break;
 			}
-			if (need) {
-				SetNeedsDisplay ();
+			var cols = _text [idx].GetColumns ();
+			TextModel.SetCol (ref col, Frame.Width - 1, cols);
+		}
+		var pos = _cursorPosition - ScrollOffset + Math.Min (Frame.X, 0);
+		var offB = OffSetBackground ();
+		var containerFrame = SuperView?.BoundsToScreen (SuperView.Bounds) ?? default;
+		var thisFrame = BoundsToScreen (Bounds);
+		if (pos > -1 && col >= pos && pos < Frame.Width + offB
+		    && containerFrame.IntersectsWith (thisFrame)) {
+			RestoreCursorVisibility ();
+			Move (col, 0);
+		} else {
+			HideCursorVisibility ();
+			if (pos < 0) {
+				Move (pos, 0);
 			} else {
-				PositionCursor ();
+				Move (pos - offB, 0);
 			}
 		}
+	}
 
-		int OffSetBackground ()
-		{
-			int offB = 0;
-			if (SuperView?.Frame.Right - Frame.Right < 0) {
-				offB = SuperView.Frame.Right - Frame.Right - 1;
-			}
-
-			return offB;
+	void HideCursorVisibility ()
+	{
+		if (_desiredCursorVisibility != CursorVisibility.Invisible) {
+			DesiredCursorVisibility = CursorVisibility.Invisible;
 		}
+	}
 
-		void SetText (List<Rune> newText)
-		{
-			Text = StringExtensions.ToString (newText);
+	void RestoreCursorVisibility ()
+	{
+		Application.Driver.GetCursorVisibility (out _visibility);
+		if (_desiredCursorVisibility != _savedCursorVisibility || _visibility != _savedCursorVisibility) {
+			DesiredCursorVisibility = _savedCursorVisibility;
 		}
+	}
 
-		void SetText (IEnumerable<Rune> newText)
-		{
-			SetText (newText.ToList ());
+	///<inheritdoc/>
+	public override void OnDrawContent (Rect contentArea)
+	{
+		_isDrawing = true;
+
+		var selColor = new Attribute (ColorScheme.Focus.Background, ColorScheme.Focus.Foreground);
+		SetSelectedStartSelectedLength ();
+
+		Driver.SetAttribute (GetNormalColor ());
+		Move (0, 0);
+
+		var p = ScrollOffset;
+		var col = 0;
+		var width = Frame.Width + OffSetBackground ();
+		var tcount = _text.Count;
+		var roc = GetReadOnlyColor ();
+		for (var idx = p; idx < tcount; idx++) {
+			var rune = _text [idx];
+			var cols = rune.GetColumns ();
+			if (idx == _cursorPosition && HasFocus && !Used && SelectedLength == 0 && !ReadOnly) {
+				Driver.SetAttribute (selColor);
+			} else if (ReadOnly) {
+				Driver.SetAttribute (idx >= _start && SelectedLength > 0 && idx < _start + SelectedLength ? selColor : roc);
+			} else if (!HasFocus && Enabled) {
+				Driver.SetAttribute (ColorScheme.Focus);
+			} else if (!Enabled) {
+				Driver.SetAttribute (roc);
+			} else {
+				Driver.SetAttribute (idx >= _start && SelectedLength > 0 && idx < _start + SelectedLength ? selColor : ColorScheme.Focus);
+			}
+			if (col + cols <= width) {
+				Driver.AddRune (Secret ? Glyphs.Dot : rune);
+			}
+			if (!TextModel.SetCol (ref col, width, cols)) {
+				break;
+			}
+			if (idx + 1 < tcount && col + _text [idx + 1].GetColumns () > width) {
+				break;
+			}
 		}
 
-		///<inheritdoc/>
-		public override bool CanFocus {
-			get => base.CanFocus;
-			set { base.CanFocus = value; }
+		Driver.SetAttribute (ColorScheme.Focus);
+		for (var i = col; i < width; i++) {
+			Driver.AddRune ((Rune)' ');
 		}
 
-		void SetClipboard (IEnumerable<Rune> text)
-		{
-			if (!Secret)
-				Clipboard.Contents = StringExtensions.ToString (text.ToList ());
+		PositionCursor ();
+
+		RenderCaption ();
+
+		ProcessAutocomplete ();
+
+		_isDrawing = false;
+	}
+
+	void ProcessAutocomplete ()
+	{
+		if (_isDrawing) {
+			return;
+		}
+		if (SelectedLength > 0) {
+			return;
 		}
 
-		int _preTextChangedCursorPos;
+		// draw autocomplete
+		GenerateSuggestions ();
 
-		///<inheritdoc/>
-		public override bool? OnInvokingKeyBindings (Key a)
-		{
-			// Give autocomplete first opportunity to respond to key presses
-			if (SelectedLength == 0 && Autocomplete.Suggestions.Count > 0 && Autocomplete.ProcessKey (a)) {
-				return true;
-			}
-			return base.OnInvokingKeyBindings (a);
-		}
-
-		/// TODO: Flush out these docs
-		/// <summary>
-		/// Processes key presses for the <see cref="TextField"/>.
-		/// <remarks>
-		/// The <see cref="TextField"/> control responds to the following keys:
-		/// <list type="table">
-		///    <listheader>
-		///        <term>Keys</term>
-		///        <description>Function</description>
-		///    </listheader>
-		///    <item>
-		///        <term><see cref="Key.Delete"/>, <see cref="Key.Backspace"/></term>
-		///        <description>Deletes the character before cursor.</description>
-		///    </item>
-		/// </list>
-		/// </remarks>
-		/// </summary>
-		/// <param name="a"></param>
-		/// <returns></returns>
-		public override bool OnProcessKeyDown (Key a)
-		{
-			// Remember the cursor position because the new calculated cursor position is needed
-			// to be set BEFORE the TextChanged event is triggered.
-			// Needed for the Elmish Wrapper issue https://github.com/DieselMeister/Terminal.Gui.Elmish/issues/2
-			_preTextChangedCursorPos = _cursorPosition;
+		var renderAt = new Point (
+			Autocomplete.Context.CursorPosition, 0);
 
-			// Ignore other control characters.
-			if (!a.IsKeyCodeAtoZ && (a.KeyCode < KeyCode.Space || a.KeyCode > KeyCode.CharMask)) {
-				return false;
-			}
+		Autocomplete.RenderOverlay (renderAt);
+	}
 
-			if (ReadOnly) {
-				return true;
-			}
+	void RenderCaption ()
+	{
+		if (HasFocus || Caption == null || Caption.Length == 0
+		    || Text?.Length > 0) {
+			return;
+		}
 
-			InsertText (a, true);
+		var color = new Attribute (CaptionColor, GetNormalColor ().Background);
+		Driver.SetAttribute (color);
 
-			return true;
+		Move (0, 0);
+		var render = Caption;
+
+		if (render.GetColumns () > Bounds.Width) {
+			render = render [..Bounds.Width];
 		}
 
-		void InsertText (Key a, bool usePreTextChangedCursorPos)
-		{
-			_historyText.Add (new List<List<RuneCell>> () { TextModel.ToRuneCells (_text) }, new Point (_cursorPosition, 0));
+		Driver.AddStr (render);
+	}
 
-			List<Rune> newText = _text;
-			if (_length > 0) {
-				newText = DeleteSelectedText ();
-				_preTextChangedCursorPos = _cursorPosition;
-			}
-			if (!usePreTextChangedCursorPos) {
-				_preTextChangedCursorPos = _cursorPosition;
-			}
-			var kbstr = a.AsRune.ToString ().EnumerateRunes ();
-			if (Used) {
-				_cursorPosition++;
-				if (_cursorPosition == newText.Count + 1) {
-					SetText (newText.Concat (kbstr).ToList ());
-				} else {
-					if (_preTextChangedCursorPos > newText.Count) {
-						_preTextChangedCursorPos = newText.Count;
-					}
-					SetText (newText.GetRange (0, _preTextChangedCursorPos).Concat (kbstr).Concat (newText.GetRange (_preTextChangedCursorPos, Math.Min (newText.Count - _preTextChangedCursorPos, newText.Count))));
-				}
-			} else {
-				SetText (newText.GetRange (0, _preTextChangedCursorPos).Concat (kbstr).Concat (newText.GetRange (Math.Min (_preTextChangedCursorPos + 1, newText.Count), Math.Max (newText.Count - _preTextChangedCursorPos - 1, 0))));
-				_cursorPosition++;
-			}
-			Adjust ();
+	void GenerateSuggestions ()
+	{
+		var currentLine = TextModel.ToRuneCellList (Text);
+		var cursorPosition = Math.Min (CursorPosition, currentLine.Count);
+		Autocomplete.Context = new AutocompleteContext (currentLine, cursorPosition,
+			Autocomplete.Context != null ? Autocomplete.Context.Canceled : false);
+
+		Autocomplete.GenerateSuggestions (
+			Autocomplete.Context);
+	}
+
+	/// <inheritdoc/>
+	public override Attribute GetNormalColor () => Enabled ? ColorScheme.Focus : ColorScheme.Disabled;
+
+	Attribute GetReadOnlyColor ()
+	{
+		if (ColorScheme.Disabled.Foreground == ColorScheme.Focus.Background) {
+			return new Attribute (ColorScheme.Focus.Foreground, ColorScheme.Focus.Background);
 		}
+		return new Attribute (ColorScheme.Disabled.Foreground, ColorScheme.Focus.Background);
+	}
 
-		void SetOverwrite (bool overwrite)
-		{
-			Used = overwrite;
+	void Adjust ()
+	{
+		if (!IsAdded) {
+			return;
+		}
+
+		var offB = OffSetBackground ();
+		var need = NeedsDisplay || !Used;
+		if (_cursorPosition < ScrollOffset) {
+			ScrollOffset = _cursorPosition;
+			need = true;
+		} else if (Frame.Width > 0 && (ScrollOffset + _cursorPosition - (Frame.Width + offB) == 0 ||
+					       TextModel.DisplaySize (_text, ScrollOffset, _cursorPosition).size >= Frame.Width + offB)) {
+
+			ScrollOffset = Math.Max (TextModel.CalculateLeftColumn (_text, ScrollOffset,
+				_cursorPosition, Frame.Width + offB), 0);
+			need = true;
+		}
+		if (need) {
 			SetNeedsDisplay ();
+		} else {
+			PositionCursor ();
 		}
+	}
 
-		TextModel GetModel ()
-		{
-			var model = new TextModel ();
-			model.LoadString (Text);
-			return model;
+	int OffSetBackground ()
+	{
+		var offB = 0;
+		if (SuperView?.Frame.Right - Frame.Right < 0) {
+			offB = SuperView.Frame.Right - Frame.Right - 1;
 		}
 
-		/// <summary>
-		/// Deletes word backwards.
-		/// </summary>
-		public virtual void KillWordBackwards ()
-		{
-			ClearAllSelection ();
-			var newPos = GetModel ().WordBackward (_cursorPosition, 0);
-			if (newPos == null) return;
-			if (newPos.Value.col != -1) {
-				SetText (_text.GetRange (0, newPos.Value.col).Concat (_text.GetRange (_cursorPosition, _text.Count - _cursorPosition)));
-				_cursorPosition = newPos.Value.col;
-			}
-			Adjust ();
+		return offB;
+	}
+
+	void SetText (List<Rune> newText) => Text = StringExtensions.ToString (newText);
+
+	void SetText (IEnumerable<Rune> newText) => SetText (newText.ToList ());
+
+	void SetClipboard (IEnumerable<Rune> text)
+	{
+		if (!Secret) {
+			Clipboard.Contents = StringExtensions.ToString (text.ToList ());
 		}
+	}
 
-		/// <summary>
-		/// Deletes word forwards.
-		/// </summary>
-		public virtual void KillWordForwards ()
-		{
-			ClearAllSelection ();
-			var newPos = GetModel ().WordForward (_cursorPosition, 0);
-			if (newPos == null) return;
-			if (newPos.Value.col != -1) {
-				SetText (_text.GetRange (0, _cursorPosition).Concat (_text.GetRange (newPos.Value.col, _text.Count - newPos.Value.col)));
-			}
-			Adjust ();
+	///<inheritdoc/>
+	public override bool? OnInvokingKeyBindings (Key a)
+	{
+		// Give autocomplete first opportunity to respond to key presses
+		if (SelectedLength == 0 && Autocomplete.Suggestions.Count > 0 && Autocomplete.ProcessKey (a)) {
+			return true;
 		}
+		return base.OnInvokingKeyBindings (a);
+	}
 
-		void MoveWordRight ()
-		{
-			ClearAllSelection ();
-			var newPos = GetModel ().WordForward (_cursorPosition, 0);
-			if (newPos == null) return;
-			if (newPos.Value.col != -1)
-				_cursorPosition = newPos.Value.col;
-			Adjust ();
+	/// TODO: Flush out these docs
+	/// <summary>
+	/// Processes key presses for the <see cref="TextField"/>.
+	/// <remarks>
+	/// The <see cref="TextField"/> control responds to the following keys:
+	/// <list type="table">
+	///         <listheader>
+	///                 <term>Keys</term>
+	///                 <description>Function</description>
+	///         </listheader>
+	///         <item>
+	///                 <term><see cref="Key.Delete"/>, <see cref="Key.Backspace"/></term>
+	///                 <description>Deletes the character before cursor.</description>
+	///         </item>
+	/// </list>
+	/// </remarks>
+	/// </summary>
+	/// <param name="a"></param>
+	/// <returns></returns>
+	public override bool OnProcessKeyDown (Key a)
+	{
+		// Remember the cursor position because the new calculated cursor position is needed
+		// to be set BEFORE the TextChanged event is triggered.
+		// Needed for the Elmish Wrapper issue https://github.com/DieselMeister/Terminal.Gui.Elmish/issues/2
+		_preTextChangedCursorPos = _cursorPosition;
+
+		// Ignore other control characters.
+		if (!a.IsKeyCodeAtoZ && (a.KeyCode < KeyCode.Space || a.KeyCode > KeyCode.CharMask)) {
+			return false;
 		}
 
-		void MoveWordLeft ()
-		{
-			ClearAllSelection ();
-			var newPos = GetModel ().WordBackward (_cursorPosition, 0);
-			if (newPos == null) return;
-			if (newPos.Value.col != -1)
-				_cursorPosition = newPos.Value.col;
-			Adjust ();
+		if (ReadOnly) {
+			return true;
 		}
 
-		/// <summary>
-		/// Redoes the latest changes.
-		/// </summary>
-		public void Redo ()
-		{
-			if (ReadOnly) {
-				return;
+		InsertText (a, true);
+
+		return true;
+	}
+
+	void InsertText (Key a, bool usePreTextChangedCursorPos)
+	{
+		_historyText.Add (new List<List<RuneCell>> { TextModel.ToRuneCells (_text) }, new Point (_cursorPosition, 0));
+
+		var newText = _text;
+		if (SelectedLength > 0) {
+			newText = DeleteSelectedText ();
+			_preTextChangedCursorPos = _cursorPosition;
+		}
+		if (!usePreTextChangedCursorPos) {
+			_preTextChangedCursorPos = _cursorPosition;
+		}
+		var kbstr = a.AsRune.ToString ().EnumerateRunes ();
+		if (Used) {
+			_cursorPosition++;
+			if (_cursorPosition == newText.Count + 1) {
+				SetText (newText.Concat (kbstr).ToList ());
+			} else {
+				if (_preTextChangedCursorPos > newText.Count) {
+					_preTextChangedCursorPos = newText.Count;
+				}
+				SetText (newText.GetRange (0, _preTextChangedCursorPos).Concat (kbstr).Concat (newText.GetRange (_preTextChangedCursorPos, Math.Min (newText.Count - _preTextChangedCursorPos, newText.Count))));
 			}
+		} else {
+			SetText (newText.GetRange (0, _preTextChangedCursorPos).Concat (kbstr).Concat (newText.GetRange (Math.Min (_preTextChangedCursorPos + 1, newText.Count), Math.Max (newText.Count - _preTextChangedCursorPos - 1, 0))));
+			_cursorPosition++;
+		}
+		Adjust ();
+	}
+
+	void SetOverwrite (bool overwrite)
+	{
+		Used = overwrite;
+		SetNeedsDisplay ();
+	}
+
+	TextModel GetModel ()
+	{
+		var model = new TextModel ();
+		model.LoadString (Text);
+		return model;
+	}
 
-			_historyText.Redo ();
+	/// <summary>
+	/// Deletes word backwards.
+	/// </summary>
+	public virtual void KillWordBackwards ()
+	{
+		ClearAllSelection ();
+		var newPos = GetModel ().WordBackward (_cursorPosition, 0);
+		if (newPos == null) {
+			return;
+		}
+		if (newPos.Value.col != -1) {
+			SetText (_text.GetRange (0, newPos.Value.col).Concat (_text.GetRange (_cursorPosition, _text.Count - _cursorPosition)));
+			_cursorPosition = newPos.Value.col;
+		}
+		Adjust ();
+	}
 
-			//if (string.IsNullOrEmpty (Clipboard.Contents))
-			//	return true;
-			//var clip = TextModel.ToRunes (Clipboard.Contents);
-			//if (clip == null)
-			//	return true;
+	/// <summary>
+	/// Deletes word forwards.
+	/// </summary>
+	public virtual void KillWordForwards ()
+	{
+		ClearAllSelection ();
+		var newPos = GetModel ().WordForward (_cursorPosition, 0);
+		if (newPos == null) {
+			return;
+		}
+		if (newPos.Value.col != -1) {
+			SetText (_text.GetRange (0, _cursorPosition).Concat (_text.GetRange (newPos.Value.col, _text.Count - newPos.Value.col)));
+		}
+		Adjust ();
+	}
 
-			//if (point == text.Count) {
-			//	point = text.Count;
-			//	SetText(text.Concat(clip).ToList());
-			//} else {
-			//	point += clip.Count;
-			//	SetText(text.GetRange(0, oldCursorPos).Concat(clip).Concat(text.GetRange(oldCursorPos, text.Count - oldCursorPos)));
-			//}
-			//Adjust ();
+	void MoveWordRight ()
+	{
+		ClearAllSelection ();
+		var newPos = GetModel ().WordForward (_cursorPosition, 0);
+		if (newPos == null) {
+			return;
+		}
+		if (newPos.Value.col != -1) {
+			_cursorPosition = newPos.Value.col;
+		}
+		Adjust ();
+	}
+
+	void MoveWordLeft ()
+	{
+		ClearAllSelection ();
+		var newPos = GetModel ().WordBackward (_cursorPosition, 0);
+		if (newPos == null) {
+			return;
+		}
+		if (newPos.Value.col != -1) {
+			_cursorPosition = newPos.Value.col;
+		}
+		Adjust ();
+	}
+
+	/// <summary>
+	/// Redoes the latest changes.
+	/// </summary>
+	public void Redo ()
+	{
+		if (ReadOnly) {
+			return;
+		}
+
+		_historyText.Redo ();
+
+		//if (string.IsNullOrEmpty (Clipboard.Contents))
+		//	return true;
+		//var clip = TextModel.ToRunes (Clipboard.Contents);
+		//if (clip == null)
+		//	return true;
+
+		//if (point == text.Count) {
+		//	point = text.Count;
+		//	SetText(text.Concat(clip).ToList());
+		//} else {
+		//	point += clip.Count;
+		//	SetText(text.GetRange(0, oldCursorPos).Concat(clip).Concat(text.GetRange(oldCursorPos, text.Count - oldCursorPos)));
+		//}
+		//Adjust ();
+	}
+
+	/// <summary>
+	/// Undoes the latest changes.
+	/// </summary>
+	public void Undo ()
+	{
+		if (ReadOnly) {
+			return;
 		}
 
-		/// <summary>
-		/// Undoes the latest changes.
-		/// </summary>
-		public void Undo ()
-		{
-			if (ReadOnly) {
-				return;
-			}
+		_historyText.Undo ();
+	}
 
-			_historyText.Undo ();
+	void KillToStart ()
+	{
+		if (ReadOnly) {
+			return;
 		}
 
-		void KillToStart ()
-		{
-			if (ReadOnly)
-				return;
-
-			ClearAllSelection ();
-			if (_cursorPosition == 0)
-				return;
-			SetClipboard (_text.GetRange (0, _cursorPosition));
-			SetText (_text.GetRange (_cursorPosition, _text.Count - _cursorPosition));
-			_cursorPosition = 0;
-			Adjust ();
+		ClearAllSelection ();
+		if (_cursorPosition == 0) {
+			return;
 		}
+		SetClipboard (_text.GetRange (0, _cursorPosition));
+		SetText (_text.GetRange (_cursorPosition, _text.Count - _cursorPosition));
+		_cursorPosition = 0;
+		Adjust ();
+	}
 
-		void KillToEnd ()
-		{
-			if (ReadOnly)
-				return;
+	void KillToEnd ()
+	{
+		if (ReadOnly) {
+			return;
+		}
 
-			ClearAllSelection ();
-			if (_cursorPosition >= _text.Count)
-				return;
-			SetClipboard (_text.GetRange (_cursorPosition, _text.Count - _cursorPosition));
-			SetText (_text.GetRange (0, _cursorPosition));
-			Adjust ();
+		ClearAllSelection ();
+		if (_cursorPosition >= _text.Count) {
+			return;
 		}
+		SetClipboard (_text.GetRange (_cursorPosition, _text.Count - _cursorPosition));
+		SetText (_text.GetRange (0, _cursorPosition));
+		Adjust ();
+	}
 
-		void MoveRight ()
-		{
-			ClearAllSelection ();
-			if (_cursorPosition == _text.Count)
-				return;
-			_cursorPosition++;
-			Adjust ();
+	void MoveRight ()
+	{
+		ClearAllSelection ();
+		if (_cursorPosition == _text.Count) {
+			return;
 		}
+		_cursorPosition++;
+		Adjust ();
+	}
 
-		/// <summary>
-		/// Moves cursor to the end of the typed text.
-		/// </summary>
-		public void MoveEnd ()
-		{
-			ClearAllSelection ();
-			_cursorPosition = _text.Count;
+	/// <summary>
+	/// Moves cursor to the end of the typed text.
+	/// </summary>
+	public void MoveEnd ()
+	{
+		ClearAllSelection ();
+		_cursorPosition = _text.Count;
+		Adjust ();
+	}
+
+	void MoveLeft ()
+	{
+		ClearAllSelection ();
+		if (_cursorPosition > 0) {
+			_cursorPosition--;
 			Adjust ();
 		}
+	}
 
-		void MoveLeft ()
-		{
-			ClearAllSelection ();
-			if (_cursorPosition > 0) {
-				_cursorPosition--;
-				Adjust ();
+	void MoveWordRightExtend ()
+	{
+		if (_cursorPosition < _text.Count) {
+			var x = _start > -1 && _start > _cursorPosition ? _start : _cursorPosition;
+			var newPos = GetModel ().WordForward (x, 0);
+			if (newPos == null) {
+				return;
+			}
+			if (newPos.Value.col != -1) {
+				_cursorPosition = newPos.Value.col;
 			}
+			PrepareSelection (x, newPos.Value.col - x);
 		}
+	}
 
-		void MoveWordRightExtend ()
-		{
-			if (_cursorPosition < _text.Count) {
-				int x = _start > -1 && _start > _cursorPosition ? _start : _cursorPosition;
-				var newPos = GetModel ().WordForward (x, 0);
-				if (newPos == null) return;
-				if (newPos.Value.col != -1)
+	void MoveWordLeftExtend ()
+	{
+		if (_cursorPosition > 0) {
+			var x = Math.Min (_start > -1 && _start > _cursorPosition ? _start : _cursorPosition, _text.Count);
+			if (x > 0) {
+				var newPos = GetModel ().WordBackward (x, 0);
+				if (newPos == null) {
+					return;
+				}
+				if (newPos.Value.col != -1) {
 					_cursorPosition = newPos.Value.col;
+				}
 				PrepareSelection (x, newPos.Value.col - x);
 			}
 		}
+	}
 
-		void MoveWordLeftExtend ()
-		{
-			if (_cursorPosition > 0) {
-				int x = Math.Min (_start > -1 && _start > _cursorPosition ? _start : _cursorPosition, _text.Count);
-				if (x > 0) {
-					var newPos = GetModel ().WordBackward (x, 0);
-					if (newPos == null) return;
-					if (newPos.Value.col != -1)
-						_cursorPosition = newPos.Value.col;
-					PrepareSelection (x, newPos.Value.col - x);
-				}
-			}
+	void MoveRightExtend ()
+	{
+		if (_cursorPosition < _text.Count) {
+			PrepareSelection (_cursorPosition++, 1);
 		}
+	}
 
-		void MoveRightExtend ()
-		{
-			if (_cursorPosition < _text.Count) {
-				PrepareSelection (_cursorPosition++, 1);
-			}
+	void MoveLeftExtend ()
+	{
+		if (_cursorPosition > 0) {
+			PrepareSelection (_cursorPosition--, -1);
 		}
+	}
 
-		void MoveLeftExtend ()
-		{
-			if (_cursorPosition > 0) {
-				PrepareSelection (_cursorPosition--, -1);
-			}
+	void MoveHome ()
+	{
+		ClearAllSelection ();
+		_cursorPosition = 0;
+		Adjust ();
+	}
+
+	void MoveEndExtend ()
+	{
+		if (_cursorPosition <= _text.Count) {
+			var x = _cursorPosition;
+			_cursorPosition = _text.Count;
+			PrepareSelection (x, _cursorPosition - x);
 		}
+	}
 
-		void MoveHome ()
-		{
-			ClearAllSelection ();
+	void MoveHomeExtend ()
+	{
+		if (_cursorPosition > 0) {
+			var x = _cursorPosition;
 			_cursorPosition = 0;
-			Adjust ();
+			PrepareSelection (x, _cursorPosition - x);
 		}
+	}
 
-		void MoveEndExtend ()
-		{
-			if (_cursorPosition <= _text.Count) {
-				int x = _cursorPosition;
-				_cursorPosition = _text.Count;
-				PrepareSelection (x, _cursorPosition - x);
-			}
+	/// <summary>
+	/// Deletes the character to the left.
+	/// </summary>
+	/// <param name="usePreTextChangedCursorPos">
+	/// If set to <see langword="true">true</see> use the cursor position cached
+	/// ; otherwise use <see cref="CursorPosition"/>.
+	/// use .
+	/// </param>
+	public virtual void DeleteCharLeft (bool usePreTextChangedCursorPos)
+	{
+		if (ReadOnly) {
+			return;
 		}
 
-		void MoveHomeExtend ()
-		{
-			if (_cursorPosition > 0) {
-				int x = _cursorPosition;
-				_cursorPosition = 0;
-				PrepareSelection (x, _cursorPosition - x);
-			}
-		}
+		_historyText.Add (new List<List<RuneCell>> { TextModel.ToRuneCells (_text) }, new Point (_cursorPosition, 0));
 
-		/// <summary>
-		/// Deletes the character to the left.
-		/// </summary>
-		/// <param name="usePreTextChangedCursorPos">If set to <see langword="true">true</see> use the cursor position cached
-		/// ; otherwise use <see cref="CursorPosition"/>.
-		/// use .</param>
-		public virtual void DeleteCharLeft (bool usePreTextChangedCursorPos)
-		{
-			if (ReadOnly)
+		if (SelectedLength == 0) {
+			if (_cursorPosition == 0) {
 				return;
-
-			_historyText.Add (new List<List<RuneCell>> () { TextModel.ToRuneCells (_text) }, new Point (_cursorPosition, 0));
-
-			if (_length == 0) {
-				if (_cursorPosition == 0)
-					return;
-
-				if (!usePreTextChangedCursorPos) {
-					_preTextChangedCursorPos = _cursorPosition;
-				}
-				_cursorPosition--;
-				if (_preTextChangedCursorPos < _text.Count) {
-					SetText (_text.GetRange (0, _preTextChangedCursorPos - 1).Concat (_text.GetRange (_preTextChangedCursorPos, _text.Count - _preTextChangedCursorPos)));
-				} else {
-					SetText (_text.GetRange (0, _preTextChangedCursorPos - 1));
-				}
-				Adjust ();
-			} else {
-				var newText = DeleteSelectedText ();
-				Text = StringExtensions.ToString (newText);
-				Adjust ();
 			}
-		}
-
-		/// <summary>
-		/// Deletes the character to the right.
-		/// </summary>
-		public virtual void DeleteCharRight ()
-		{
-			if (ReadOnly)
-				return;
 
-			_historyText.Add (new List<List<RuneCell>> () { TextModel.ToRuneCells (_text) }, new Point (_cursorPosition, 0));
-
-			if (_length == 0) {
-				if (_text.Count == 0 || _text.Count == _cursorPosition)
-					return;
-
-				SetText (_text.GetRange (0, _cursorPosition).Concat (_text.GetRange (_cursorPosition + 1, _text.Count - (_cursorPosition + 1))));
-				Adjust ();
+			if (!usePreTextChangedCursorPos) {
+				_preTextChangedCursorPos = _cursorPosition;
+			}
+			_cursorPosition--;
+			if (_preTextChangedCursorPos < _text.Count) {
+				SetText (_text.GetRange (0, _preTextChangedCursorPos - 1).Concat (_text.GetRange (_preTextChangedCursorPos, _text.Count - _preTextChangedCursorPos)));
 			} else {
-				var newText = DeleteSelectedText ();
-				Text = StringExtensions.ToString (newText);
-				Adjust ();
+				SetText (_text.GetRange (0, _preTextChangedCursorPos - 1));
 			}
+			Adjust ();
+		} else {
+			var newText = DeleteSelectedText ();
+			Text = StringExtensions.ToString (newText);
+			Adjust ();
 		}
+	}
 
-		void ShowContextMenu ()
-		{
-			if (_currentCulture != Thread.CurrentThread.CurrentUICulture) {
-
-				_currentCulture = Thread.CurrentThread.CurrentUICulture;
-
-				ContextMenu.MenuItems = BuildContextMenuBarItem ();
-			}
-			ContextMenu.Show ();
+	/// <summary>
+	/// Deletes the character to the right.
+	/// </summary>
+	public virtual void DeleteCharRight ()
+	{
+		if (ReadOnly) {
+			return;
 		}
 
-		/// <summary>
-		/// Selects all text.
-		/// </summary>
-		public void SelectAll ()
-		{
-			if (_text.Count == 0) {
+		_historyText.Add (new List<List<RuneCell>> { TextModel.ToRuneCells (_text) }, new Point (_cursorPosition, 0));
+
+		if (SelectedLength == 0) {
+			if (_text.Count == 0 || _text.Count == _cursorPosition) {
 				return;
 			}
 
-			_selectedStart = 0;
-			MoveEndExtend ();
-			SetNeedsDisplay ();
+			SetText (_text.GetRange (0, _cursorPosition).Concat (_text.GetRange (_cursorPosition + 1, _text.Count - (_cursorPosition + 1))));
+			Adjust ();
+		} else {
+			var newText = DeleteSelectedText ();
+			Text = StringExtensions.ToString (newText);
+			Adjust ();
 		}
+	}
 
-		/// <summary>
-		/// Deletes all text.
-		/// </summary>
-		public void DeleteAll ()
-		{
-			if (_text.Count == 0) {
-				return;
-			}
+	void ShowContextMenu ()
+	{
+		if (_currentCulture != Thread.CurrentThread.CurrentUICulture) {
 
-			_selectedStart = 0;
-			MoveEndExtend ();
-			DeleteCharLeft (false);
-			SetNeedsDisplay ();
+			_currentCulture = Thread.CurrentThread.CurrentUICulture;
+
+			ContextMenu.MenuItems = BuildContextMenuBarItem ();
 		}
+		ContextMenu.Show ();
+	}
 
-		/// <summary>
-		/// Start position of the selected text.
-		/// </summary>
-		public int SelectedStart {
-			get => _selectedStart;
-			set {
-				if (value < -1) {
-					_selectedStart = -1;
-				} else if (value > _text.Count) {
-					_selectedStart = _text.Count;
-				} else {
-					_selectedStart = value;
-				}
-				PrepareSelection (_selectedStart, _cursorPosition - _selectedStart);
-			}
+	/// <summary>
+	/// Selects all text.
+	/// </summary>
+	public void SelectAll ()
+	{
+		if (_text.Count == 0) {
+			return;
 		}
 
-		/// <summary>
-		/// Length of the selected text.
-		/// </summary>
-		public int SelectedLength { get => _length; }
+		_selectedStart = 0;
+		MoveEndExtend ();
+		SetNeedsDisplay ();
+	}
 
-		/// <summary>
-		/// The selected text.
-		/// </summary>
-		public string SelectedText {
-			get => Secret ? null : _selectedText;
-			private set => _selectedText = value;
+	/// <summary>
+	/// Deletes all text.
+	/// </summary>
+	public void DeleteAll ()
+	{
+		if (_text.Count == 0) {
+			return;
 		}
 
-		int _start, _length;
-		bool _isButtonPressed;
-		bool _isButtonReleased = true;
+		_selectedStart = 0;
+		MoveEndExtend ();
+		DeleteCharLeft (false);
+		SetNeedsDisplay ();
+	}
 
-		///<inheritdoc/>
-		public override bool MouseEvent (MouseEvent ev)
-		{
-			if (!ev.Flags.HasFlag (MouseFlags.Button1Pressed) && !ev.Flags.HasFlag (MouseFlags.ReportMousePosition) &&
-				!ev.Flags.HasFlag (MouseFlags.Button1Released) && !ev.Flags.HasFlag (MouseFlags.Button1DoubleClicked) &&
-				!ev.Flags.HasFlag (MouseFlags.Button1TripleClicked) && !ev.Flags.HasFlag (ContextMenu.MouseFlags)) {
-				return false;
-			}
+	///<inheritdoc/>
+	public override bool MouseEvent (MouseEvent ev)
+	{
+		if (!ev.Flags.HasFlag (MouseFlags.Button1Pressed) && !ev.Flags.HasFlag (MouseFlags.ReportMousePosition) &&
+		    !ev.Flags.HasFlag (MouseFlags.Button1Released) && !ev.Flags.HasFlag (MouseFlags.Button1DoubleClicked) &&
+		    !ev.Flags.HasFlag (MouseFlags.Button1TripleClicked) && !ev.Flags.HasFlag (ContextMenu.MouseFlags)) {
+			return false;
+		}
 
-			if (!CanFocus) {
-				return true;
-			}
+		if (!CanFocus) {
+			return true;
+		}
 
-			if (!HasFocus && ev.Flags != MouseFlags.ReportMousePosition) {
-				SetFocus ();
-			}
+		if (!HasFocus && ev.Flags != MouseFlags.ReportMousePosition) {
+			SetFocus ();
+		}
 
-			// Give autocomplete first opportunity to respond to mouse clicks
-			if (SelectedLength == 0 && Autocomplete.MouseEvent (ev, true)) {
-				return true;
-			}
+		// Give autocomplete first opportunity to respond to mouse clicks
+		if (SelectedLength == 0 && Autocomplete.MouseEvent (ev, true)) {
+			return true;
+		}
 
-			if (ev.Flags == MouseFlags.Button1Pressed) {
-				EnsureHasFocus ();
-				PositionCursor (ev);
-				if (_isButtonReleased) {
-					ClearAllSelection ();
-				}
-				_isButtonReleased = true;
-				_isButtonPressed = true;
-			} else if (ev.Flags == (MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition) && _isButtonPressed) {
-				int x = PositionCursor (ev);
-				_isButtonReleased = false;
-				PrepareSelection (x);
-				if (Application.MouseGrabView == null) {
-					Application.GrabMouse (this);
-				}
-			} else if (ev.Flags == MouseFlags.Button1Released) {
-				_isButtonReleased = true;
-				_isButtonPressed = false;
-				Application.UngrabMouse ();
-			} else if (ev.Flags == MouseFlags.Button1DoubleClicked) {
-				EnsureHasFocus ();
-				int x = PositionCursor (ev);
-				int sbw = x;
-				if (x == _text.Count || (x > 0 && (char)_text [x - 1].Value != ' ')
-					|| (x > 0 && (char)_text [x].Value == ' ')) {
-
-					var newPosBw = GetModel ().WordBackward (x, 0);
-					if (newPosBw == null) return true;
-					sbw = newPosBw.Value.col;
-				}
-				if (sbw != -1) {
-					x = sbw;
-					PositionCursor (x);
-				}
-				var newPosFw = GetModel ().WordForward (x, 0);
-				if (newPosFw == null) return true;
-				ClearAllSelection ();
-				if (newPosFw.Value.col != -1 && sbw != -1) {
-					_cursorPosition = newPosFw.Value.col;
-				}
-				PrepareSelection (sbw, newPosFw.Value.col - sbw);
-			} else if (ev.Flags == MouseFlags.Button1TripleClicked) {
-				EnsureHasFocus ();
-				PositionCursor (0);
+		if (ev.Flags == MouseFlags.Button1Pressed) {
+			EnsureHasFocus ();
+			PositionCursor (ev);
+			if (_isButtonReleased) {
 				ClearAllSelection ();
-				PrepareSelection (0, _text.Count);
-			} else if (ev.Flags == ContextMenu.MouseFlags) {
-				ShowContextMenu ();
 			}
-
-			SetNeedsDisplay ();
-			return true;
-
-			void EnsureHasFocus ()
-			{
-				if (!HasFocus) {
-					SetFocus ();
+			_isButtonReleased = true;
+			_isButtonPressed = true;
+		} else if (ev.Flags == (MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition) && _isButtonPressed) {
+			var x = PositionCursor (ev);
+			_isButtonReleased = false;
+			PrepareSelection (x);
+			if (Application.MouseGrabView == null) {
+				Application.GrabMouse (this);
+			}
+		} else if (ev.Flags == MouseFlags.Button1Released) {
+			_isButtonReleased = true;
+			_isButtonPressed = false;
+			Application.UngrabMouse ();
+		} else if (ev.Flags == MouseFlags.Button1DoubleClicked) {
+			EnsureHasFocus ();
+			var x = PositionCursor (ev);
+			var sbw = x;
+			if (x == _text.Count || x > 0 && (char)_text [x - 1].Value != ' '
+					     || x > 0 && (char)_text [x].Value == ' ') {
+
+				var newPosBw = GetModel ().WordBackward (x, 0);
+				if (newPosBw == null) {
+					return true;
 				}
+				sbw = newPosBw.Value.col;
 			}
-		}
-
-		int PositionCursor (MouseEvent ev)
-		{
-			// We could also set the cursor position.
-			int x;
-			var pX = TextModel.GetColFromX (_text, _first, ev.X);
-			if (_text.Count == 0) {
-				x = pX - ev.OfX;
-			} else {
-				x = pX;
+			if (sbw != -1) {
+				x = sbw;
+				PositionCursor (x);
 			}
-			return PositionCursor (x, false);
-		}
-
-		int PositionCursor (int x, bool getX = true)
-		{
-			int pX = x;
-			if (getX) {
-				pX = TextModel.GetColFromX (_text, _first, x);
+			var newPosFw = GetModel ().WordForward (x, 0);
+			if (newPosFw == null) {
+				return true;
 			}
-			if (_first + pX > _text.Count) {
-				_cursorPosition = _text.Count;
-			} else if (_first + pX < _first) {
-				_cursorPosition = 0;
-			} else {
-				_cursorPosition = _first + pX;
+			ClearAllSelection ();
+			if (newPosFw.Value.col != -1 && sbw != -1) {
+				_cursorPosition = newPosFw.Value.col;
 			}
-
-			return _cursorPosition;
+			PrepareSelection (sbw, newPosFw.Value.col - sbw);
+		} else if (ev.Flags == MouseFlags.Button1TripleClicked) {
+			EnsureHasFocus ();
+			PositionCursor (0);
+			ClearAllSelection ();
+			PrepareSelection (0, _text.Count);
+		} else if (ev.Flags == ContextMenu.MouseFlags) {
+			ShowContextMenu ();
 		}
 
-		void PrepareSelection (int x, int direction = 0)
+		SetNeedsDisplay ();
+		return true;
+
+		void EnsureHasFocus ()
 		{
-			x = x + _first < -1 ? 0 : x;
-			_selectedStart = _selectedStart == -1 && _text.Count > 0 && x >= 0 && x <= _text.Count ? x : _selectedStart;
-			if (_selectedStart > -1) {
-				_length = Math.Abs (x + direction <= _text.Count ? x + direction - _selectedStart : _text.Count - _selectedStart);
-				SetSelectedStartSelectedLength ();
-				if (_start > -1 && _length > 0) {
-					_selectedText = _length > 0 ? StringExtensions.ToString (_text.GetRange (
-						_start < 0 ? 0 : _start, _length > _text.Count ? _text.Count : _length)) : "";
-					if (_first > _start) {
-						_first = _start;
-					}
-				} else if (_start > -1 && _length == 0) {
-					_selectedText = null;
-				}
-				SetNeedsDisplay ();
-			} else if (_length > 0 || _selectedText != null) {
-				ClearAllSelection ();
+			if (!HasFocus) {
+				SetFocus ();
 			}
-			Adjust ();
 		}
+	}
 
-		/// <summary>
-		/// Clear the selected text.
-		/// </summary>
-		public void ClearAllSelection ()
-		{
-			if (_selectedStart == -1 && _length == 0 && string.IsNullOrEmpty (_selectedText)) {
-				return;
-			}
+	int PositionCursor (MouseEvent ev)
+	{
+		// We could also set the cursor position.
+		int x;
+		var pX = TextModel.GetColFromX (_text, ScrollOffset, ev.X);
+		if (_text.Count == 0) {
+			x = pX - ev.OfX;
+		} else {
+			x = pX;
+		}
+		return PositionCursor (x, false);
+	}
 
-			_selectedStart = -1;
-			_length = 0;
-			_selectedText = null;
-			_start = 0;
-			_length = 0;
-			SetNeedsDisplay ();
+	int PositionCursor (int x, bool getX = true)
+	{
+		var pX = x;
+		if (getX) {
+			pX = TextModel.GetColFromX (_text, ScrollOffset, x);
 		}
-
-		void SetSelectedStartSelectedLength ()
-		{
-			if (SelectedStart > -1 && _cursorPosition < SelectedStart) {
-				_start = _cursorPosition;
-			} else {
-				_start = SelectedStart;
-			}
+		if (ScrollOffset + pX > _text.Count) {
+			_cursorPosition = _text.Count;
+		} else if (ScrollOffset + pX < ScrollOffset) {
+			_cursorPosition = 0;
+		} else {
+			_cursorPosition = ScrollOffset + pX;
 		}
 
-		/// <summary>
-		/// Copy the selected text to the clipboard.
-		/// </summary>
-		public virtual void Copy ()
-		{
-			if (Secret || _length == 0)
-				return;
+		return _cursorPosition;
+	}
 
-			Clipboard.Contents = SelectedText;
+	void PrepareSelection (int x, int direction = 0)
+	{
+		x = x + ScrollOffset < -1 ? 0 : x;
+		_selectedStart = _selectedStart == -1 && _text.Count > 0 && x >= 0 && x <= _text.Count ? x : _selectedStart;
+		if (_selectedStart > -1) {
+			SelectedLength = Math.Abs (x + direction <= _text.Count ? x + direction - _selectedStart : _text.Count - _selectedStart);
+			SetSelectedStartSelectedLength ();
+			if (_start > -1 && SelectedLength > 0) {
+				_selectedText = SelectedLength > 0 ? StringExtensions.ToString (_text.GetRange (
+					_start < 0 ? 0 : _start, SelectedLength > _text.Count ? _text.Count : SelectedLength)) : "";
+				if (ScrollOffset > _start) {
+					ScrollOffset = _start;
+				}
+			} else if (_start > -1 && SelectedLength == 0) {
+				_selectedText = null;
+			}
+			SetNeedsDisplay ();
+		} else if (SelectedLength > 0 || _selectedText != null) {
+			ClearAllSelection ();
 		}
+		Adjust ();
+	}
 
-		/// <summary>
-		/// Cut the selected text to the clipboard.
-		/// </summary>
-		public virtual void Cut ()
-		{
-			if (ReadOnly || Secret || _length == 0)
-				return;
+	/// <summary>
+	/// Clear the selected text.
+	/// </summary>
+	public void ClearAllSelection ()
+	{
+		if (_selectedStart == -1 && SelectedLength == 0 && string.IsNullOrEmpty (_selectedText)) {
+			return;
+		}
+
+		_selectedStart = -1;
+		SelectedLength = 0;
+		_selectedText = null;
+		_start = 0;
+		SelectedLength = 0;
+		SetNeedsDisplay ();
+	}
 
-			Clipboard.Contents = SelectedText;
-			var newText = DeleteSelectedText ();
-			Text = StringExtensions.ToString (newText);
-			Adjust ();
+	void SetSelectedStartSelectedLength ()
+	{
+		if (SelectedStart > -1 && _cursorPosition < SelectedStart) {
+			_start = _cursorPosition;
+		} else {
+			_start = SelectedStart;
 		}
+	}
 
-		List<Rune> DeleteSelectedText ()
-		{
-			SetSelectedStartSelectedLength ();
-			int selStart = SelectedStart > -1 ? _start : _cursorPosition;
-			var newText = StringExtensions.ToString (_text.GetRange (0, selStart)) +
-				 StringExtensions.ToString (_text.GetRange (selStart + _length, _text.Count - (selStart + _length)));
-
-			ClearAllSelection ();
-			_cursorPosition = selStart >= newText.GetRuneCount () ? newText.GetRuneCount () : selStart;
-			return newText.ToRuneList ();
+	/// <summary>
+	/// Copy the selected text to the clipboard.
+	/// </summary>
+	public virtual void Copy ()
+	{
+		if (Secret || SelectedLength == 0) {
+			return;
 		}
 
-		/// <summary>
-		/// Paste the selected text from the clipboard.
-		/// </summary>
-		public virtual void Paste ()
-		{
-			if (ReadOnly || string.IsNullOrEmpty (Clipboard.Contents)) {
-				return;
-			}
-
-			SetSelectedStartSelectedLength ();
-			int selStart = _start == -1 ? CursorPosition : _start;
-			string cbTxt = Clipboard.Contents.Split ("\n") [0] ?? "";
-			Text = StringExtensions.ToString (_text.GetRange (0, selStart)) +
-				cbTxt +
-				StringExtensions.ToString (_text.GetRange (selStart + _length, _text.Count - (selStart + _length)));
+		Clipboard.Contents = SelectedText;
+	}
 
-			_cursorPosition = selStart + cbTxt.GetRuneCount ();
-			ClearAllSelection ();
-			SetNeedsDisplay ();
-			Adjust ();
+	/// <summary>
+	/// Cut the selected text to the clipboard.
+	/// </summary>
+	public virtual void Cut ()
+	{
+		if (ReadOnly || Secret || SelectedLength == 0) {
+			return;
 		}
 
-		/// <summary>
-		/// Virtual method that invoke the <see cref="TextChanging"/> event if it's defined.
-		/// </summary>
-		/// <param name="newText">The new text to be replaced.</param>
-		/// <returns>Returns the <see cref="TextChangingEventArgs"/></returns>
-		public virtual TextChangingEventArgs OnTextChanging (string newText)
-		{
-			var ev = new TextChangingEventArgs (newText);
-			TextChanging?.Invoke (this, ev);
-			return ev;
-		}
+		Clipboard.Contents = SelectedText;
+		var newText = DeleteSelectedText ();
+		Text = StringExtensions.ToString (newText);
+		Adjust ();
+	}
 
-		CursorVisibility _desiredCursorVisibility = CursorVisibility.Default;
+	List<Rune> DeleteSelectedText ()
+	{
+		SetSelectedStartSelectedLength ();
+		var selStart = SelectedStart > -1 ? _start : _cursorPosition;
+		var newText = StringExtensions.ToString (_text.GetRange (0, selStart)) +
+			      StringExtensions.ToString (_text.GetRange (selStart + SelectedLength, _text.Count - (selStart + SelectedLength)));
 
-		/// <summary>
-		/// Get / Set the wished cursor when the field is focused
-		/// </summary>
-		public CursorVisibility DesiredCursorVisibility {
-			get => _desiredCursorVisibility;
-			set {
-				if ((_desiredCursorVisibility != value || _visibility != value) && HasFocus) {
-					Application.Driver.SetCursorVisibility (value);
-				}
+		ClearAllSelection ();
+		_cursorPosition = selStart >= newText.GetRuneCount () ? newText.GetRuneCount () : selStart;
+		return newText.ToRuneList ();
+	}
 
-				_desiredCursorVisibility = _visibility = value;
-			}
-		}
+	/// <summary>
+	/// Paste the selected text from the clipboard.
+	/// </summary>
+	public virtual void Paste ()
+	{
+		if (ReadOnly || string.IsNullOrEmpty (Clipboard.Contents)) {
+			return;
+		}
+
+		SetSelectedStartSelectedLength ();
+		var selStart = _start == -1 ? CursorPosition : _start;
+		var cbTxt = Clipboard.Contents.Split ("\n") [0] ?? "";
+		Text = StringExtensions.ToString (_text.GetRange (0, selStart)) +
+		       cbTxt +
+		       StringExtensions.ToString (_text.GetRange (selStart + SelectedLength, _text.Count - (selStart + SelectedLength)));
+
+		_cursorPosition = selStart + cbTxt.GetRuneCount ();
+		ClearAllSelection ();
+		SetNeedsDisplay ();
+		Adjust ();
+	}
 
-		/// <summary>
-		/// Inserts the given <paramref name="toAdd"/> text at the current cursor position
-		/// exactly as if the user had just typed it
-		/// </summary>
-		/// <param name="toAdd">Text to add</param>
-		/// <param name="useOldCursorPos">Use the previous cursor position.</param>
-		public void InsertText (string toAdd, bool useOldCursorPos = true)
-		{
-			foreach (var ch in toAdd) {
+	/// <summary>
+	/// Virtual method that invoke the <see cref="TextChanging"/> event if it's defined.
+	/// </summary>
+	/// <param name="newText">The new text to be replaced.</param>
+	/// <returns>Returns the <see cref="TextChangingEventArgs"/></returns>
+	public virtual TextChangingEventArgs OnTextChanging (string newText)
+	{
+		var ev = new TextChangingEventArgs (newText);
+		TextChanging?.Invoke (this, ev);
+		return ev;
+	}
 
-				KeyCode key;
+	/// <summary>
+	/// Inserts the given <paramref name="toAdd"/> text at the current cursor position
+	/// exactly as if the user had just typed it
+	/// </summary>
+	/// <param name="toAdd">Text to add</param>
+	/// <param name="useOldCursorPos">Use the previous cursor position.</param>
+	public void InsertText (string toAdd, bool useOldCursorPos = true)
+	{
+		foreach (var ch in toAdd) {
 
-				try {
-					key = (KeyCode)ch;
-				} catch (Exception) {
+			KeyCode key;
 
-					throw new ArgumentException ($"Cannot insert character '{ch}' because it does not map to a Key");
-				}
+			try {
+				key = (KeyCode)ch;
+			} catch (Exception) {
 
-				InsertText (new Key () { KeyCode = key }, useOldCursorPos);
+				throw new ArgumentException ($"Cannot insert character '{ch}' because it does not map to a Key");
 			}
-		}
 
-		/// <summary>
-		/// Allows clearing the <see cref="HistoryText.HistoryTextItem"/> items updating the original text.
-		/// </summary>
-		public void ClearHistoryChanges ()
-		{
-			_historyText.Clear (Text);
+			InsertText (new Key { KeyCode = key }, useOldCursorPos);
 		}
+	}
 
-		/// <summary>
-		/// Returns <see langword="true"/> if the current cursor position is
-		/// at the end of the <see cref="Text"/>. This includes when it is empty.
-		/// </summary>
-		/// <returns></returns>
-		internal bool CursorIsAtEnd ()
-		{
-			return CursorPosition == Text.Length;
-		}
+	/// <summary>
+	/// Allows clearing the <see cref="HistoryText.HistoryTextItem"/> items updating the original text.
+	/// </summary>
+	public void ClearHistoryChanges () => _historyText.Clear (Text);
 
-		/// <summary>
-		/// Returns <see langword="true"/> if the current cursor position is
-		/// at the start of the <see cref="TextField"/>.
-		/// </summary>
-		/// <returns></returns>
-		internal bool CursorIsAtStart ()
-		{
-			return CursorPosition <= 0;
-		}
-	}
 	/// <summary>
-	/// Renders an overlay on another view at a given point that allows selecting
-	/// from a range of 'autocomplete' options.
-	/// An implementation on a TextField.
+	/// Returns <see langword="true"/> if the current cursor position is
+	/// at the end of the <see cref="Text"/>. This includes when it is empty.
 	/// </summary>
-	public class TextFieldAutocomplete : PopupAutocomplete {
+	/// <returns></returns>
+	internal bool CursorIsAtEnd () => CursorPosition == Text.Length;
 
-		/// <inheritdoc/>
-		protected override void DeleteTextBackwards ()
-		{
-			((TextField)HostControl).DeleteCharLeft (false);
-		}
+	/// <summary>
+	/// Returns <see langword="true"/> if the current cursor position is
+	/// at the start of the <see cref="TextField"/>.
+	/// </summary>
+	/// <returns></returns>
+	internal bool CursorIsAtStart () => CursorPosition <= 0;
+}
 
-		/// <inheritdoc/>
-		protected override void InsertText (string accepted)
-		{
-			((TextField)HostControl).InsertText (accepted, false);
-		}
+/// <summary>
+/// Renders an overlay on another view at a given point that allows selecting
+/// from a range of 'autocomplete' options.
+/// An implementation on a TextField.
+/// </summary>
+public class TextFieldAutocomplete : PopupAutocomplete {
 
-		/// <inheritdoc/>
-		protected override void SetCursorPosition (int column)
-		{
-			((TextField)HostControl).CursorPosition = column;
-		}
-	}
+	/// <inheritdoc/>
+	protected override void DeleteTextBackwards () => ((TextField)HostControl).DeleteCharLeft (false);
+
+	/// <inheritdoc/>
+	protected override void InsertText (string accepted) => ((TextField)HostControl).InsertText (accepted, false);
+
+	/// <inheritdoc/>
+	protected override void SetCursorPosition (int column) => ((TextField)HostControl).CursorPosition = column;
 }

Terminal.Gui/Views/Toplevel.cs

@@ -1,88 +1,171 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 
-namespace Terminal.Gui; 
+namespace Terminal.Gui;
 
 /// <summary>
-/// Toplevel views can be modally executed. They are used for both an application's main view (filling the entire screeN and
-/// for pop-up views such as <see cref="Dialog"/>, <see cref="MessageBox"/>, and <see cref="Wizard"/>.
+/// Toplevel views are used for both an application's main view (filling the entire screen and
+/// for modal (pop-up) views such as <see cref="Dialog"/>, <see cref="MessageBox"/>, and
+/// <see cref="Wizard"/>).
 /// </summary>
 /// <remarks>
-///   <para>
-///     Toplevels can be modally executing views, started by calling <see cref="Application.Run(Toplevel, Func{Exception, bool})"/>. 
-///     They return control to the caller when <see cref="Application.RequestStop(Toplevel)"/> has 
-///     been called (which sets the <see cref="Toplevel.Running"/> property to <c>false</c>). 
-///   </para>
-///   <para>
-///     A Toplevel is created when an application initializes Terminal.Gui by calling <see cref="Application.Init"/>.
-///     The application Toplevel can be accessed via <see cref="Application.Top"/>. Additional Toplevels can be created 
-///     and run (e.g. <see cref="Dialog"/>s. To run a Toplevel, create the <see cref="Toplevel"/> and 
-///     call <see cref="Application.Run(Toplevel, Func{Exception, bool})"/>.
-///   </para>
+///         <para>
+///         Toplevels can run as modal (popup) views, started by calling
+///         <see cref="Application.Run(Toplevel, Func{Exception,bool})"/>.
+///         They return control to the caller when <see cref="Application.RequestStop(Toplevel)"/> has
+///         been called (which sets the <see cref="Toplevel.Running"/> property to <c>false</c>).
+///         </para>
+///         <para>
+///         A Toplevel is created when an application initializes Terminal.Gui by calling
+///         <see cref="Application.Init"/>.
+///         The application Toplevel can be accessed via <see cref="Application.Top"/>. Additional
+///         Toplevels can be created
+///         and run (e.g. <see cref="Dialog"/>s. To run a Toplevel, create the <see cref="Toplevel"/> and
+///         call <see cref="Application.Run(Toplevel, Func{Exception,bool})"/>.
+///         </para>
 /// </remarks>
 public partial class Toplevel : View {
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Toplevel"/> class with the specified
+	/// <see cref="LayoutStyle.Absolute"/> layout.
+	/// </summary>
+	/// <param name="frame">
+	/// A Superview-relative rectangle specifying the location and size for the new
+	/// Toplevel
+	/// </param>
+	public Toplevel (Rect frame) : base (frame) => SetInitialProperties ();
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Toplevel"/> class with
+	/// <see cref="LayoutStyle.Computed"/> layout, defaulting to full screen. The <see cref="View.Width"/> and
+	/// <see cref="View.Height"/> properties
+	/// will be set to the dimensions of the terminal using <see cref="Dim.Fill"/>.
+	/// </summary>
+	public Toplevel ()
+	{
+		SetInitialProperties ();
+		Width = Dim.Fill ();
+		Height = Dim.Fill ();
+	}
+
 	/// <summary>
-	/// Gets or sets whether the main loop for this <see cref="Toplevel"/> is running or not. 
+	/// Gets or sets whether the main loop for this <see cref="Toplevel"/> is running or not.
 	/// </summary>
 	/// <remarks>
-	///    Setting this property directly is discouraged. Use <see cref="Application.RequestStop"/> instead. 
+	/// Setting this property directly is discouraged. Use <see cref="Application.RequestStop"/>
+	/// instead.
 	/// </remarks>
 	public bool Running { get; set; }
 
+	/// <summary>
+	/// Gets or sets a value indicating whether this <see cref="Toplevel"/> can focus.
+	/// </summary>
+	/// <value><c>true</c> if can focus; otherwise, <c>false</c>.</value>
+	public override bool CanFocus => SuperView == null ? true : base.CanFocus;
+
+	/// <summary>
+	/// Determines whether the <see cref="Toplevel"/> is modal or not.
+	/// If set to <c>false</c> (the default):
+	/// <list type="bullet">
+	///         <item>
+	///                 <description><see cref="View.OnKeyDown"/> events will propagate keys upwards.</description>
+	///         </item>
+	///         <item>
+	///                 <description>The Toplevel will act as an embedded view (not a modal/pop-up).</description>
+	///         </item>
+	/// </list>
+	/// If set to <c>true</c>:
+	/// <list type="bullet">
+	///         <item>
+	///                 <description><see cref="View.OnKeyDown"/> events will NOT propagate keys upwards.</description>
+	///         </item>
+	///         <item>
+	///                 <description>
+	///                 The Toplevel will and look like a modal (pop-up) (e.g. see
+	///                 <see cref="Dialog"/>.
+	///                 </description>
+	///         </item>
+	/// </list>
+	/// </summary>
+	public bool Modal { get; set; }
+
+	/// <summary>
+	/// Gets or sets the menu for this Toplevel.
+	/// </summary>
+	public virtual MenuBar MenuBar { get; set; }
+
+	/// <summary>
+	/// Gets or sets the status bar for this Toplevel.
+	/// </summary>
+	public virtual StatusBar StatusBar { get; set; }
+
+	/// <summary>
+	/// <see langword="true"/> if was already loaded by the <see cref="Application.Begin(Toplevel)"/>
+	/// <see langword="false"/>, otherwise.
+	/// </summary>
+	public bool IsLoaded { get; private set; }
+
 	/// <summary>
 	/// Invoked when the <see cref="Toplevel"/> <see cref="RunState"/> has begun to be loaded.
-	/// A Loaded event handler is a good place to finalize initialization before calling 
+	/// A Loaded event handler is a good place to finalize initialization before calling
 	/// <see cref="Application.RunLoop(RunState)"/>.
 	/// </summary>
 	public event EventHandler Loaded;
 
 	/// <summary>
 	/// Invoked when the <see cref="Toplevel"/> main loop has started it's first iteration.
-	/// Subscribe to this event to perform tasks when the <see cref="Toplevel"/> has been laid out and focus has been set.
-	/// changes. 
-	/// <para>A Ready event handler is a good place to finalize initialization after calling 
-	/// <see cref="Application.Run(Func{Exception, bool})"/> on this <see cref="Toplevel"/>.</para>
+	/// Subscribe to this event to perform tasks when the <see cref="Toplevel"/> has been laid out and
+	/// focus has been set.
+	/// changes.
+	/// <para>
+	/// A Ready event handler is a good place to finalize initialization after calling
+	/// <see cref="Application.Run(Func{Exception, bool})"/> on this <see cref="Toplevel"/>.
+	/// </para>
 	/// </summary>
 	public event EventHandler Ready;
 
 	/// <summary>
 	/// Invoked when the Toplevel <see cref="RunState"/> has been unloaded.
-	/// A Unloaded event handler is a good place to dispose objects after calling <see cref="Application.End(RunState)"/>.
+	/// A Unloaded event handler is a good place to dispose objects after calling
+	/// <see cref="Application.End(RunState)"/>.
 	/// </summary>
 	public event EventHandler Unloaded;
 
 	/// <summary>
-	/// Invoked when the Toplevel <see cref="RunState"/> becomes the <see cref="Application.Current"/> Toplevel.
+	/// Invoked when the Toplevel <see cref="RunState"/> becomes the <see cref="Application.Current"/>
+	/// Toplevel.
 	/// </summary>
 	public event EventHandler<ToplevelEventArgs> Activate;
 
 	/// <summary>
-	/// Invoked when the Toplevel<see cref="RunState"/> ceases to be the <see cref="Application.Current"/> Toplevel.
+	/// Invoked when the Toplevel<see cref="RunState"/> ceases to be the <see cref="Application.Current"/>
+	/// Toplevel.
 	/// </summary>
 	public event EventHandler<ToplevelEventArgs> Deactivate;
 
 	/// <summary>
-	/// Invoked when a child of the Toplevel <see cref="RunState"/> is closed by  
+	/// Invoked when a child of the Toplevel <see cref="RunState"/> is closed by
 	/// <see cref="Application.End(RunState)"/>.
 	/// </summary>
 	public event EventHandler<ToplevelEventArgs> ChildClosed;
 
 	/// <summary>
-	/// Invoked when the last child of the Toplevel <see cref="RunState"/> is closed from 
+	/// Invoked when the last child of the Toplevel <see cref="RunState"/> is closed from
 	/// by <see cref="Application.End(RunState)"/>.
 	/// </summary>
 	public event EventHandler AllChildClosed;
 
 	/// <summary>
-	/// Invoked when the Toplevel's <see cref="RunState"/> is being closed by  
+	/// Invoked when the Toplevel's <see cref="RunState"/> is being closed by
 	/// <see cref="Application.RequestStop(Toplevel)"/>.
 	/// </summary>
 	public event EventHandler<ToplevelClosingEventArgs> Closing;
 
 	/// <summary>
-	/// Invoked when the Toplevel's <see cref="RunState"/> is closed by <see cref="Application.End(RunState)"/>.
+	/// Invoked when the Toplevel's <see cref="RunState"/> is closed by
+	/// <see cref="Application.End(RunState)"/>.
 	/// </summary>
 	public event EventHandler<ToplevelEventArgs> Closed;
 
@@ -131,7 +214,8 @@ public partial class Toplevel : View {
 	internal virtual void OnActivate (Toplevel deactivated) => Activate?.Invoke (this, new ToplevelEventArgs (deactivated));
 
 	/// <summary>
-	/// Called from <see cref="Application.Begin(Toplevel)"/> before the <see cref="Toplevel"/> redraws for the first time. 
+	/// Called from <see cref="Application.Begin(Toplevel)"/> before the <see cref="Toplevel"/> redraws for
+	/// the first time.
 	/// </summary>
 	public virtual void OnLoaded ()
 	{
@@ -143,7 +227,7 @@ public partial class Toplevel : View {
 	}
 
 	/// <summary>
-	/// Called from <see cref="Application.RunLoop"/> after the <see cref="Toplevel"/> has entered the 
+	/// Called from <see cref="Application.RunLoop"/> after the <see cref="Toplevel"/> has entered the
 	/// first iteration of the loop.
 	/// </summary>
 	internal virtual void OnReady ()
@@ -165,23 +249,6 @@ public partial class Toplevel : View {
 		Unloaded?.Invoke (this, EventArgs.Empty);
 	}
 
-	/// <summary>
-	/// Initializes a new instance of the <see cref="Toplevel"/> class with the specified <see cref="LayoutStyle.Absolute"/> layout.
-	/// </summary>
-	/// <param name="frame">A Superview-relative rectangle specifying the location and size for the new Toplevel</param>
-	public Toplevel (Rect frame) : base (frame) => SetInitialProperties ();
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="Toplevel"/> class with <see cref="LayoutStyle.Computed"/> layout, 
-	/// defaulting to full screen.
-	/// </summary>
-	public Toplevel () : base ()
-	{
-		SetInitialProperties ();
-		Width = Dim.Fill ();
-		Height = Dim.Fill ();
-	}
-
 	void SetInitialProperties ()
 	{
 		ColorScheme = Colors.TopLevel;
@@ -251,20 +318,6 @@ public partial class Toplevel : View {
 #endif
 	}
 
-	void Application_UnGrabbingMouse (object sender, GrabMouseEventArgs e)
-	{
-		if (Application.MouseGrabView == this && _dragPosition.HasValue) {
-			e.Cancel = true;
-		}
-	}
-
-	void Application_GrabbingMouse (object sender, GrabMouseEventArgs e)
-	{
-		if (Application.MouseGrabView == this && _dragPosition.HasValue) {
-			e.Cancel = true;
-		}
-	}
-
 	/// <summary>
 	/// Invoked when the <see cref="Application.AlternateForwardKey"/> is changed.
 	/// </summary>
@@ -310,60 +363,6 @@ public partial class Toplevel : View {
 		QuitKeyChanged?.Invoke (this, e);
 	}
 
-	/// <summary>
-	/// Convenience factory method that creates a new Toplevel with the current terminal dimensions.
-	/// </summary>
-	/// <returns>The created Toplevel.</returns>
-	public static Toplevel Create () => new Toplevel (new Rect (0, 0, Driver.Cols, Driver.Rows));
-
-	/// <summary>
-	/// Gets or sets a value indicating whether this <see cref="Toplevel"/> can focus.
-	/// </summary>
-	/// <value><c>true</c> if can focus; otherwise, <c>false</c>.</value>
-	public override bool CanFocus => SuperView == null ? true : base.CanFocus;
-
-	/// <summary>
-	/// Determines whether the <see cref="Toplevel"/> is modal or not. 
-	/// If set to <c>false</c> (the default):
-	/// 
-	/// <list type="bullet">
-	///   <item>
-	///		<description><see cref="View.OnKeyDown"/> events will propagate keys upwards.</description>
-	///   </item>
-	///   <item>
-	///		<description>The Toplevel will act as an embedded view (not a modal/pop-up).</description>
-	///   </item>
-	/// </list>
-	///
-	/// If set to <c>true</c>:
-	/// 
-	/// <list type="bullet">
-	///   <item>
-	///		<description><see cref="View.OnKeyDown"/> events will NOT propagate keys upwards.</description>
-	///	  </item>
-	///   <item>
-	///		<description>The Toplevel will and look like a modal (pop-up) (e.g. see <see cref="Dialog"/>.</description>
-	///   </item>
-	/// </list>
-	/// </summary>
-	public bool Modal { get; set; }
-
-	/// <summary>
-	/// Gets or sets the menu for this Toplevel.
-	/// </summary>
-	public virtual MenuBar MenuBar { get; set; }
-
-	/// <summary>
-	/// Gets or sets the status bar for this Toplevel.
-	/// </summary>
-	public virtual StatusBar StatusBar { get; set; }
-
-	/// <summary>
-	/// <see langword="true"/> if was already loaded by the <see cref="Application.Begin(Toplevel)"/>
-	/// <see langword="false"/>, otherwise.
-	/// </summary>
-	public bool IsLoaded { get; private set; }
-
 	void MovePreviousViewOrTop ()
 	{
 		if (Application.OverlappedTop == null) {
@@ -647,9 +646,10 @@ public partial class Toplevel : View {
 		if (superView.Margin != null && superView == top.SuperView) {
 			maxWidth -= superView.GetFramesThickness ().Left + superView.GetFramesThickness ().Right;
 		}
-		if ((superView != top || top?.SuperView != null || top != Application.Top && top.Modal
-			|| top?.SuperView == null && top.IsOverlapped)
-		&& (top.Frame.X + top.Frame.Width > maxWidth || ny > top.Frame.Y) && top.LayoutStyle == LayoutStyle.Computed) {
+		if ((superView != top || top?.SuperView != null || top != Application.Top && top.Modal || top?.SuperView == null && top.IsOverlapped)
+		    // BUGBUG: Prevously PositionToplevel required LayotuStyle.Computed
+		    &&
+		    (top.Frame.X + top.Frame.Width > maxWidth || ny > top.Frame.Y) /*&& top.LayoutStyle == LayoutStyle.Computed*/) {
 
 			if ((top.X == null || top.X is Pos.PosAbsolute) && top.Frame.X != nx) {
 				top.X = nx;
@@ -662,8 +662,7 @@ public partial class Toplevel : View {
 		}
 
 		// TODO: v2 - This is a hack to get the StatusBar to be positioned correctly.
-		if (sb != null && !top.Subviews.Contains (sb) && ny + top.Frame.Height != superView.Frame.Height - (sb.Visible ? 1 : 0)
-		&& top.Height is Dim.DimFill && -top.Height.Anchor (0) < 1) {
+		if (sb != null && !top.Subviews.Contains (sb) && ny + top.Frame.Height != superView.Frame.Height - (sb.Visible ? 1 : 0) && top.Height is Dim.DimFill && -top.Height.Anchor (0) < 1) {
 
 			top.Height = Dim.Fill (sb.Visible ? 1 : 0);
 			layoutSubviews = true;
@@ -734,6 +733,20 @@ public partial class Toplevel : View {
 	internal static Point? _dragPosition;
 	Point _startGrabPoint;
 
+	void Application_UnGrabbingMouse (object sender, GrabMouseEventArgs e)
+	{
+		if (Application.MouseGrabView == this && _dragPosition.HasValue) {
+			e.Cancel = true;
+		}
+	}
+
+	void Application_GrabbingMouse (object sender, GrabMouseEventArgs e)
+	{
+		if (Application.MouseGrabView == this && _dragPosition.HasValue) {
+			e.Cancel = true;
+		}
+	}
+
 	///<inheritdoc/>
 	public override bool MouseEvent (MouseEvent mouseEvent)
 	{
@@ -910,9 +923,8 @@ public class ToplevelEqualityComparer : IEqualityComparer<Toplevel> {
 			return false;
 		} else if (x.Id == y.Id) {
 			return true;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	/// <summary>Returns a hash code for the specified object.</summary>
@@ -949,12 +961,13 @@ public sealed class ToplevelComparer : IComparer<Toplevel> {
 	{
 		if (ReferenceEquals (x, y)) {
 			return 0;
-		} else if (x == null) {
+		}
+		if (x == null) {
 			return -1;
-		} else if (y == null) {
+		}
+		if (y == null) {
 			return 1;
-		} else {
-			return string.Compare (x.Id, y.Id);
 		}
+		return string.Compare (x.Id, y.Id);
 	}
 }

Terminal.Gui/Views/ToplevelOverlapped.cs

@@ -1,226 +1,180 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 
-namespace Terminal.Gui {
-	public partial class Toplevel {
-		/// <summary>
-		/// Gets or sets if this Toplevel is a container for overlapped children.
-		/// </summary>
-		public bool IsOverlappedContainer { get; set; }
-
-		/// <summary>
-		/// Gets or sets if this Toplevel is in overlapped mode within a Toplevel container.
-		/// </summary>
-		public bool IsOverlapped {
-			get {
-				return Application.OverlappedTop != null && Application.OverlappedTop != this && !Modal;
-			}
-		}
-
-	}
+namespace Terminal.Gui;
 
-	public static partial class Application {
-
-		/// <summary>
-		/// Gets the list of the Overlapped children which are not modal <see cref="Toplevel"/> from the <see cref="OverlappedTop"/>.
-		/// </summary>
-		public static List<Toplevel> OverlappedChildren {
-			get {
-				if (OverlappedTop != null) {
-					List<Toplevel> _overlappedChildren = new List<Toplevel> ();
-					foreach (var top in _topLevels) {
-						if (top != OverlappedTop && !top.Modal) {
-							_overlappedChildren.Add (top);
-						}
-					}
-					return _overlappedChildren;
-				}
-				return null;
-			}
-		}
-
-		/// <summary>
-		/// The <see cref="Toplevel"/> object used for the application on startup which <see cref="Toplevel.IsOverlappedContainer"/> is true.
-		/// </summary>
-		public static Toplevel OverlappedTop {
-			get {
-				if (Top.IsOverlappedContainer) {
-					return Top;
-				}
-				return null;
-			}
-		}
-
-
-		static View FindDeepestOverlappedView (View start, int x, int y, out int resx, out int resy)
-		{
-			if (start.GetType ().BaseType != typeof (Toplevel)
-				&& !((Toplevel)start).IsOverlappedContainer) {
-				resx = 0;
-				resy = 0;
-				return null;
-			}
+public partial class Toplevel {
+	/// <summary>
+	/// Gets or sets if this Toplevel is a container for overlapped children.
+	/// </summary>
+	public bool IsOverlappedContainer { get; set; }
 
-			var startFrame = start.Frame;
-
-			if (!startFrame.Contains (x, y)) {
-				resx = 0;
-				resy = 0;
-				return null;
-			}
+	/// <summary>
+	/// Gets or sets if this Toplevel is in overlapped mode within a Toplevel container.
+	/// </summary>
+	public bool IsOverlapped => Application.OverlappedTop != null && Application.OverlappedTop != this && !Modal;
+}
 
-			int count = _topLevels.Count;
-			for (int i = count - 1; i >= 0; i--) {
+public static partial class Application {
+	/// <summary>
+	/// Gets the list of the Overlapped children which are not modal <see cref="Toplevel"/> from the
+	/// <see cref="OverlappedTop"/>.
+	/// </summary>
+	public static List<Toplevel> OverlappedChildren {
+		get {
+			if (OverlappedTop != null) {
+				var _overlappedChildren = new List<Toplevel> ();
 				foreach (var top in _topLevels) {
-					var rx = x - startFrame.X;
-					var ry = y - startFrame.Y;
-					if (top.Visible && top.Frame.Contains (rx, ry)) {
-						var deep = View.FindDeepestView (top, rx, ry, out resx, out resy);
-						if (deep == null)
-							return FindDeepestOverlappedView (top, rx, ry, out resx, out resy);
-						if (deep != OverlappedTop)
-							return deep;
+					if (top != OverlappedTop && !top.Modal) {
+						_overlappedChildren.Add (top);
 					}
 				}
+				return _overlappedChildren;
 			}
-			resx = x - startFrame.X;
-			resy = y - startFrame.Y;
-			return start;
+			return null;
 		}
+	}
 
-		static bool OverlappedChildNeedsDisplay ()
-		{
-			if (OverlappedTop == null) {
-				return false;
+	/// <summary>
+	/// The <see cref="Toplevel"/> object used for the application on startup which
+	/// <see cref="Toplevel.IsOverlappedContainer"/> is true.
+	/// </summary>
+	public static Toplevel OverlappedTop {
+		get {
+			if (Top.IsOverlappedContainer) {
+				return Top;
 			}
+			return null;
+		}
+	}
 
-			foreach (var top in _topLevels) {
-				if (top != Current && top.Visible && (top.NeedsDisplay || top.SubViewNeedsDisplay || top.LayoutNeeded)) {
-					OverlappedTop.SetSubViewNeedsDisplay ();
-					return true;
-				}
-			}
+	static bool OverlappedChildNeedsDisplay ()
+	{
+		if (OverlappedTop == null) {
 			return false;
 		}
 
-
-		static bool SetCurrentOverlappedAsTop ()
-		{
-			if (OverlappedTop == null && Current != Top && Current?.SuperView == null && Current?.Modal == false) {
-				if (Current.Frame != new Rect (0, 0, Driver.Cols, Driver.Rows)) {
-					Current.Frame = new Rect (0, 0, Driver.Cols, Driver.Rows);
-				}
-				Top = Current;
+		foreach (var top in _topLevels) {
+			if (top != Current && top.Visible && (top.NeedsDisplay || top.SubViewNeedsDisplay || top.LayoutNeeded)) {
+				OverlappedTop.SetSubViewNeedsDisplay ();
 				return true;
 			}
-			return false;
 		}
+		return false;
+	}
 
-		/// <summary>
-		/// Move to the next Overlapped child from the <see cref="OverlappedTop"/>.
-		/// </summary>
-		public static void OverlappedMoveNext ()
-		{
-			if (OverlappedTop != null && !Current.Modal) {
-				lock (_topLevels) {
-					_topLevels.MoveNext ();
-					var isOverlapped = false;
-					while (_topLevels.Peek () == OverlappedTop || !_topLevels.Peek ().Visible) {
-						if (!isOverlapped && _topLevels.Peek () == OverlappedTop) {
-							isOverlapped = true;
-						} else if (isOverlapped && _topLevels.Peek () == OverlappedTop) {
-							MoveCurrent (Top);
-							break;
-						}
-						_topLevels.MoveNext ();
+
+	static bool SetCurrentOverlappedAsTop ()
+	{
+		if (OverlappedTop == null && Current != Top && Current?.SuperView == null && Current?.Modal == false) {
+			Top = Current;
+			return true;
+		}
+		return false;
+	}
+
+	/// <summary>
+	/// Move to the next Overlapped child from the <see cref="OverlappedTop"/>.
+	/// </summary>
+	public static void OverlappedMoveNext ()
+	{
+		if (OverlappedTop != null && !Current.Modal) {
+			lock (_topLevels) {
+				_topLevels.MoveNext ();
+				var isOverlapped = false;
+				while (_topLevels.Peek () == OverlappedTop || !_topLevels.Peek ().Visible) {
+					if (!isOverlapped && _topLevels.Peek () == OverlappedTop) {
+						isOverlapped = true;
+					} else if (isOverlapped && _topLevels.Peek () == OverlappedTop) {
+						MoveCurrent (Top);
+						break;
 					}
-					Current = _topLevels.Peek ();
+					_topLevels.MoveNext ();
 				}
+				Current = _topLevels.Peek ();
 			}
 		}
+	}
 
-		/// <summary>
-		/// Move to the previous Overlapped child from the <see cref="OverlappedTop"/>.
-		/// </summary>
-		public static void OverlappedMovePrevious ()
-		{
-			if (OverlappedTop != null && !Current.Modal) {
-				lock (_topLevels) {
-					_topLevels.MovePrevious ();
-					var isOverlapped = false;
-					while (_topLevels.Peek () == OverlappedTop || !_topLevels.Peek ().Visible) {
-						if (!isOverlapped && _topLevels.Peek () == OverlappedTop) {
-							isOverlapped = true;
-						} else if (isOverlapped && _topLevels.Peek () == OverlappedTop) {
-							MoveCurrent (Top);
-							break;
-						}
-						_topLevels.MovePrevious ();
+	/// <summary>
+	/// Move to the previous Overlapped child from the <see cref="OverlappedTop"/>.
+	/// </summary>
+	public static void OverlappedMovePrevious ()
+	{
+		if (OverlappedTop != null && !Current.Modal) {
+			lock (_topLevels) {
+				_topLevels.MovePrevious ();
+				var isOverlapped = false;
+				while (_topLevels.Peek () == OverlappedTop || !_topLevels.Peek ().Visible) {
+					if (!isOverlapped && _topLevels.Peek () == OverlappedTop) {
+						isOverlapped = true;
+					} else if (isOverlapped && _topLevels.Peek () == OverlappedTop) {
+						MoveCurrent (Top);
+						break;
 					}
-					Current = _topLevels.Peek ();
+					_topLevels.MovePrevious ();
 				}
+				Current = _topLevels.Peek ();
 			}
 		}
+	}
 
-		/// <summary>
-		/// Move to the next Overlapped child from the <see cref="OverlappedTop"/> and set it as the <see cref="Top"/> if it is not already.
-		/// </summary>
-		/// <param name="top"></param>
-		/// <returns></returns>
-		public static bool MoveToOverlappedChild (Toplevel top)
-		{
-			if (top.Visible && OverlappedTop != null && Current?.Modal == false) {
-				lock (_topLevels) {
-					_topLevels.MoveTo (top, 0, new ToplevelEqualityComparer ());
-					Current = top;
-				}
-				return true;
-			}
-			return false;
+	/// <summary>
+	/// Move to the next Overlapped child from the <see cref="OverlappedTop"/> and set it as the
+	/// <see cref="Top"/> if it is not already.
+	/// </summary>
+	/// <param name="top"></param>
+	/// <returns></returns>
+	public static bool MoveToOverlappedChild (Toplevel top)
+	{
+		if (top.Visible && OverlappedTop != null && Current?.Modal == false) {
+			lock (_topLevels) {
+				_topLevels.MoveTo (top, 0, new ToplevelEqualityComparer ());
+				Current = top;
+			}
+			return true;
 		}
+		return false;
+	}
 
 
-		/// <summary>
-		/// Brings the superview of the most focused overlapped view is on front.
-		/// </summary>
-		public static void BringOverlappedTopToFront ()
-		{
-			if (OverlappedTop != null) {
-				return;
-			}
-			var top = FindTopFromView (Top?.MostFocused);
-			if (top != null && Top.Subviews.Count > 1 && Top.Subviews [Top.Subviews.Count - 1] != top) {
-				Top.BringSubviewToFront (top);
-			}
+	/// <summary>
+	/// Brings the superview of the most focused overlapped view is on front.
+	/// </summary>
+	public static void BringOverlappedTopToFront ()
+	{
+		if (OverlappedTop != null) {
+			return;
 		}
+		var top = FindTopFromView (Top?.MostFocused);
+		if (top != null && Top.Subviews.Count > 1 && Top.Subviews [Top.Subviews.Count - 1] != top) {
+			Top.BringSubviewToFront (top);
+		}
+	}
 
 
-		/// <summary>
-		/// Gets the current visible Toplevel overlapped child that matches the arguments pattern.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <param name="exclude">The strings to exclude.</param>
-		/// <returns>The matched view.</returns>
-		public static Toplevel GetTopOverlappedChild (Type type = null, string [] exclude = null)
-		{
-			if (Application.OverlappedTop == null) {
-				return null;
-			}
+	/// <summary>
+	/// Gets the current visible Toplevel overlapped child that matches the arguments pattern.
+	/// </summary>
+	/// <param name="type">The type.</param>
+	/// <param name="exclude">The strings to exclude.</param>
+	/// <returns>The matched view.</returns>
+	public static Toplevel GetTopOverlappedChild (Type type = null, string [] exclude = null)
+	{
+		if (OverlappedTop == null) {
+			return null;
+		}
 
-			foreach (var top in Application.OverlappedChildren) {
-				if (type != null && top.GetType () == type
-					&& exclude?.Contains (top.Data.ToString ()) == false) {
-					return top;
-				} else if ((type != null && top.GetType () != type)
-					|| (exclude?.Contains (top.Data.ToString ()) == true)) {
-					continue;
-				}
+		foreach (var top in OverlappedChildren) {
+			if (type != null && top.GetType () == type && exclude?.Contains (top.Data.ToString ()) == false) {
 				return top;
 			}
-			return null;
+			if (type != null && top.GetType () != type || exclude?.Contains (top.Data.ToString ()) == true) {
+				continue;
+			}
+			return top;
 		}
-
+		return null;
 	}
-}
+}

Terminal.Gui/Views/Window.cs

@@ -44,7 +44,8 @@ public class Window : Toplevel {
 	/// This property can be set in a Theme to change the default <see cref="LineStyle"/> for all
 	/// <see cref="Window"/>s.
 	/// </remarks>
-	[SerializableConfigurationProperty (Scope = typeof (ThemeScope))] [JsonConverter (typeof (JsonStringEnumConverter))]
+	[SerializableConfigurationProperty (Scope = typeof (ThemeScope))]
+	[JsonConverter (typeof (JsonStringEnumConverter))]
 	public static LineStyle DefaultBorderStyle { get; set; } = LineStyle.Single;
 
 	void SetInitialProperties ()

UICatalog/Scenario.cs

@@ -1,271 +1,296 @@
-using System.Text;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Terminal.Gui;
 
-namespace UICatalog {
+namespace UICatalog;
+
+/// <summary>
+///         <para>Base class for each demo/scenario.</para>
+///         <para>
+///         To define a new scenario:
+///         <list type="number">
+///                 <item>
+///                         <description>
+///                         Create a new <c>.cs</c> file in the <cs>Scenarios</cs> directory that derives from
+///                         <see cref="Scenario"/>.
+///                         </description>
+///                 </item>
+///                 <item>
+///                         <description>
+///                         Annotate the <see cref="Scenario"/> derived class with a
+///                         <see cref="Scenario.ScenarioMetadata"/> attribute specifying the scenario's name and
+///                         description.
+///                         </description>
+///                 </item>
+///                 <item>
+///                         <description>
+///                         Add one or more <see cref="Scenario.ScenarioCategory"/> attributes to the class specifying
+///                         which categories the scenario belongs to. If you don't specify a category the scenario will
+///                         show up in "_All".
+///                         </description>
+///                 </item>
+///                 <item>
+///                         <description>
+///                         Implement the <see cref="Setup"/> override which will be called when a user
+///                         selects the scenario to run.
+///                         </description>
+///                 </item>
+///                 <item>
+///                         <description>
+///                         Optionally, implement the <see cref="Init()"/> and/or <see cref="Run"/> overrides
+///                         to provide a custom implementation.
+///                         </description>
+///                 </item>
+///         </list>
+///         </para>
+///         <para>
+///         The UI Catalog program uses reflection to find all scenarios and adds them to the
+///         ListViews. Press ENTER to run the selected scenario. Press the default quit key to quit.	/
+///         </para>
+/// </summary>
+/// <example>
+/// The example below is provided in the `Scenarios` directory as a generic sample that can be copied and re-named:
+/// <code>
+/// using Terminal.Gui;
+/// 
+/// namespace UICatalog {
+/// 	[ScenarioMetadata (Name: "Generic", Description: "Generic sample - A template for creating new Scenarios")]
+/// 	[ScenarioCategory ("Controls")]
+/// 	class MyScenario : Scenario {
+/// 		public override void Setup ()
+/// 		{
+/// 			// Put your scenario code here, e.g.
+/// 			Win.Add (new Button ("Press me!") {
+/// 				X = Pos.Center (),
+/// 				Y = Pos.Center (),
+/// 				Clicked = () => MessageBox.Query (20, 7, "Hi", "Neat?", "Yes", "No")
+/// 			});
+/// 		}
+/// 	}
+/// }
+/// </code>
+/// </example>
+public class Scenario : IDisposable {
+
+	static int _maxScenarioNameLen = 30;
+	bool _disposedValue;
+
+	public string Theme = "Default";
+	public string TopLevelColorScheme = "Base";
+
 	/// <summary>
-	/// <para>Base class for each demo/scenario.</para>
-	/// <para>
-	///  To define a new scenario:
-	///  <list type="number">
-	///  <item><description>Create a new <c>.cs</c> file in the <cs>Scenarios</cs> directory that derives from <see cref="Scenario"/>.</description></item>
-	///  <item><description>Annotate the <see cref="Scenario"/> derived class with a <see cref="Scenario.ScenarioMetadata"/> attribute specifying the scenario's name and description.</description></item>
-	///  <item><description>Add one or more <see cref="Scenario.ScenarioCategory"/> attributes to the class specifying which categories the scenario belongs to. If you don't specify a category the scenario will show up in "_All".</description></item>
-	///  <item><description>Implement the <see cref="Setup"/> override which will be called when a user selects the scenario to run.</description></item>
-	///  <item><description>Optionally, implement the <see cref="Init()"/> and/or <see cref="Run"/> overrides to provide a custom implementation.</description></item>
-	///  </list>
-	/// </para>
-	/// <para>
-	/// The UI Catalog program uses reflection to find all scenarios and adds them to the
-	/// ListViews. Press ENTER to run the selected scenario. Press the default quit key to quit.	/
-	/// </para>
+	/// The Window for the <see cref="Scenario"/>. This should be set to <see cref="Terminal.Gui.Application.Top"/> in most
+	/// cases.
 	/// </summary>
-	/// <example>
-	/// The example below is provided in the `Scenarios` directory as a generic sample that can be copied and re-named:
-	/// <code>
-	/// using Terminal.Gui;
-	/// 
-	/// namespace UICatalog {
-	/// 	[ScenarioMetadata (Name: "Generic", Description: "Generic sample - A template for creating new Scenarios")]
-	/// 	[ScenarioCategory ("Controls")]
-	/// 	class MyScenario : Scenario {
-	/// 		public override void Setup ()
-	/// 		{
-	/// 			// Put your scenario code here, e.g.
-	/// 			Win.Add (new Button ("Press me!") {
-	/// 				X = Pos.Center (),
-	/// 				Y = Pos.Center (),
-	/// 				Clicked = () => MessageBox.Query (20, 7, "Hi", "Neat?", "Yes", "No")
-	/// 			});
-	/// 		}
-	/// 	}
-	/// }
-	/// </code>
-	/// </example>
-	public class Scenario : IDisposable {
-		private bool _disposedValue;
-
-		public string Theme = "Default";
-		public string TopLevelColorScheme = "Base";
+	public Window Win { get; set; }
 
-		/// <summary>
-		/// The Window for the <see cref="Scenario"/>. This should be set to <see cref="Terminal.Gui.Application.Top"/> in most cases.
-		/// </summary>
-		public Window Win { get; set; }
+	public void Dispose ()
+	{
+		// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+		Dispose (disposing: true);
+		GC.SuppressFinalize (this);
+	}
 
-		/// <summary>
-		/// Helper that provides the default <see cref="Terminal.Gui.Window"/> implementation with a frame and 
-		/// label showing the name of the <see cref="Scenario"/> and logic to exit back to 
-		/// the Scenario picker UI.
-		/// Override <see cref="Init"/> to provide any <see cref="Terminal.Gui.Toplevel"/> behavior needed.
-		/// </summary>
-		/// <remarks>
-		/// <para>
-		/// The base implementation calls <see cref="Application.Init"/> and creates a <see cref="Window"/> for <see cref="Win"/> 
-		/// and adds it to <see cref="Application.Top"/>.
-		/// </para>
-		/// <para>
-		/// Overrides that do not call the base.<see cref="Run"/>, must call <see cref="Application.Init"/> 
-		/// before creating any views or calling other Terminal.Gui APIs.
-		/// </para>
-		/// </remarks>
-		public virtual void Init ()
-		{
-			Application.Init ();
-			
-			ConfigurationManager.Themes.Theme = Theme;
-			ConfigurationManager.Apply ();
-
-			Win = new Window () {
-				Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}",
-				X = 0,
-				Y = 0,
-				Width = Dim.Fill (),
-				Height = Dim.Fill (),
-				ColorScheme = Colors.ColorSchemes [TopLevelColorScheme],
-			};
-			Application.Top.Add (Win);
+	/// <summary>
+	/// Helper that provides the default <see cref="Terminal.Gui.Window"/> implementation with a frame and
+	/// label showing the name of the <see cref="Scenario"/> and logic to exit back to
+	/// the Scenario picker UI.
+	/// Override <see cref="Init"/> to provide any <see cref="Terminal.Gui.Toplevel"/> behavior needed.
+	/// </summary>
+	/// <remarks>
+	///         <para>
+	///         The base implementation calls <see cref="Application.Init"/> and creates a <see cref="Window"/> for
+	///         <see cref="Win"/>
+	///         and adds it to <see cref="Application.Top"/>.
+	///         </para>
+	///         <para>
+	///         Overrides that do not call the base.<see cref="Run"/>, must call <see cref="Application.Init"/>
+	///         before creating any views or calling other Terminal.Gui APIs.
+	///         </para>
+	/// </remarks>
+	public virtual void Init ()
+	{
+		Application.Init ();
+
+		ConfigurationManager.Themes.Theme = Theme;
+		ConfigurationManager.Apply ();
+
+		Win = new Window {
+			Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}",
+			X = 0,
+			Y = 0,
+			Width = Dim.Fill (),
+			Height = Dim.Fill (),
+			ColorScheme = Colors.ColorSchemes [TopLevelColorScheme]
+		};
+		Application.Top.Add (Win);
+	}
+
+	/// <summary>
+	/// Helper to get the <see cref="Scenario"/> Name (defined in <see cref="ScenarioMetadata"/>)
+	/// </summary>
+	/// <returns></returns>
+	public string GetName () => ScenarioMetadata.GetName (GetType ());
+
+	/// <summary>
+	/// Helper to get the <see cref="Scenario"/> Description (defined in <see cref="ScenarioMetadata"/>)
+	/// </summary>
+	/// <returns></returns>
+	public string GetDescription () => ScenarioMetadata.GetDescription (GetType ());
+
+	/// <summary>
+	/// Helper function to get the list of categories a <see cref="Scenario"/> belongs to (defined in
+	/// <see cref="ScenarioCategory"/>)
+	/// </summary>
+	/// <returns>list of category names</returns>
+	public List<string> GetCategories () => ScenarioCategory.GetCategories (GetType ());
+
+	/// <summary>
+	/// Gets the Scenario Name + Description with the Description padded
+	/// based on the longest known Scenario name.
+	/// </summary>
+	/// <returns></returns>
+	public override string ToString () => $"{GetName ().PadRight (_maxScenarioNameLen)}{GetDescription ()}";
+
+	/// <summary>
+	/// Override this to implement the <see cref="Scenario"/> setup logic (create controls, etc...).
+	/// </summary>
+	/// <remarks>This is typically the best place to put scenario logic code.</remarks>
+	public virtual void Setup () { }
+
+	/// <summary>
+	/// Runs the <see cref="Scenario"/>. Override to start the <see cref="Scenario"/>
+	/// using a <see cref="Toplevel"/> different than `Top`.
+	/// </summary>
+	/// <remarks>
+	/// Overrides that do not call the base.<see cref="Run"/>, must call <see cref="Application.Shutdown"/> before returning.
+	/// </remarks>
+	public virtual void Run () =>
+		// Must explicit call Application.Shutdown method to shutdown.
+		Application.Run (Application.Top);
+
+	/// <summary>
+	/// Stops the scenario. Override to change shutdown behavior for the <see cref="Scenario"/>.
+	/// </summary>
+	public virtual void RequestStop () => Application.RequestStop ();
+
+	/// <summary>
+	/// Returns a list of all Categories set by all of the <see cref="Scenario"/>s defined in the project.
+	/// </summary>
+	internal static List<string> GetAllCategories ()
+	{
+		var categories = new List<string> ();
+		foreach (var type in typeof (Scenario).Assembly.GetTypes ()
+			.Where (myType => myType.IsClass && !myType.IsAbstract && myType.IsSubclassOf (typeof (Scenario)))) {
+			var attrs = System.Attribute.GetCustomAttributes (type).ToList ();
+			categories = categories.Union (attrs.Where (a => a is ScenarioCategory).Select (a => ((ScenarioCategory)a).Name)).ToList ();
 		}
 
-		/// <summary>
-		/// Defines the metadata (Name and Description) for a <see cref="Scenario"/>
-		/// </summary>
-		[System.AttributeUsage (System.AttributeTargets.Class)]
-		public class ScenarioMetadata : System.Attribute {
-			/// <summary>
-			/// <see cref="Scenario"/> Name
-			/// </summary>
-			public string Name { get; set; }
-
-			/// <summary>
-			/// <see cref="Scenario"/> Description
-			/// </summary>
-			public string Description { get; set; }
-
-			public ScenarioMetadata (string Name, string Description)
-			{
-				this.Name = Name;
-				this.Description = Description;
+		// Sort
+		categories = categories.OrderBy (c => c).ToList ();
+
+		// Put "All" at the top
+		categories.Insert (0, "All Scenarios");
+		return categories;
+	}
+
+	/// <summary>
+	/// Returns a list of all <see cref="Scenario"/> instanaces defined in the project, sorted by
+	/// <see cref="ScenarioMetadata.Name"/>.
+	/// https://stackoverflow.com/questions/5411694/get-all-inherited-classes-of-an-abstract-class
+	/// </summary>
+	public static List<Scenario> GetScenarios ()
+	{
+		var objects = new List<Scenario> ();
+		foreach (var type in typeof (Scenario).Assembly.ExportedTypes
+			.Where (myType => myType.IsClass && !myType.IsAbstract && myType.IsSubclassOf (typeof (Scenario)))) {
+			var scenario = (Scenario)Activator.CreateInstance (type);
+			objects.Add (scenario);
+			_maxScenarioNameLen = Math.Max (_maxScenarioNameLen, scenario.GetName ().Length + 1);
+		}
+		return objects.OrderBy (s => s.GetName ()).ToList ();
+	}
+
+	protected virtual void Dispose (bool disposing)
+	{
+		if (!_disposedValue) {
+			if (disposing) {
+				// TODO: dispose managed state (managed objects)
 			}
 
-			/// <summary>
-			/// Static helper function to get the <see cref="Scenario"/> Name given a Type
-			/// </summary>
-			/// <param name="t"></param>
-			/// <returns></returns>
-			public static string GetName (Type t) => ((ScenarioMetadata)System.Attribute.GetCustomAttributes (t) [0]).Name;
-
-			/// <summary>
-			/// Static helper function to get the <see cref="Scenario"/> Description given a Type
-			/// </summary>
-			/// <param name="t"></param>
-			/// <returns></returns>
-			public static string GetDescription (Type t) => ((ScenarioMetadata)System.Attribute.GetCustomAttributes (t) [0]).Description;
+			// TODO: free unmanaged resources (unmanaged objects) and override finalizer
+			// TODO: set large fields to null
+			_disposedValue = true;
 		}
+	}
 
-		/// <summary>
-		/// Helper to get the <see cref="Scenario"/> Name (defined in <see cref="ScenarioMetadata"/>)
-		/// </summary>
-		/// <returns></returns>
-		public string GetName () => ScenarioMetadata.GetName (this.GetType ());
+	/// <summary>
+	/// Defines the metadata (Name and Description) for a <see cref="Scenario"/>
+	/// </summary>
+	[AttributeUsage (AttributeTargets.Class)]
+	public class ScenarioMetadata : System.Attribute {
 
-		/// <summary>
-		/// Helper to get the <see cref="Scenario"/> Description (defined in <see cref="ScenarioMetadata"/>)
-		/// </summary>
-		/// <returns></returns>
-		public string GetDescription () => ScenarioMetadata.GetDescription (this.GetType ());
+		public ScenarioMetadata (string Name, string Description)
+		{
+			this.Name = Name;
+			this.Description = Description;
+		}
 
 		/// <summary>
-		/// Defines the category names used to catagorize a <see cref="Scenario"/>
+		/// <see cref="Scenario"/> Name
 		/// </summary>
-		[System.AttributeUsage (System.AttributeTargets.Class, AllowMultiple = true)]
-		public class ScenarioCategory : System.Attribute {
-			/// <summary>
-			/// Category Name
-			/// </summary>
-			public string Name { get; set; }
-
-			public ScenarioCategory (string Name) => this.Name = Name;
-
-			/// <summary>
-			/// Static helper function to get the <see cref="Scenario"/> Name given a Type
-			/// </summary>
-			/// <param name="t"></param>
-			/// <returns>Name of the category</returns>
-			public static string GetName (Type t) => ((ScenarioCategory)System.Attribute.GetCustomAttributes (t) [0]).Name;
-
-			/// <summary>
-			/// Static helper function to get the <see cref="Scenario"/> Categories given a Type
-			/// </summary>
-			/// <param name="t"></param>
-			/// <returns>list of category names</returns>
-			public static List<string> GetCategories (Type t) => System.Attribute.GetCustomAttributes (t)
-				.ToList ()
-				.Where (a => a is ScenarioCategory)
-				.Select (a => ((ScenarioCategory)a).Name)
-				.ToList ();
-		}
+		public string Name { get; set; }
 
 		/// <summary>
-		/// Helper function to get the list of categories a <see cref="Scenario"/> belongs to (defined in <see cref="ScenarioCategory"/>)
+		/// <see cref="Scenario"/> Description
 		/// </summary>
-		/// <returns>list of category names</returns>
-		public List<string> GetCategories () => ScenarioCategory.GetCategories (this.GetType ());
-
-		private static int _maxScenarioNameLen = 30;
+		public string Description { get; set; }
 
 		/// <summary>
-		/// Gets the Scenario Name + Description with the Description padded
-		/// based on the longest known Scenario name.
+		/// Static helper function to get the <see cref="Scenario"/> Name given a Type
 		/// </summary>
+		/// <param name="t"></param>
 		/// <returns></returns>
-		public override string ToString () => $"{GetName ().PadRight(_maxScenarioNameLen)}{GetDescription ()}";
+		public static string GetName (Type t) => ((ScenarioMetadata)GetCustomAttributes (t) [0]).Name;
 
 		/// <summary>
-		/// Override this to implement the <see cref="Scenario"/> setup logic (create controls, etc...). 
+		/// Static helper function to get the <see cref="Scenario"/> Description given a Type
 		/// </summary>
-		/// <remarks>This is typically the best place to put scenario logic code.</remarks>
-		public virtual void Setup ()
-		{
-		}
+		/// <param name="t"></param>
+		/// <returns></returns>
+		public static string GetDescription (Type t) => ((ScenarioMetadata)GetCustomAttributes (t) [0]).Description;
+	}
 
-		/// <summary>
-		/// Runs the <see cref="Scenario"/>. Override to start the <see cref="Scenario"/> 
-		/// using a <see cref="Toplevel"/> different than `Top`.
-		/// </summary>
-		/// <remarks>
-		/// Overrides that do not call the base.<see cref="Run"/>, must call <see cref="Application.Shutdown"/> before returning.
-		/// </remarks>
-		public virtual void Run ()
-		{
-			// Must explicit call Application.Shutdown method to shutdown.
-			Application.Run (Application.Top);
-		}
+	/// <summary>
+	/// Defines the category names used to catagorize a <see cref="Scenario"/>
+	/// </summary>
+	[AttributeUsage (AttributeTargets.Class, AllowMultiple = true)]
+	public class ScenarioCategory : System.Attribute {
+
+		public ScenarioCategory (string Name) => this.Name = Name;
 
 		/// <summary>
-		/// Stops the scenario. Override to change shutdown behavior for the <see cref="Scenario"/>.
+		/// Category Name
 		/// </summary>
-		public virtual void RequestStop ()
-		{
-			Application.RequestStop ();
-		}
+		public string Name { get; set; }
 
 		/// <summary>
-		/// Returns a list of all Categories set by all of the <see cref="Scenario"/>s defined in the project.
+		/// Static helper function to get the <see cref="Scenario"/> Name given a Type
 		/// </summary>
-		internal static List<string> GetAllCategories ()
-		{
-			List<string> categories = new List<string> ();
-			foreach (Type type in typeof (Scenario).Assembly.GetTypes ()
-			 .Where (myType => myType.IsClass && !myType.IsAbstract && myType.IsSubclassOf (typeof (Scenario)))) {
-				List<System.Attribute> attrs = System.Attribute.GetCustomAttributes (type).ToList ();
-				categories = categories.Union (attrs.Where (a => a is ScenarioCategory).Select (a => ((ScenarioCategory)a).Name)).ToList ();
-			}
-
-			// Sort
-			categories = categories.OrderBy (c => c).ToList ();
-
-			// Put "All" at the top
-			categories.Insert (0, "All Scenarios");
-			return categories;
-		}
+		/// <param name="t"></param>
+		/// <returns>Name of the category</returns>
+		public static string GetName (Type t) => ((ScenarioCategory)GetCustomAttributes (t) [0]).Name;
 
 		/// <summary>
-		/// Returns a list of all <see cref="Scenario"/> instanaces defined in the project, sorted by <see cref="ScenarioMetadata.Name"/>.
-		/// https://stackoverflow.com/questions/5411694/get-all-inherited-classes-of-an-abstract-class
+		/// Static helper function to get the <see cref="Scenario"/> Categories given a Type
 		/// </summary>
-		public static List<Scenario> GetScenarios ()
-		{
-			List<Scenario> objects = new List<Scenario> ();
-			foreach (Type type in typeof (Scenario).Assembly.ExportedTypes
-			 .Where (myType => myType.IsClass && !myType.IsAbstract && myType.IsSubclassOf (typeof (Scenario)))) {
-				var scenario = (Scenario)Activator.CreateInstance (type);
-				objects.Add (scenario);
-				_maxScenarioNameLen = Math.Max (_maxScenarioNameLen, scenario.GetName ().Length + 1);
-			}
-			return objects.OrderBy (s => s.GetName ()).ToList ();
-		}
-
-		protected virtual void Dispose (bool disposing)
-		{
-			if (!_disposedValue) {
-				if (disposing) {
-					// TODO: dispose managed state (managed objects)
-				}
-
-				// TODO: free unmanaged resources (unmanaged objects) and override finalizer
-				// TODO: set large fields to null
-				_disposedValue = true;
-			}
-		}
-
-		public void Dispose ()
-		{
-			// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
-			Dispose (disposing: true);
-			GC.SuppressFinalize (this);
-		}
+		/// <param name="t"></param>
+		/// <returns>list of category names</returns>
+		public static List<string> GetCategories (Type t) => GetCustomAttributes (t)
+			.ToList ()
+			.Where (a => a is ScenarioCategory)
+			.Select (a => ((ScenarioCategory)a).Name)
+			.ToList ();
 	}
-}
+}

UICatalog/Scenarios/ASCIICustomButton.cs

@@ -77,7 +77,7 @@ namespace UICatalog.Scenarios {
 				};
 
 				AutoSize = false;
-				LayoutStyle = LayoutStyle.Absolute;
+				//LayoutStyle = LayoutStyle.Absolute;
 
 				var fillText = new System.Text.StringBuilder ();
 				for (int i = 0; i < Bounds.Height; i++) {

UICatalog/Scenarios/AllViewsTester.cs

@@ -111,7 +111,6 @@ public class AllViewsTester : Scenario {
 		_computedCheckBox = new CheckBox ("Computed Layout", true) { X = 0, Y = 0 };
 		_computedCheckBox.Toggled += (s, e) => {
 			if (_curView != null) {
-				_curView.LayoutStyle = e.OldValue == true ? LayoutStyle.Absolute : LayoutStyle.Computed;
 				_hostPane.LayoutSubviews ();
 			}
 		};
@@ -246,7 +245,7 @@ public class AllViewsTester : Scenario {
 		var layout = view.LayoutStyle;
 
 		try {
-			view.LayoutStyle = LayoutStyle.Absolute;
+			//view.LayoutStyle = LayoutStyle.Absolute;
 
 			view.X = _xRadioGroup.SelectedItem switch {
 				0 => Pos.Percent (_xVal),
@@ -280,14 +279,14 @@ public class AllViewsTester : Scenario {
 		} catch (Exception e) {
 			MessageBox.ErrorQuery ("Exception", e.Message, "Ok");
 		} finally {
-			view.LayoutStyle = layout;
+			//view.LayoutStyle = layout;
 		}
 		UpdateTitle (view);
 	}
 
 	// TODO: This is missing some
-	List<string> _posNames = new() { "Factor", "AnchorEnd", "Center", "Absolute" };
-	List<string> _dimNames = new() { "Factor", "Fill", "Absolute" };
+	List<string> _posNames = new () { "Factor", "AnchorEnd", "Center", "Absolute" };
+	List<string> _dimNames = new () { "Factor", "Fill", "Absolute" };
 
 	void UpdateSettings (View view)
 	{
@@ -388,10 +387,10 @@ public class AllViewsTester : Scenario {
 		//view.X = Pos.Center ();
 		//view.Y = Pos.Center ();
 		if (view.Width == null || view.Frame.Width == 0) {
-			view.Width = Dim.Fill();
+			view.Width = Dim.Fill ();
 		}
 		if (view.Height == null || view.Frame.Height == 0) {
-			view.Height = Dim.Fill();
+			view.Height = Dim.Fill ();
 		}
 		UpdateSettings (view);
 		UpdateTitle (view);

UICatalog/Scenarios/ColorPicker.cs

@@ -1,132 +1,129 @@
-using Terminal.Gui;
-using System;
-
-namespace UICatalog.Scenarios {
-	[ScenarioMetadata (Name: "Color Picker", Description: "Color Picker.")]
-	[ScenarioCategory ("Colors")]
-	[ScenarioCategory ("Controls")]
-	public class ColorPickers : Scenario {
-		/// <summary>
-		/// Foreground ColorPicker.
-		/// </summary>
-		private ColorPicker foregroundColorPicker;
-
-		/// <summary>
-		/// Background ColorPicker.
-		/// </summary>
-		private ColorPicker backgroundColorPicker;
-
-		/// <summary>
-		/// Foreground color label.
-		/// </summary>
-		private Label _foregroundColorLabel;
-
-		/// <summary>
-		/// Background color Label.
-		/// </summary>
-		private Label _backgroundColorLabel;
-
-		/// <summary>
-		/// Demo label.
-		/// </summary>
-		private View _demoView;
-
-		/// <summary>
-		/// Setup the scenario.
-		/// </summary>
-		public override void Setup ()
-		{
-			// Scenario Window's.
-			Win.Title = this.GetName ();
-
-			// Foreground ColorPicker.
-			foregroundColorPicker = new ColorPicker () {
-				Title = "Foreground Color",
-				X = 0,
-				Y = 0,
-				BoxHeight = 3,
-				BoxWidth = 6,
-				BorderStyle = LineStyle.Single
-			};
-			foregroundColorPicker.ColorChanged += ForegroundColor_ColorChanged;
-			Win.Add (foregroundColorPicker);
-
-			_foregroundColorLabel = new Label {
-				X = Pos.Left (foregroundColorPicker),
-				Y = Pos.Bottom (foregroundColorPicker) + 1
-			};
-			Win.Add (_foregroundColorLabel);
-
-			// Background ColorPicker.
-			backgroundColorPicker = new ColorPicker () { 
-				Title = "Background Color",
-				Y = 0,
-				X = 0,
-				BoxHeight = 1,
-				BoxWidth = 4,
-				BorderStyle = LineStyle.Single
-			};
-			backgroundColorPicker.X = Pos.AnchorEnd () - (Pos.Right (backgroundColorPicker) - Pos.Left (backgroundColorPicker));
-			backgroundColorPicker.ColorChanged += BackgroundColor_ColorChanged;
-			Win.Add (backgroundColorPicker);
-			_backgroundColorLabel = new Label ();
-			_backgroundColorLabel.X = Pos.AnchorEnd () - (Pos.Right (_backgroundColorLabel) - Pos.Left (_backgroundColorLabel));
-			_backgroundColorLabel.Y = Pos.Bottom (backgroundColorPicker) + 1;
-			Win.Add (_backgroundColorLabel);
-
-			// Demo Label.
-			_demoView = new View () {
-				Title = "Color Sample",
-				Text = "Lorem Ipsum",
-				TextAlignment = TextAlignment.Centered,
-				VerticalTextAlignment = VerticalTextAlignment.Middle,
-				BorderStyle = LineStyle.Heavy,
-				X = Pos.Center (),
-				Y = Pos.Center (),
-				Height = 5,
-				Width = 20
-			};
-			Win.Add (_demoView);
-
-			// Set default colors.
-			foregroundColorPicker.SelectedColor = _demoView.SuperView.ColorScheme.Normal.Foreground.ColorName;
-			backgroundColorPicker.SelectedColor = _demoView.SuperView.ColorScheme.Normal.Background.ColorName;
-			Win.Initialized += (s, e) => Win.LayoutSubviews ();
-		}
-
-		/// <summary>
-		/// Fired when foreground color is changed.
-		/// </summary>
-		private void ForegroundColor_ColorChanged (object sender, EventArgs e)
-		{
-			UpdateColorLabel (_foregroundColorLabel, foregroundColorPicker);
-			UpdateDemoLabel ();
-		}
-
-		/// <summary>
-		/// Fired when background color is changed.
-		/// </summary>
-		private void BackgroundColor_ColorChanged (object sender, EventArgs e)
-		{
-			UpdateColorLabel (_backgroundColorLabel, backgroundColorPicker);
-			UpdateDemoLabel ();
-		}
-
-		/// <summary>
-		/// Update a color label from his ColorPicker.
-		/// </summary>
-		private void UpdateColorLabel (Label label, ColorPicker colorPicker)
-		{
-			label.Clear ();
-			var color = new Color (colorPicker.SelectedColor);
-			label.Text = $"{colorPicker.SelectedColor} ({(int)colorPicker.SelectedColor}) #{color.R:X2}{color.G:X2}{color.B:X2}";
-		}
-
-		/// <summary>
-		/// Update Demo Label.
-		/// </summary>
-		private void UpdateDemoLabel () => _demoView.ColorScheme = new ColorScheme () {
-			Normal = new Attribute (foregroundColorPicker.SelectedColor, backgroundColorPicker.SelectedColor)
+using System;
+using Terminal.Gui;
+
+namespace UICatalog.Scenarios;
+
+[ScenarioMetadata ("Color Picker", "Color Picker.")]
+[ScenarioCategory ("Colors")]
+[ScenarioCategory ("Controls")]
+public class ColorPickers : Scenario {
+
+	/// <summary>
+	/// Background color Label.
+	/// </summary>
+	Label _backgroundColorLabel;
+
+	/// <summary>
+	/// Demo label.
+	/// </summary>
+	View _demoView;
+
+	/// <summary>
+	/// Foreground color label.
+	/// </summary>
+	Label _foregroundColorLabel;
+
+	/// <summary>
+	/// Background ColorPicker.
+	/// </summary>
+	ColorPicker backgroundColorPicker;
+
+	/// <summary>
+	/// Foreground ColorPicker.
+	/// </summary>
+	ColorPicker foregroundColorPicker;
+
+	/// <summary>
+	/// Setup the scenario.
+	/// </summary>
+	public override void Setup ()
+	{
+		// Scenario Window's.
+		Win.Title = GetName ();
+
+		// Foreground ColorPicker.
+		foregroundColorPicker = new ColorPicker {
+			Title = "Foreground Color",
+			BorderStyle = LineStyle.Single
 		};
+		foregroundColorPicker.ColorChanged += ForegroundColor_ColorChanged;
+		Win.Add (foregroundColorPicker);
+
+		_foregroundColorLabel = new Label {
+			X = Pos.Left (foregroundColorPicker),
+			Y = Pos.Bottom (foregroundColorPicker) + 1
+		};
+		Win.Add (_foregroundColorLabel);
+
+		// Background ColorPicker.
+		backgroundColorPicker = new ColorPicker {
+			Title = "Background Color",
+			Y = Pos.Center (),
+			X = Pos.Center (),
+			BoxHeight = 1,
+			BoxWidth = 4,
+			BorderStyle = LineStyle.Single
+		};
+		//backgroundColorPicker.X = Pos.AnchorEnd () - (Pos.Right (backgroundColorPicker) - Pos.Left (backgroundColorPicker));
+		backgroundColorPicker.ColorChanged += BackgroundColor_ColorChanged;
+		Win.Add (backgroundColorPicker);
+		_backgroundColorLabel = new Label ();
+		_backgroundColorLabel.X = Pos.AnchorEnd () - (Pos.Right (_backgroundColorLabel) - Pos.Left (_backgroundColorLabel));
+		_backgroundColorLabel.Y = Pos.Bottom (backgroundColorPicker) + 1;
+		Win.Add (_backgroundColorLabel);
+
+		// Demo Label.
+		_demoView = new View {
+			Title = "Color Sample",
+			Text = "Lorem Ipsum",
+			TextAlignment = TextAlignment.Centered,
+			VerticalTextAlignment = VerticalTextAlignment.Middle,
+			BorderStyle = LineStyle.Heavy,
+			X = Pos.Center (),
+			Y = Pos.Center (),
+			Height = 5,
+			Width = 20
+		};
+		Win.Add (_demoView);
+
+		// Set default colors.
+		foregroundColorPicker.SelectedColor = _demoView.SuperView.ColorScheme.Normal.Foreground.ColorName;
+		backgroundColorPicker.SelectedColor = _demoView.SuperView.ColorScheme.Normal.Background.ColorName;
+		Win.Initialized += (s, e) => Win.LayoutSubviews ();
+	}
+
+	/// <summary>
+	/// Fired when foreground color is changed.
+	/// </summary>
+	void ForegroundColor_ColorChanged (object sender, EventArgs e)
+	{
+		UpdateColorLabel (_foregroundColorLabel, foregroundColorPicker);
+		UpdateDemoLabel ();
 	}
+
+	/// <summary>
+	/// Fired when background color is changed.
+	/// </summary>
+	void BackgroundColor_ColorChanged (object sender, EventArgs e)
+	{
+		UpdateColorLabel (_backgroundColorLabel, backgroundColorPicker);
+		UpdateDemoLabel ();
+	}
+
+	/// <summary>
+	/// Update a color label from his ColorPicker.
+	/// </summary>
+	void UpdateColorLabel (Label label, ColorPicker colorPicker)
+	{
+		label.Clear ();
+		var color = new Color (colorPicker.SelectedColor);
+		label.Text = $"{colorPicker.SelectedColor} ({(int)colorPicker.SelectedColor}) #{color.R:X2}{color.G:X2}{color.B:X2}";
+	}
+
+	/// <summary>
+	/// Update Demo Label.
+	/// </summary>
+	void UpdateDemoLabel () => _demoView.ColorScheme = new ColorScheme {
+		Normal = new Attribute (foregroundColorPicker.SelectedColor, backgroundColorPicker.SelectedColor)
+	};
 }

UICatalog/Scenarios/ListColumns.cs

@@ -3,331 +3,358 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using Terminal.Gui;
-using static Terminal.Gui.TableView;
-
-namespace UICatalog.Scenarios {
-
-	[ScenarioMetadata (Name: "ListColumns", Description: "Implements a columned list via a data table.")]
-	[ScenarioCategory ("TableView")]
-	[ScenarioCategory ("Controls")]
-	[ScenarioCategory ("Dialogs")]
-	[ScenarioCategory ("Text and Formatting")]
-	[ScenarioCategory ("Top Level Windows")]
-	public class ListColumns : Scenario {
-		TableView listColView;
-		DataTable currentTable;
-		private MenuItem _miCellLines;
-		private MenuItem _miExpandLastColumn;
-		private MenuItem _miAlwaysUseNormalColorForVerticalCellLines;
-		private MenuItem _miSmoothScrolling;
-		private MenuItem _miAlternatingColors;
-		private MenuItem _miCursor;
-		private MenuItem _miTopline;
-		private MenuItem _miBottomline;
-		private MenuItem _miOrientVertical;
-		private MenuItem _miScrollParallel;
-
-		ColorScheme alternatingColorScheme;
-
-		public override void Setup ()
-		{
-			Win.Title = this.GetName ();
-			Win.Y = 1; // menu
-			Win.Height = Dim.Fill (1); // status bar
-
-			this.listColView = new TableView () {
-				X = 0,
-				Y = 0,
-				Width = Dim.Fill (),
-				Height = Dim.Fill (1),
-				Style = new TableStyle {
-					ShowHeaders = false,
-					ShowHorizontalHeaderOverline = false,
-					ShowHorizontalHeaderUnderline = false,
-					ShowHorizontalBottomline = false,
-					ExpandLastColumn = false,
+
+namespace UICatalog.Scenarios;
+
+[ScenarioMetadata ("ListColumns", "Implements a columned list via a data table.")]
+[ScenarioCategory ("TableView")]
+[ScenarioCategory ("Controls")]
+[ScenarioCategory ("Dialogs")]
+[ScenarioCategory ("Text and Formatting")]
+[ScenarioCategory ("Top Level Windows")]
+public class ListColumns : Scenario {
+	MenuItem _miAlternatingColors;
+	MenuItem _miAlwaysUseNormalColorForVerticalCellLines;
+	MenuItem _miBottomline;
+	MenuItem _miCellLines;
+	MenuItem _miCursor;
+	MenuItem _miExpandLastColumn;
+	MenuItem _miOrientVertical;
+	MenuItem _miScrollParallel;
+	MenuItem _miSmoothScrolling;
+	MenuItem _miTopline;
+
+	ColorScheme _alternatingColorScheme;
+	DataTable _currentTable;
+	TableView _listColView;
+
+	public override void Setup ()
+	{
+		Win.Title = GetName ();
+		Win.Y = 1;                 // menu
+		Win.Height = Dim.Fill (1); // status bar
+
+		_listColView = new TableView {
+			X = 0,
+			Y = 0,
+			Width = Dim.Fill (),
+			Height = Dim.Fill (1),
+			Style = new TableStyle {
+				ShowHeaders = false,
+				ShowHorizontalHeaderOverline = false,
+				ShowHorizontalHeaderUnderline = false,
+				ShowHorizontalBottomline = false,
+				ExpandLastColumn = false
+			}
+		};
+		var listColStyle = new ListColumnStyle ();
+
+		var menu = new MenuBar (new MenuBarItem [] {
+			new ("_File", new MenuItem [] {
+				new ("Open_BigListExample", "", () => OpenSimpleList (true)),
+				new ("Open_SmListExample", "", () => OpenSimpleList (false)),
+				new ("_CloseExample", "", () => CloseExample ()),
+				new ("_Quit", "", () => Quit ())
+			}),
+			new ("_View", new [] {
+				_miTopline = new MenuItem ("_TopLine", "", () => ToggleTopline ()) {
+					Checked = _listColView.Style.ShowHorizontalHeaderOverline,
+					CheckType = MenuItemCheckStyle.Checked
+				},
+				_miBottomline = new MenuItem ("_BottomLine", "", () => ToggleBottomline ()) {
+					Checked = _listColView.Style.ShowHorizontalBottomline,
+					CheckType = MenuItemCheckStyle.Checked
+				},
+				_miCellLines = new MenuItem ("_CellLines", "", () => ToggleCellLines ()) {
+					Checked = _listColView.Style.ShowVerticalCellLines,
+					CheckType = MenuItemCheckStyle.Checked
+				},
+				_miExpandLastColumn = new MenuItem ("_ExpandLastColumn", "", () => ToggleExpandLastColumn ()) {
+					Checked = _listColView.Style.ExpandLastColumn,
+					CheckType = MenuItemCheckStyle.Checked
+				},
+				_miAlwaysUseNormalColorForVerticalCellLines =
+					new MenuItem ("_AlwaysUseNormalColorForVerticalCellLines", "",
+						() => ToggleAlwaysUseNormalColorForVerticalCellLines ()) {
+						Checked = _listColView.Style.AlwaysUseNormalColorForVerticalCellLines,
+						CheckType = MenuItemCheckStyle.Checked
+					},
+				_miSmoothScrolling = new MenuItem ("_SmoothHorizontalScrolling", "", () => ToggleSmoothScrolling ()) {
+					Checked = _listColView.Style.SmoothHorizontalScrolling,
+					CheckType = MenuItemCheckStyle.Checked
+				},
+				_miAlternatingColors = new MenuItem ("Alternating Colors", "", () => ToggleAlternatingColors ())
+					{ CheckType = MenuItemCheckStyle.Checked },
+				_miCursor = new MenuItem ("Invert Selected Cell First Character", "",
+					() => ToggleInvertSelectedCellFirstCharacter ()) {
+					Checked = _listColView.Style.InvertSelectedCellFirstCharacter,
+					CheckType = MenuItemCheckStyle.Checked
 				}
-			};
-			var listColStyle = new ListColumnStyle ();
-
-			var menu = new MenuBar (new MenuBarItem [] {
-				new MenuBarItem ("_File", new MenuItem [] {
-					new MenuItem ("Open_BigListExample", "", () => OpenSimpleList (true)),
-					new MenuItem ("Open_SmListExample", "", () => OpenSimpleList (false)),
-					new MenuItem ("_CloseExample", "", () => CloseExample ()),
-					new MenuItem ("_Quit", "", () => Quit()),
-				}),
-				new MenuBarItem ("_View", new MenuItem [] {
-					_miTopline = new MenuItem ("_TopLine", "", () => ToggleTopline ()) { Checked = listColView.Style.ShowHorizontalHeaderOverline, CheckType = MenuItemCheckStyle.Checked },
-					_miBottomline = new MenuItem ("_BottomLine", "", () => ToggleBottomline ()) { Checked = listColView.Style.ShowHorizontalBottomline, CheckType = MenuItemCheckStyle.Checked },
-					_miCellLines = new MenuItem ("_CellLines", "", () => ToggleCellLines ()) { Checked = listColView.Style.ShowVerticalCellLines, CheckType = MenuItemCheckStyle.Checked },
-					_miExpandLastColumn = new MenuItem ("_ExpandLastColumn", "", () => ToggleExpandLastColumn ()) { Checked = listColView.Style.ExpandLastColumn, CheckType = MenuItemCheckStyle.Checked },
-					_miAlwaysUseNormalColorForVerticalCellLines = new MenuItem ("_AlwaysUseNormalColorForVerticalCellLines", "", () => ToggleAlwaysUseNormalColorForVerticalCellLines ()) { Checked = listColView.Style.AlwaysUseNormalColorForVerticalCellLines, CheckType = MenuItemCheckStyle.Checked },
-					_miSmoothScrolling = new MenuItem ("_SmoothHorizontalScrolling", "", () => ToggleSmoothScrolling ()) { Checked = listColView.Style.SmoothHorizontalScrolling, CheckType = MenuItemCheckStyle.Checked },
-					_miAlternatingColors = new MenuItem ("Alternating Colors", "", () => ToggleAlternatingColors ()) { CheckType = MenuItemCheckStyle.Checked},
-					_miCursor = new MenuItem ("Invert Selected Cell First Character", "", () => ToggleInvertSelectedCellFirstCharacter ()) { Checked = listColView.Style.InvertSelectedCellFirstCharacter,CheckType = MenuItemCheckStyle.Checked},
-				}),
-				new MenuBarItem ("_List", new MenuItem [] {
-					//new MenuItem ("_Hide Headers", "", HideHeaders),
-					_miOrientVertical = new MenuItem ("_OrientVertical", "", () => ToggleVerticalOrientation ()) { Checked = listColStyle.Orientation == Orientation.Vertical, CheckType = MenuItemCheckStyle.Checked },
-					_miScrollParallel = new MenuItem ("_ScrollParallel", "", () => ToggleScrollParallel ()) { Checked = listColStyle.ScrollParallel, CheckType = MenuItemCheckStyle.Checked },
-					new MenuItem ("Set _Max Cell Width", "", SetListMaxWidth),
-					new MenuItem ("Set Mi_n Cell Width", "", SetListMinWidth),
-				}),
-			});
-
-			Application.Top.Add (menu);
-
-			var statusBar = new StatusBar (new StatusItem [] {
-				new StatusItem(KeyCode.F2, "~F2~ OpenBigListEx", () => OpenSimpleList (true)),
-				new StatusItem(KeyCode.F3, "~F3~ CloseExample", () => CloseExample ()),
-				new StatusItem(KeyCode.F4, "~F4~ OpenSmListEx", () => OpenSimpleList (false)),
-				new StatusItem(Application.QuitKey, $"{Application.QuitKey} to Quit", () => Quit()),
-			});
-			Application.Top.Add (statusBar);
-
-			Win.Add (listColView);
-
-			var selectedCellLabel = new Label () {
-				X = 0,
-				Y = Pos.Bottom (listColView),
-				Text = "0,0",
-				Width = Dim.Fill (),
-				TextAlignment = TextAlignment.Right
-
-			};
-
-			Win.Add (selectedCellLabel);
-
-			listColView.SelectedCellChanged += (s, e) => { selectedCellLabel.Text = $"{listColView.SelectedRow},{listColView.SelectedColumn}"; };
-			listColView.KeyDown += TableViewKeyPress;
-
-			SetupScrollBar ();
-
-			alternatingColorScheme = new ColorScheme () {
-
-				Disabled = Win.ColorScheme.Disabled,
-				HotFocus = Win.ColorScheme.HotFocus,
-				Focus = Win.ColorScheme.Focus,
-				Normal = new Attribute (Color.White, Color.BrightBlue)
-			};
-
-			// if user clicks the mouse in TableView
-			listColView.MouseClick += (s, e) => {
-
-				listColView.ScreenToCell (e.MouseEvent.X, e.MouseEvent.Y, out int? clickedCol);
-			};
-
-			listColView.KeyBindings.Add (KeyCode.Space, Command.ToggleChecked);
-		}
+			}),
+			new ("_List", new [] {
+				//new MenuItem ("_Hide Headers", "", HideHeaders),
+				_miOrientVertical = new MenuItem ("_OrientVertical", "", () => ToggleVerticalOrientation ()) {
+					Checked = listColStyle.Orientation == Orientation.Vertical,
+					CheckType = MenuItemCheckStyle.Checked
+				},
+				_miScrollParallel = new MenuItem ("_ScrollParallel", "", () => ToggleScrollParallel ())
+					{ Checked = listColStyle.ScrollParallel, CheckType = MenuItemCheckStyle.Checked },
+				new ("Set _Max Cell Width", "", SetListMaxWidth),
+				new ("Set Mi_n Cell Width", "", SetListMinWidth)
+			})
+		});
+
+		Application.Top.Add (menu);
+
+		var statusBar = new StatusBar (new StatusItem [] {
+			new (KeyCode.F2, "~F2~ OpenBigListEx", () => OpenSimpleList (true)),
+			new (KeyCode.F3, "~F3~ CloseExample", () => CloseExample ()),
+			new (KeyCode.F4, "~F4~ OpenSmListEx", () => OpenSimpleList (false)),
+			new (Application.QuitKey, $"{Application.QuitKey} to Quit", () => Quit ())
+		});
+		Application.Top.Add (statusBar);
+
+		Win.Add (_listColView);
+
+		var selectedCellLabel = new Label {
+			X = 0,
+			Y = Pos.Bottom (_listColView),
+			Text = "0,0",
+			Width = Dim.Fill (),
+			TextAlignment = TextAlignment.Right
+
+		};
+
+		Win.Add (selectedCellLabel);
+
+		_listColView.SelectedCellChanged += (s, e) => { selectedCellLabel.Text = $"{_listColView.SelectedRow},{_listColView.SelectedColumn}"; };
+		_listColView.KeyDown += TableViewKeyPress;
+
+		SetupScrollBar ();
+
+		_alternatingColorScheme = new ColorScheme {
+
+			Disabled = Win.ColorScheme.Disabled,
+			HotFocus = Win.ColorScheme.HotFocus,
+			Focus = Win.ColorScheme.Focus,
+			Normal = new Attribute (Color.White, Color.BrightBlue)
+		};
+
+		// if user clicks the mouse in TableView
+		_listColView.MouseClick += (s, e) => {
+
+			_listColView.ScreenToCell (e.MouseEvent.X, e.MouseEvent.Y, out var clickedCol);
+		};
+
+		_listColView.KeyBindings.Add (KeyCode.Space, Command.ToggleChecked);
+	}
 
-		private void SetupScrollBar ()
-		{
-			var scrollBar = new ScrollBarView (listColView, true); // (listColView, true, true);
+	void SetupScrollBar ()
+	{
+		var scrollBar = new ScrollBarView (_listColView, true); // (listColView, true, true);
 
-			scrollBar.ChangedPosition += (s, e) => {
-				listColView.RowOffset = scrollBar.Position;
-				if (listColView.RowOffset != scrollBar.Position) {
-					scrollBar.Position = listColView.RowOffset;
-				}
-				listColView.SetNeedsDisplay ();
-			};
-			/*
-			scrollBar.OtherScrollBarView.ChangedPosition += (s,e) => {
-				listColView.ColumnOffset = scrollBar.OtherScrollBarView.Position;
-				if (listColView.ColumnOffset != scrollBar.OtherScrollBarView.Position) {
-					scrollBar.OtherScrollBarView.Position = listColView.ColumnOffset;
-				}
-				listColView.SetNeedsDisplay ();
-			};
-			*/
-
-			listColView.DrawContent += (s, e) => {
-				scrollBar.Size = listColView.Table?.Rows ?? 0;
-				scrollBar.Position = listColView.RowOffset;
-				//scrollBar.OtherScrollBarView.Size = listColView.Table?.Columns - 1 ?? 0;
-				//scrollBar.OtherScrollBarView.Position = listColView.ColumnOffset;
-				scrollBar.Refresh ();
-			};
+		scrollBar.ChangedPosition += (s, e) => {
+			_listColView.RowOffset = scrollBar.Position;
+			if (_listColView.RowOffset != scrollBar.Position) {
+				scrollBar.Position = _listColView.RowOffset;
+			}
+			_listColView.SetNeedsDisplay ();
+		};
+		/*
+		scrollBar.OtherScrollBarView.ChangedPosition += (s,e) => {
+			listColView.ColumnOffset = scrollBar.OtherScrollBarView.Position;
+			if (listColView.ColumnOffset != scrollBar.OtherScrollBarView.Position) {
+				scrollBar.OtherScrollBarView.Position = listColView.ColumnOffset;
+			}
+			listColView.SetNeedsDisplay ();
+		};
+		*/
 
-		}
+		_listColView.DrawContent += (s, e) => {
+			scrollBar.Size = _listColView.Table?.Rows ?? 0;
+			scrollBar.Position = _listColView.RowOffset;
+			//scrollBar.OtherScrollBarView.Size = listColView.Table?.Columns - 1 ?? 0;
+			//scrollBar.OtherScrollBarView.Position = listColView.ColumnOffset;
+			scrollBar.Refresh ();
+		};
 
-		private void TableViewKeyPress (object sender, Key e)
-		{
-			if (e.KeyCode == KeyCode.Delete) {
+	}
 
-				// set all selected cells to null
-				foreach (var pt in listColView.GetAllSelectedCells ()) {
-					currentTable.Rows [pt.Y] [pt.X] = DBNull.Value;
-				}
+	void TableViewKeyPress (object sender, Key e)
+	{
+		if (e.KeyCode == KeyCode.Delete) {
 
-				listColView.Update ();
-				e.Handled = true;
+			// set all selected cells to null
+			foreach (var pt in _listColView.GetAllSelectedCells ()) {
+				_currentTable.Rows [pt.Y] [pt.X] = DBNull.Value;
 			}
 
+			_listColView.Update ();
+			e.Handled = true;
 		}
 
-		private void ToggleTopline ()
-		{
-			_miTopline.Checked = !_miTopline.Checked;
-			listColView.Style.ShowHorizontalHeaderOverline = (bool)_miTopline.Checked;
-			listColView.Update ();
-		}
-		private void ToggleBottomline ()
-		{
-			_miBottomline.Checked = !_miBottomline.Checked;
-			listColView.Style.ShowHorizontalBottomline = (bool)_miBottomline.Checked;
-			listColView.Update ();
-		}
-		private void ToggleExpandLastColumn ()
-		{
-			_miExpandLastColumn.Checked = !_miExpandLastColumn.Checked;
-			listColView.Style.ExpandLastColumn = (bool)_miExpandLastColumn.Checked;
+	}
 
-			listColView.Update ();
+	void ToggleTopline ()
+	{
+		_miTopline.Checked = !_miTopline.Checked;
+		_listColView.Style.ShowHorizontalHeaderOverline = (bool)_miTopline.Checked;
+		_listColView.Update ();
+	}
 
-		}
+	void ToggleBottomline ()
+	{
+		_miBottomline.Checked = !_miBottomline.Checked;
+		_listColView.Style.ShowHorizontalBottomline = (bool)_miBottomline.Checked;
+		_listColView.Update ();
+	}
 
-		private void ToggleAlwaysUseNormalColorForVerticalCellLines ()
-		{
-			_miAlwaysUseNormalColorForVerticalCellLines.Checked = !_miAlwaysUseNormalColorForVerticalCellLines.Checked;
-			listColView.Style.AlwaysUseNormalColorForVerticalCellLines = (bool)_miAlwaysUseNormalColorForVerticalCellLines.Checked;
+	void ToggleExpandLastColumn ()
+	{
+		_miExpandLastColumn.Checked = !_miExpandLastColumn.Checked;
+		_listColView.Style.ExpandLastColumn = (bool)_miExpandLastColumn.Checked;
 
-			listColView.Update ();
-		}
-		private void ToggleSmoothScrolling ()
-		{
-			_miSmoothScrolling.Checked = !_miSmoothScrolling.Checked;
-			listColView.Style.SmoothHorizontalScrolling = (bool)_miSmoothScrolling.Checked;
+		_listColView.Update ();
 
-			listColView.Update ();
+	}
 
-		}
-		private void ToggleCellLines ()
-		{
-			_miCellLines.Checked = !_miCellLines.Checked;
-			listColView.Style.ShowVerticalCellLines = (bool)_miCellLines.Checked;
-			listColView.Update ();
-		}
-		private void ToggleAlternatingColors ()
-		{
-			//toggle menu item
-			_miAlternatingColors.Checked = !_miAlternatingColors.Checked;
-
-			if (_miAlternatingColors.Checked == true) {
-				listColView.Style.RowColorGetter = (a) => { return a.RowIndex % 2 == 0 ? alternatingColorScheme : null; };
-			} else {
-				listColView.Style.RowColorGetter = null;
-			}
-			listColView.SetNeedsDisplay ();
-		}
+	void ToggleAlwaysUseNormalColorForVerticalCellLines ()
+	{
+		_miAlwaysUseNormalColorForVerticalCellLines.Checked = !_miAlwaysUseNormalColorForVerticalCellLines.Checked;
+		_listColView.Style.AlwaysUseNormalColorForVerticalCellLines = (bool)_miAlwaysUseNormalColorForVerticalCellLines.Checked;
 
-		private void ToggleInvertSelectedCellFirstCharacter ()
-		{
-			//toggle menu item
-			_miCursor.Checked = !_miCursor.Checked;
-			listColView.Style.InvertSelectedCellFirstCharacter = (bool)_miCursor.Checked;
-			listColView.SetNeedsDisplay ();
-		}
+		_listColView.Update ();
+	}
 
-		private void ToggleVerticalOrientation ()
-		{
-			_miOrientVertical.Checked = !_miOrientVertical.Checked;
-			if ((ListTableSource)listColView.Table != null) {
-				((ListTableSource)listColView.Table).Style.Orientation = (bool)_miOrientVertical.Checked ? Orientation.Vertical : Orientation.Horizontal;
-				listColView.SetNeedsDisplay ();
-			}
-		}
+	void ToggleSmoothScrolling ()
+	{
+		_miSmoothScrolling.Checked = !_miSmoothScrolling.Checked;
+		_listColView.Style.SmoothHorizontalScrolling = (bool)_miSmoothScrolling.Checked;
 
-		private void ToggleScrollParallel ()
-		{
-			_miScrollParallel.Checked = !_miScrollParallel.Checked;
-			if ((ListTableSource)listColView.Table != null) {
-				((ListTableSource)listColView.Table).Style.ScrollParallel = (bool)_miScrollParallel.Checked;
-				listColView.SetNeedsDisplay ();
-			}
-		}
+		_listColView.Update ();
 
-		private void SetListMinWidth ()
-		{
-			RunListWidthDialog ("MinCellWidth", (s, v) => s.MinCellWidth = v, (s) => s.MinCellWidth);
-			listColView.SetNeedsDisplay ();
-		}
+	}
 
-		private void SetListMaxWidth ()
-		{
-			RunListWidthDialog ("MaxCellWidth", (s, v) => s.MaxCellWidth = v, (s) => s.MaxCellWidth);
-			listColView.SetNeedsDisplay ();
+	void ToggleCellLines ()
+	{
+		_miCellLines.Checked = !_miCellLines.Checked;
+		_listColView.Style.ShowVerticalCellLines = (bool)_miCellLines.Checked;
+		_listColView.Update ();
+	}
+
+	void ToggleAlternatingColors ()
+	{
+		//toggle menu item
+		_miAlternatingColors.Checked = !_miAlternatingColors.Checked;
+
+		if (_miAlternatingColors.Checked == true) {
+			_listColView.Style.RowColorGetter = a => { return a.RowIndex % 2 == 0 ? _alternatingColorScheme : null; };
+		} else {
+			_listColView.Style.RowColorGetter = null;
 		}
+		_listColView.SetNeedsDisplay ();
+	}
 
-		private void RunListWidthDialog (string prompt, Action<TableView, int> setter, Func<TableView, int> getter)
-		{
-			var accepted = false;
-			var ok = new Button ("Ok", is_default: true);
-			ok.Clicked += (s, e) => { accepted = true; Application.RequestStop (); };
-			var cancel = new Button ("Cancel");
-			cancel.Clicked += (s, e) => { Application.RequestStop (); };
-			var d = new Dialog (ok, cancel) { Title = prompt };
-
-			var tf = new TextField () {
-				Text = getter (listColView).ToString (),
-				X = 0,
-				Y = 1,
-				Width = Dim.Fill ()
-			};
-
-			d.Add (tf);
-			tf.SetFocus ();
-
-			Application.Run (d);
-
-			if (accepted) {
-
-				try {
-					setter (listColView, int.Parse (tf.Text));
-				} catch (Exception ex) {
-					MessageBox.ErrorQuery (60, 20, "Failed to set", ex.Message, "Ok");
-				}
-			}
+	void ToggleInvertSelectedCellFirstCharacter ()
+	{
+		//toggle menu item
+		_miCursor.Checked = !_miCursor.Checked;
+		_listColView.Style.InvertSelectedCellFirstCharacter = (bool)_miCursor.Checked;
+		_listColView.SetNeedsDisplay ();
+	}
+
+	void ToggleVerticalOrientation ()
+	{
+		_miOrientVertical.Checked = !_miOrientVertical.Checked;
+		if ((ListTableSource)_listColView.Table != null) {
+			((ListTableSource)_listColView.Table).Style.Orientation = (bool)_miOrientVertical.Checked ? Orientation.Vertical : Orientation.Horizontal;
+			_listColView.SetNeedsDisplay ();
 		}
+	}
 
-		private void CloseExample ()
-		{
-			listColView.Table = null;
+	void ToggleScrollParallel ()
+	{
+		_miScrollParallel.Checked = !_miScrollParallel.Checked;
+		if ((ListTableSource)_listColView.Table != null) {
+			((ListTableSource)_listColView.Table).Style.ScrollParallel = (bool)_miScrollParallel.Checked;
+			_listColView.SetNeedsDisplay ();
 		}
+	}
+
+	void SetListMinWidth ()
+	{
+		RunListWidthDialog ("MinCellWidth", (s, v) => s.MinCellWidth = v, s => s.MinCellWidth);
+		_listColView.SetNeedsDisplay ();
+	}
 
-		private void Quit ()
-		{
+	void SetListMaxWidth ()
+	{
+		RunListWidthDialog ("MaxCellWidth", (s, v) => s.MaxCellWidth = v, s => s.MaxCellWidth);
+		_listColView.SetNeedsDisplay ();
+	}
+
+	void RunListWidthDialog (string prompt, Action<TableView, int> setter, Func<TableView, int> getter)
+	{
+		var accepted = false;
+		var ok = new Button ("Ok", true);
+		ok.Clicked += (s, e) => {
+			accepted = true;
 			Application.RequestStop ();
-		}
+		};
+		var cancel = new Button ("Cancel");
+		cancel.Clicked += (s, e) => { Application.RequestStop (); };
+		var d = new Dialog (ok, cancel) { Title = prompt };
 
-		private void OpenSimpleList (bool big)
-		{
-			SetTable (BuildSimpleList (big ? 1023 : 31));
-		}
+		var tf = new TextField {
+			Text = getter (_listColView).ToString (),
+			X = 0,
+			Y = 1,
+			Width = Dim.Fill ()
+		};
 
-		private void SetTable (IList list)
-		{
-			listColView.Table = new ListTableSource (list, listColView);
-			if ((ListTableSource)listColView.Table != null) {
-				currentTable = ((ListTableSource)listColView.Table).DataTable;
+		d.Add (tf);
+		tf.SetFocus ();
+
+		Application.Run (d);
+
+		if (accepted) {
+
+			try {
+				setter (_listColView, int.Parse (tf.Text));
+			} catch (Exception ex) {
+				MessageBox.ErrorQuery (60, 20, "Failed to set", ex.Message, "Ok");
 			}
 		}
+	}
 
-		/// <summary>
-		/// Builds a simple list in which values are the index.  This helps testing that scrolling etc is working correctly and not skipping out values when paging
-		/// </summary>
-		/// <param name="items"></param>
-		/// <returns></returns>
-		public static IList BuildSimpleList (int items)
-		{
-			var list = new List<object> ();
-
-			for (int i = 0; i < items; i++) {
-				list.Add ("Item " + i);
-			}
+	void CloseExample () => _listColView.Table = null;
+
+	void Quit () => Application.RequestStop ();
 
-			return list;
+	void OpenSimpleList (bool big) => SetTable (BuildSimpleList (big ? 1023 : 31));
+
+	void SetTable (IList list)
+	{
+		_listColView.Table = new ListTableSource (list, _listColView);
+		if ((ListTableSource)_listColView.Table != null) {
+			_currentTable = ((ListTableSource)_listColView.Table).DataTable;
 		}
 	}
+
+	/// <summary>
+	/// Builds a simple list in which values are the index.  This helps testing that scrolling etc is working correctly and not
+	/// skipping out values when paging
+	/// </summary>
+	/// <param name="items"></param>
+	/// <returns></returns>
+	public static IList BuildSimpleList (int items)
+	{
+		var list = new List<object> ();
+
+		for (var i = 0; i < items; i++) {
+			list.Add ("Item " + i);
+		}
+
+		return list;
+	}
 }

UICatalog/Scenarios/ProgressBarStyles.cs

@@ -4,169 +4,168 @@ using System.Threading;
 using Terminal.Gui;
 using static UICatalog.Scenarios.Frames;
 
-namespace UICatalog.Scenarios {
-	[ScenarioMetadata (Name: "ProgressBar Styles", Description: "Shows the ProgressBar Styles.")]
-	[ScenarioCategory ("Controls")]
-	[ScenarioCategory ("Progress")]
-	[ScenarioCategory ("Threading")]
-
-	// TODO: Add enable/disable to show that that is working
-	// TODO: Clean up how FramesEditor works 
-	// TODO: Better align rpPBFormat
-
-	public class ProgressBarStyles : Scenario {
-		private Timer _fractionTimer;
-		private Timer _pulseTimer;
-		private const uint _timerTick = 20;
-
-		public override void Init ()
+namespace UICatalog.Scenarios;
+
+[ScenarioMetadata ("ProgressBar Styles", "Shows the ProgressBar Styles.")]
+[ScenarioCategory ("Controls")]
+[ScenarioCategory ("Progress")]
+[ScenarioCategory ("Threading")]
+
+// TODO: Add enable/disable to show that that is working
+// TODO: Clean up how FramesEditor works 
+// TODO: Better align rpPBFormat
+public class ProgressBarStyles : Scenario {
+	const uint _timerTick = 20;
+	Timer _fractionTimer;
+	Timer _pulseTimer;
+
+	public override void Init ()
+	{
+		Application.Init ();
+		ConfigurationManager.Themes.Theme = Theme;
+		ConfigurationManager.Apply ();
+
+		var editor = new FramesEditor {
+			Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}",
+			BorderStyle = LineStyle.Single
+		};
+		editor.ColorScheme = Colors.ColorSchemes [TopLevelColorScheme];
+
+		const float fractionStep = 0.01F;
+		const int pbWidth = 25;
+
+		var pbFormatEnum = Enum.GetValues (typeof (ProgressBarFormat)).Cast<ProgressBarFormat> ().ToList ();
+
+		var rbPBFormat = new RadioGroup (pbFormatEnum.Select (e => e.ToString ()).ToArray ()) {
+			X = Pos.Center (),
+			Y = 10,
+			Orientation = Orientation.Horizontal,
+			BorderStyle = LineStyle.Single
+		};
+		editor.Add (rbPBFormat);
+
+		var button = new Button ("Start timer") {
+			X = Pos.Center (),
+			Y = Pos.Bottom (rbPBFormat) + 1
+		};
+
+		editor.Add (button);
+		var blocksPB = new ProgressBar {
+			Title = "Blocks",
+			X = Pos.Center (),
+			Y = Pos.Bottom (button) + 1,
+			Width = pbWidth,
+			BorderStyle = LineStyle.Single
+		};
+		editor.Add (blocksPB);
+
+		var continuousPB = new ProgressBar {
+			Title = "Continuous",
+			X = Pos.Center (),
+			Y = Pos.Bottom (blocksPB) + 1,
+			Width = pbWidth,
+			ProgressBarStyle = ProgressBarStyle.Continuous,
+			BorderStyle = LineStyle.Single
+		};
+		editor.Add (continuousPB);
+
+		button.Clicked += (s, e) => {
+			if (_fractionTimer == null) {
+				//blocksPB.Enabled = false;
+				blocksPB.Fraction = 0;
+				continuousPB.Fraction = 0;
+				float fractionSum = 0;
+				_fractionTimer = new Timer (_ => {
+					fractionSum += fractionStep;
+					blocksPB.Fraction = fractionSum;
+					continuousPB.Fraction = fractionSum;
+					if (fractionSum > 1) {
+						_fractionTimer.Dispose ();
+						_fractionTimer = null;
+						button.Enabled = true;
+					}
+					Application.Wakeup ();
+				}, null, 0, _timerTick);
+			}
+		};
+
+		var ckbBidirectional = new CheckBox ("BidirectionalMarquee", true) {
+			X = Pos.Center (),
+			Y = Pos.Bottom (continuousPB) + 1
+		};
+		editor.Add (ckbBidirectional);
+
+		var marqueesBlocksPB = new ProgressBar {
+			Title = "Marquee Blocks",
+			X = Pos.Center (),
+			Y = Pos.Bottom (ckbBidirectional) + 1,
+			Width = pbWidth,
+			ProgressBarStyle = ProgressBarStyle.MarqueeBlocks,
+			BorderStyle = LineStyle.Single
+		};
+		editor.Add (marqueesBlocksPB);
+
+		var marqueesContinuousPB = new ProgressBar {
+			Title = "Marquee Continuous",
+			X = Pos.Center (),
+			Y = Pos.Bottom (marqueesBlocksPB) + 1,
+			Width = pbWidth,
+			ProgressBarStyle = ProgressBarStyle.MarqueeContinuous,
+			BorderStyle = LineStyle.Single
+		};
+		editor.Add (marqueesContinuousPB);
+
+		rbPBFormat.SelectedItemChanged += (s, e) => {
+			blocksPB.ProgressBarFormat = (ProgressBarFormat)e.SelectedItem;
+			continuousPB.ProgressBarFormat = (ProgressBarFormat)e.SelectedItem;
+			marqueesBlocksPB.ProgressBarFormat = (ProgressBarFormat)e.SelectedItem;
+			marqueesContinuousPB.ProgressBarFormat = (ProgressBarFormat)e.SelectedItem;
+		};
+
+		ckbBidirectional.Toggled += (s, e) => {
+			ckbBidirectional.Checked = marqueesBlocksPB.BidirectionalMarquee = marqueesContinuousPB.BidirectionalMarquee = (bool)!e.OldValue;
+		};
+
+		_pulseTimer = new Timer (_ => {
+			marqueesBlocksPB.Text = marqueesContinuousPB.Text = DateTime.Now.TimeOfDay.ToString ();
+			marqueesBlocksPB.Pulse ();
+			marqueesContinuousPB.Pulse ();
+			Application.Wakeup ();
+		}, null, 0, 300);
+
+		Application.Top.Unloaded += Top_Unloaded;
+
+		void Top_Unloaded (object sender, EventArgs args)
 		{
-			Application.Init ();
-			ConfigurationManager.Themes.Theme = Theme;
-			ConfigurationManager.Apply ();
-
-			var editor = new FramesEditor () {
-				Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}",
-				BorderStyle = LineStyle.Single
-			};
-			editor.ColorScheme = Colors.ColorSchemes [TopLevelColorScheme];
-
-			const float fractionStep = 0.01F;
-			const int pbWidth = 25;
-
-			var pbFormatEnum = Enum.GetValues (typeof (ProgressBarFormat)).Cast<ProgressBarFormat> ().ToList ();
-
-			var rbPBFormat = new RadioGroup (pbFormatEnum.Select (e => e.ToString ()).ToArray ()) {
-				X = Pos.Center (),
-				Y = 10
-			};
-			editor.Add (rbPBFormat);
-
-			var button = new Button ("Start timer") {
-				X = Pos.Center (),
-				Y = Pos.Bottom (rbPBFormat) + 1
-			};
-
-			editor.Add (button);
-			var blocksPB = new ProgressBar () {
-				Title = "Blocks",
-				X = Pos.Center (),
-				Y = Pos.Bottom (button) + 1,
-				Width = pbWidth,
-				BorderStyle = LineStyle.Single
-			};
-			editor.Add (blocksPB);
-
-			var continuousPB = new ProgressBar () {
-				Title = "Continuous",
-				X = Pos.Center (),
-				Y = Pos.Bottom (blocksPB) + 1,
-				Width = pbWidth,
-				ProgressBarStyle = ProgressBarStyle.Continuous,
-				BorderStyle = LineStyle.Single
-			};
-			editor.Add (continuousPB);
-
-			button.Clicked += (s, e) => {
-				if (_fractionTimer == null) {
-					//blocksPB.Enabled = false;
-					blocksPB.Fraction = 0;
-					continuousPB.Fraction = 0;
-					float fractionSum = 0;
-					_fractionTimer = new Timer ((_) => {
-						fractionSum += fractionStep;
-						blocksPB.Fraction = fractionSum;
-						continuousPB.Fraction = fractionSum;
-						if (fractionSum > 1) {
-							_fractionTimer.Dispose ();
-							_fractionTimer = null;
-							button.Enabled = true;
-						}
-						Application.Wakeup ();
-					}, null, 0, _timerTick);
-				}
-			};
-
-			var ckbBidirectional = new CheckBox ("BidirectionalMarquee", true) {
-				X = Pos.Center (),
-				Y = Pos.Bottom (continuousPB) + 1
-			};
-			editor.Add (ckbBidirectional);
-
-			var marqueesBlocksPB = new ProgressBar () {
-				Title = "Marquee Blocks",
-				X = Pos.Center (),
-				Y = Pos.Bottom (ckbBidirectional) + 1,
-				Width = pbWidth,
-				ProgressBarStyle = ProgressBarStyle.MarqueeBlocks,
-				BorderStyle = LineStyle.Single
-			};
-			editor.Add (marqueesBlocksPB);
-
-			var marqueesContinuousPB = new ProgressBar () {
-				Title = "Marquee Continuous",
-				X = Pos.Center (),
-				Y = Pos.Bottom (marqueesBlocksPB) + 1,
-				Width = pbWidth,
-				ProgressBarStyle = ProgressBarStyle.MarqueeContinuous,
-				BorderStyle = LineStyle.Single
-			};
-			editor.Add (marqueesContinuousPB);
-
-			rbPBFormat.SelectedItemChanged += (s, e) => {
-				blocksPB.ProgressBarFormat = (ProgressBarFormat)e.SelectedItem;
-				continuousPB.ProgressBarFormat = (ProgressBarFormat)e.SelectedItem;
-				marqueesBlocksPB.ProgressBarFormat = (ProgressBarFormat)e.SelectedItem;
-				marqueesContinuousPB.ProgressBarFormat = (ProgressBarFormat)e.SelectedItem;
-			};
-
-			ckbBidirectional.Toggled += (s, e) => {
-				ckbBidirectional.Checked = marqueesBlocksPB.BidirectionalMarquee = marqueesContinuousPB.BidirectionalMarquee = (bool)!e.OldValue;
-			};
-
-			_pulseTimer = new Timer ((_) => {
-				marqueesBlocksPB.Text = marqueesContinuousPB.Text = DateTime.Now.TimeOfDay.ToString ();
-				marqueesBlocksPB.Pulse ();
-				marqueesContinuousPB.Pulse ();
-				Application.Wakeup ();
-			}, null, 0, 300);
-
-			Application.Top.Unloaded += Top_Unloaded;
-
-			void Top_Unloaded (object sender, EventArgs args)
-			{
-				if (_fractionTimer != null) {
-					_fractionTimer.Dispose ();
-					_fractionTimer = null;
-				}
-				if (_pulseTimer != null) {
-					_pulseTimer.Dispose ();
-					_pulseTimer = null;
-				}
-				Application.Top.Unloaded -= Top_Unloaded;
+			if (_fractionTimer != null) {
+				_fractionTimer.Dispose ();
+				_fractionTimer = null;
 			}
-
-			var pbs = editor.Subviews.Where (v => v.GetType () == typeof (ProgressBar)).Select(v => v.Title).ToList ();
-			var pbList = new ListView (pbs) {
-				Title = "Focused ProgressBar",
-				Y = 0,
-				X = Pos.Center(),
-				Width = 30,
-				Height = 7,
-				BorderStyle = LineStyle.Single
-			};
-			pbList.SelectedItemChanged += (sender, e) => {
-				editor.ViewToEdit = (View)editor.Subviews.First(v => v.GetType () == typeof (ProgressBar) && v.Title == (string)e.Value);
-			};
-			editor.Add (pbList);
-			pbList.SelectedItem = 0;
-
-			Application.Run (editor);
-			Application.Shutdown ();
+			if (_pulseTimer != null) {
+				_pulseTimer.Dispose ();
+				_pulseTimer = null;
+			}
+			Application.Top.Unloaded -= Top_Unloaded;
 		}
 
-		public override void Run ()
-		{
-		}
+		var pbs = editor.Subviews.Where (v => v.GetType () == typeof (ProgressBar)).Select (v => v.Title).ToList ();
+		var pbList = new ListView (pbs) {
+			Title = "Focused ProgressBar",
+			Y = 0,
+			X = Pos.Center (),
+			Width = 30,
+			Height = 7,
+			BorderStyle = LineStyle.Single
+		};
+		pbList.SelectedItemChanged += (sender, e) => {
+			editor.ViewToEdit = editor.Subviews.First (v => v.GetType () == typeof (ProgressBar) && v.Title == (string)e.Value);
+		};
+		editor.Add (pbList);
+		pbList.SelectedItem = 0;
+
+		Application.Run (editor);
+		Application.Shutdown ();
 	}
+
+	public override void Run () { }
 }

UICatalog/Scenarios/Sliders.cs

@@ -35,7 +35,7 @@ public class Sliders : Scenario {
 			BorderStyle = LineStyle.Single
 		};
 
-		slider.Style.SetChar.Attribute = new Attribute (Color.BrightGreen,       Color.Black);
+		slider.Style.SetChar.Attribute = new Attribute (Color.BrightGreen, Color.Black);
 		slider.Style.LegendAttributes.SetAttribute = new Attribute (Color.Green, Color.Black);
 
 		slider.Options = new List<SliderOption<string>> {
@@ -79,7 +79,7 @@ public class Sliders : Scenario {
 		};
 		slider.SetOption (0); // Legends
 		slider.SetOption (1); // RangeAllowSingle
-		//slider.SetOption (3); // AutoSize
+				      //slider.SetOption (3); // AutoSize
 
 		#region Slider Orientation Slider
 		var slider_orientation_slider = new Slider<string> (new List<string> { "Horizontal", "Vertical" }) {
@@ -104,9 +104,7 @@ public class Sliders : Scenario {
 					s.Style.SpaceChar = new Cell { Rune = CM.Glyphs.HLine };
 
 					if (prev == null) {
-						s.LayoutStyle = LayoutStyle.Absolute;
 						s.Y = 0;
-						s.LayoutStyle = LayoutStyle.Computed;
 					} else {
 						s.Y = Pos.Bottom (prev) + 1;
 					}
@@ -119,9 +117,7 @@ public class Sliders : Scenario {
 					s.Style.SpaceChar = new Cell { Rune = CM.Glyphs.VLine };
 
 					if (prev == null) {
-						s.LayoutStyle = LayoutStyle.Absolute;
 						s.X = 0;
-						s.LayoutStyle = LayoutStyle.Computed;
 					} else {
 						s.X = Pos.Right (prev) + 2;
 					}
@@ -199,7 +195,7 @@ public class Sliders : Scenario {
 			AutoSize = true
 		};
 
-		sliderFGColor.Style.SetChar.Attribute = new Attribute (Color.BrightGreen,       Color.Black);
+		sliderFGColor.Style.SetChar.Attribute = new Attribute (Color.BrightGreen, Color.Black);
 		sliderFGColor.Style.LegendAttributes.SetAttribute = new Attribute (Color.Green, Color.Blue);
 
 		var colorOptions = new List<SliderOption<(Color, Color)>> ();
@@ -222,11 +218,11 @@ public class Sliders : Scenario {
 					s.ColorScheme = new ColorScheme (s.ColorScheme);
 					s.ColorScheme.Normal = new Attribute (data.Item2, s.ColorScheme.Normal.Background);
 
-					s.Style.OptionChar.Attribute = new Attribute (data.Item1,             s.ColorScheme.Normal.Background);
-					s.Style.SetChar.Attribute = new Attribute (data.Item1,                s.Style.SetChar.Attribute?.Background ?? s.ColorScheme.Normal.Background);
-					s.Style.LegendAttributes.SetAttribute = new Attribute (data.Item1,    s.ColorScheme.Normal.Background);
-					s.Style.RangeChar.Attribute = new Attribute (data.Item1,              s.ColorScheme.Normal.Background);
-					s.Style.SpaceChar.Attribute = new Attribute (data.Item1,              s.ColorScheme.Normal.Background);
+					s.Style.OptionChar.Attribute = new Attribute (data.Item1, s.ColorScheme.Normal.Background);
+					s.Style.SetChar.Attribute = new Attribute (data.Item1, s.Style.SetChar.Attribute?.Background ?? s.ColorScheme.Normal.Background);
+					s.Style.LegendAttributes.SetAttribute = new Attribute (data.Item1, s.ColorScheme.Normal.Background);
+					s.Style.RangeChar.Attribute = new Attribute (data.Item1, s.ColorScheme.Normal.Background);
+					s.Style.SpaceChar.Attribute = new Attribute (data.Item1, s.ColorScheme.Normal.Background);
 					s.Style.LegendAttributes.NormalAttribute = new Attribute (data.Item1, s.ColorScheme.Normal.Background);
 				}
 			}
@@ -244,7 +240,7 @@ public class Sliders : Scenario {
 			AutoSize = true
 		};
 
-		sliderBGColor.Style.SetChar.Attribute = new Attribute (Color.BrightGreen,       Color.Black);
+		sliderBGColor.Style.SetChar.Attribute = new Attribute (Color.BrightGreen, Color.Black);
 		sliderBGColor.Style.LegendAttributes.SetAttribute = new Attribute (Color.Green, Color.Blue);
 
 		sliderBGColor.Options = colorOptions;

UICatalog/Scenarios/TabViewExample.cs

@@ -59,7 +59,7 @@ namespace UICatalog.Scenarios {
 			};
 
 			tabView.AddTab (new Tab ("Tab1", new Label ("hodor!")), false);
-			tabView.AddTab (new Tab ("Tab2", new Label ("durdur")), false);
+			tabView.AddTab (new Tab ("Tab2", new TextField ("durdur")), false);
 			tabView.AddTab (new Tab ("Interactive Tab", GetInteractiveTab ()), false);
 			tabView.AddTab (new Tab ("Big Text", GetBigTextFileTab ()), false);
 			tabView.AddTab (new Tab (

UICatalog/Scenarios/Text.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -6,253 +7,251 @@ using System.Text.RegularExpressions;
 using Terminal.Gui;
 using Terminal.Gui.TextValidateProviders;
 
+namespace UICatalog.Scenarios; 
 
-namespace UICatalog.Scenarios {
-	[ScenarioMetadata (Name: "Text Input Controls", Description: "Tests all text input controls")]
-	[ScenarioCategory ("Controls")]
-	[ScenarioCategory ("Mouse and Keyboard")]
-	[ScenarioCategory ("Text and Formatting")]
-	public class Text : Scenario {
-		public override void Setup ()
+[ScenarioMetadata ("Text Input Controls", "Tests all text input controls")]
+[ScenarioCategory ("Controls")]
+[ScenarioCategory ("Mouse and Keyboard")]
+[ScenarioCategory ("Text and Formatting")]
+public class Text : Scenario {
+	Label _labelMirroringTimeField;
+
+	TimeField _timeField;
+
+	public override void Setup ()
+	{
+		// TextField is a simple, single-line text input control
+		var textField = new TextField ("TextField with test text. Unicode shouldn't 𝔹Aℝ𝔽!") {
+			X = 1,
+			Y = 0,
+			Width = Dim.Percent (50) - 1,
+			// Height will be replaced with 1
+			Height = 2
+		};
+
+		var singleWordGenerator = new SingleWordSuggestionGenerator ();
+		textField.Autocomplete.SuggestionGenerator = singleWordGenerator;
+
+		textField.TextChanging += TextField_TextChanging;
+
+		void TextField_TextChanging (object sender, TextChangingEventArgs e)
+		{
+			singleWordGenerator.AllSuggestions = Regex.Matches (e.NewText, "\\w+")
+				.Select (s => s.Value)
+				.Distinct ().ToList ();
+		}
+		Win.Add (textField);
+
+		var labelMirroringTextField = new Label (textField.Text) {
+			X = Pos.Right (textField) + 1,
+			Y = Pos.Top (textField),
+			Width = Dim.Fill (1) - 1
+		};
+		Win.Add (labelMirroringTextField);
+
+		textField.TextChanged += (s, prev) => {
+			labelMirroringTextField.Text = textField.Text;
+		};
+
+		// TextView is a rich (as in functionality, not formatting) text editing control
+		var textView = new TextView {
+			X = 1,
+			Y = Pos.Bottom (textField) + 1,
+			Width = Dim.Percent (50) - 1,
+			Height = Dim.Percent (30)
+		};
+		textView.Text = "TextView with some more test text. Unicode shouldn't 𝔹Aℝ𝔽!";
+		textView.DrawContent += TextView_DrawContent;
+
+		// This shows how to enable autocomplete in TextView.
+		void TextView_DrawContent (object sender, DrawEventArgs e)
 		{
-			// TextField is a simple, single-line text input control
-			var textField = new TextField ("TextField with test text. Unicode shouldn't 𝔹Aℝ𝔽!") {
-				X = 1,
-				Y = 0,
-				Width = Dim.Percent (50) - 1,
-				// Height will be replaced with 1
-				Height = 2
-			};
-
-			var singleWordGenerator = new SingleWordSuggestionGenerator ();
-			textField.Autocomplete.SuggestionGenerator = singleWordGenerator;
-
-			textField.TextChanging += TextField_TextChanging;
-
-			void TextField_TextChanging (object sender, TextChangingEventArgs e)
-			{
-				singleWordGenerator.AllSuggestions = Regex.Matches (e.NewText, "\\w+")
-				    .Select (s => s.Value)
-				    .Distinct ().ToList ();
+			singleWordGenerator.AllSuggestions = Regex.Matches (textView.Text, "\\w+")
+				.Select (s => s.Value)
+				.Distinct ().ToList ();
+		}
+		Win.Add (textView);
+
+		var labelMirroringTextView = new Label {
+			X = Pos.Right (textView) + 1,
+			Y = Pos.Top (textView),
+			Width = Dim.Fill (1) - 1,
+			Height = Dim.Height (textView) - 1
+		};
+		Win.Add (labelMirroringTextView);
+
+		// Use ContentChanged to detect if the user has typed something in a TextView.
+		// The TextChanged property is only fired if the TextView.Text property is
+		// explicitly set
+		textView.ContentsChanged += (s, a) => {
+			labelMirroringTextView.Enabled = !labelMirroringTextView.Enabled;
+			labelMirroringTextView.Text = textView.Text;
+		};
+
+		// By default TextView is a multi-line control. It can be forced to 
+		// single-line mode.
+		var chxMultiline = new CheckBox ("Multiline") {
+			X = Pos.Left (textView),
+			Y = Pos.Bottom (textView),
+			Checked = textView.Multiline
+		};
+		Win.Add (chxMultiline);
+
+		var chxWordWrap = new CheckBox ("Word Wrap") {
+			X = Pos.Right (chxMultiline) + 2,
+			Y = Pos.Top (chxMultiline),
+			Checked = textView.WordWrap
+		};
+		chxWordWrap.Toggled += (s, e) => textView.WordWrap = (bool)e.NewValue;
+		Win.Add (chxWordWrap);
+
+		// TextView captures Tabs (so users can enter /t into text) by default;
+		// This means using Tab to navigate doesn't work by default. This shows
+		// how to turn tab capture off.
+		var chxCaptureTabs = new CheckBox ("Capture Tabs") {
+			X = Pos.Right (chxWordWrap) + 2,
+			Y = Pos.Top (chxWordWrap),
+			Checked = textView.AllowsTab
+		};
+
+		chxMultiline.Toggled += (s, e) => {
+			textView.Multiline = (bool)e.NewValue;
+			if (!textView.Multiline && (bool)chxWordWrap.Checked) {
+				chxWordWrap.Checked = false;
 			}
-			Win.Add (textField);
-
-			var labelMirroringTextField = new Label (textField.Text) {
-				X = Pos.Right (textField) + 1,
-				Y = Pos.Top (textField),
-				Width = Dim.Fill (1) - 1
-			};
-			Win.Add (labelMirroringTextField);
-
-			textField.TextChanged += (s, prev) => {
-				labelMirroringTextField.Text = textField.Text;
-			};
-
-			// TextView is a rich (as in functionality, not formatting) text editing control
-			var textView = new TextView () {
-				X = 1,
-				Y = Pos.Bottom (textField) + 1,
-				Width = Dim.Percent (50) - 1,
-				Height = Dim.Percent (30),
-			};
-			textView.Text = "TextView with some more test text. Unicode shouldn't 𝔹Aℝ𝔽!";
-			textView.DrawContent += TextView_DrawContent;
-
-			// This shows how to enable autocomplete in TextView.
-			void TextView_DrawContent (object sender, DrawEventArgs e)
-			{
-				singleWordGenerator.AllSuggestions = Regex.Matches (textView.Text, "\\w+")
-				    .Select (s => s.Value)
-				    .Distinct ().ToList ();
+			if (!textView.Multiline && (bool)chxCaptureTabs.Checked) {
+				chxCaptureTabs.Checked = false;
 			}
-			Win.Add (textView);
-
-			var labelMirroringTextView = new Label () {
-				X = Pos.Right (textView) + 1,
-				Y = Pos.Top (textView),
-				Width = Dim.Fill (1) - 1,
-				Height = Dim.Height (textView) - 1,
-			};
-			Win.Add (labelMirroringTextView);
-
-			// Use ContentChanged to detect if the user has typed something in a TextView.
-			// The TextChanged property is only fired if the TextView.Text property is
-			// explicitly set
-			textView.ContentsChanged += (s, a) => {
-				labelMirroringTextView.Enabled = !labelMirroringTextView.Enabled;
-				labelMirroringTextView.Text = textView.Text;
-			};
-
-			// By default TextView is a multi-line control. It can be forced to 
-			// single-line mode.
-			var chxMultiline = new CheckBox ("Multiline") {
-				X = Pos.Left (textView),
-				Y = Pos.Bottom (textView),
-				Checked = textView.Multiline
-			};
-			Win.Add (chxMultiline);
-
-			var chxWordWrap = new CheckBox ("Word Wrap") {
-				X = Pos.Right (chxMultiline) + 2,
-				Y = Pos.Top (chxMultiline),
-				Checked = textView.WordWrap
-			};
-			chxWordWrap.Toggled += (s, e) => textView.WordWrap = (bool)e.NewValue;
-			Win.Add (chxWordWrap);
-
-			// TextView captures Tabs (so users can enter /t into text) by default;
-			// This means using Tab to navigate doesn't work by default. This shows
-			// how to turn tab capture off.
-			var chxCaptureTabs = new CheckBox ("Capture Tabs") {
-				X = Pos.Right (chxWordWrap) + 2,
-				Y = Pos.Top (chxWordWrap),
-				Checked = textView.AllowsTab
-			};
-
-			chxMultiline.Toggled += (s, e) => {
-				textView.Multiline = (bool)e.NewValue;
-				if (!textView.Multiline && (bool)chxWordWrap.Checked) {
-					chxWordWrap.Checked = false;
-				}
-				if (!textView.Multiline && (bool)chxCaptureTabs.Checked) {
-					chxCaptureTabs.Checked = false;
-				}
-			};
-
-			var keyTab = textView.KeyBindings.GetKeyFromCommands (Command.Tab);
-			var keyBackTab = textView.KeyBindings.GetKeyFromCommands (Command.BackTab);
-			chxCaptureTabs.Toggled += (s, e) => {
-				if (e.NewValue == true) {
-					textView.KeyBindings.Add (keyTab, Command.Tab);
-					textView.KeyBindings.Add (keyBackTab, Command.BackTab);
-				} else {
-					textView.KeyBindings.Remove (keyTab);
-					textView.KeyBindings.Remove (keyBackTab);
-				}
-				textView.AllowsTab = (bool)e.NewValue;
-			};
-			Win.Add (chxCaptureTabs);
-
-			var hexEditor = new HexView (new MemoryStream (Encoding.UTF8.GetBytes ("HexEditor Unicode that shouldn't 𝔹Aℝ𝔽!"))) {
-				X = 1,
-				Y = Pos.Bottom (chxMultiline) + 1,
-				Width = Dim.Percent (50) - 1,
-				Height = Dim.Percent (30),
-			};
-			Win.Add (hexEditor);
-
-			var labelMirroringHexEditor = new Label () {
-				X = Pos.Right (hexEditor) + 1,
-				Y = Pos.Top (hexEditor),
-				Width = Dim.Fill (1) - 1,
-				Height = Dim.Height (hexEditor) - 1,
-			};
+		};
+
+		var keyTab = textView.KeyBindings.GetKeyFromCommands (Command.Tab);
+		var keyBackTab = textView.KeyBindings.GetKeyFromCommands (Command.BackTab);
+		chxCaptureTabs.Toggled += (s, e) => {
+			if (e.NewValue == true) {
+				textView.KeyBindings.Add (keyTab, Command.Tab);
+				textView.KeyBindings.Add (keyBackTab, Command.BackTab);
+			} else {
+				textView.KeyBindings.Remove (keyTab);
+				textView.KeyBindings.Remove (keyBackTab);
+			}
+			textView.AllowsTab = (bool)e.NewValue;
+		};
+		Win.Add (chxCaptureTabs);
+
+		var hexEditor = new HexView (new MemoryStream (Encoding.UTF8.GetBytes ("HexEditor Unicode that shouldn't 𝔹Aℝ𝔽!"))) {
+			X = 1,
+			Y = Pos.Bottom (chxMultiline) + 1,
+			Width = Dim.Percent (50) - 1,
+			Height = Dim.Percent (30)
+		};
+		Win.Add (hexEditor);
+
+		var labelMirroringHexEditor = new Label {
+			X = Pos.Right (hexEditor) + 1,
+			Y = Pos.Top (hexEditor),
+			Width = Dim.Fill (1) - 1,
+			Height = Dim.Height (hexEditor) - 1
+		};
+		var array = ((MemoryStream)hexEditor.Source).ToArray ();
+		labelMirroringHexEditor.Text = Encoding.UTF8.GetString (array, 0, array.Length);
+		hexEditor.Edited += (s, kv) => {
+			hexEditor.ApplyEdits ();
 			var array = ((MemoryStream)hexEditor.Source).ToArray ();
 			labelMirroringHexEditor.Text = Encoding.UTF8.GetString (array, 0, array.Length);
-			hexEditor.Edited += (s, kv) => {
-				hexEditor.ApplyEdits ();
-				var array = ((MemoryStream)hexEditor.Source).ToArray ();
-				labelMirroringHexEditor.Text = Encoding.UTF8.GetString (array, 0, array.Length);
-			};
-			Win.Add (labelMirroringHexEditor);
-
-			var dateField = new DateField (System.DateTime.Now) {
-				X = 1,
-				Y = Pos.Bottom (hexEditor) + 1,
-				Width = 20,
-				IsShortFormat = false
-			};
-			Win.Add (dateField);
-
-			var labelMirroringDateField = new Label (dateField.Text) {
-				X = Pos.Right (dateField) + 1,
-				Y = Pos.Top (dateField),
-				Width = Dim.Width (dateField),
-				Height = Dim.Height (dateField),
-			};
-			Win.Add (labelMirroringDateField);
-
-			dateField.TextChanged += (s, prev) => {
-				labelMirroringDateField.Text = dateField.Text;
-			};
-
-			_timeField = new TimeField (DateTime.Now.TimeOfDay) {
-				X = Pos.Right (labelMirroringDateField) + 5,
-				Y = Pos.Bottom (hexEditor) + 1,
-				Width = 20,
-				IsShortFormat = false
-			};
-			Win.Add (_timeField);
-
-			_labelMirroringTimeField = new Label (_timeField.Text) {
-				X = Pos.Right (_timeField) + 1,
-				Y = Pos.Top (_timeField),
-				Width = Dim.Width (_timeField),
-				Height = Dim.Height (_timeField),
-			};
-			Win.Add (_labelMirroringTimeField);
-
-			_timeField.TimeChanged += TimeChanged;
-
-			// MaskedTextProvider - uses .NET MaskedTextProvider
-			var netProviderLabel = new Label ("NetMaskedTextProvider [ 999 000 LLL >LLL| AAA aaa ]") {
-				X = Pos.Left (dateField),
-				Y = Pos.Bottom (dateField) + 1
-			};
-			Win.Add (netProviderLabel);
-
-			var netProvider = new NetMaskedTextProvider ("999 000 LLL > LLL | AAA aaa");
-
-			var netProviderField = new TextValidateField (netProvider) {
-				X = Pos.Right (netProviderLabel) + 1,
-				Y = Pos.Y (netProviderLabel),
-			};
-
-			Win.Add (netProviderField);
-
-			// TextRegexProvider - Regex provider implemented by Terminal.Gui
-			var regexProvider = new Label ("TextRegexProvider [ ^([0-9]?[0-9]?[0-9]|1000)$ ]") {
-				X = Pos.Left (netProviderLabel),
-				Y = Pos.Bottom (netProviderLabel) + 1
-			};
-			Win.Add (regexProvider);
-
-			var provider2 = new TextRegexProvider ("^([0-9]?[0-9]?[0-9]|1000)$") { ValidateOnInput = false };
-			var regexProviderField = new TextValidateField (provider2) {
-				X = Pos.Right (regexProvider) + 1,
-				Y = Pos.Y (regexProvider),
-				Width = 30,
-				TextAlignment = TextAlignment.Centered
-			};
-
-			Win.Add (regexProviderField);
-
-			var labelAppendAutocomplete = new Label ("Append Autocomplete:") {
-				Y = Pos.Y (regexProviderField) + 2,
-				X = 1
-			};
-			var appendAutocompleteTextField = new TextField () {
-				X = Pos.Right (labelAppendAutocomplete),
-				Y = labelAppendAutocomplete.Y,
-				Width = Dim.Fill ()
-			};
-			appendAutocompleteTextField.Autocomplete = new AppendAutocomplete (appendAutocompleteTextField);
-			appendAutocompleteTextField.Autocomplete.SuggestionGenerator = new SingleWordSuggestionGenerator {
-				AllSuggestions = new System.Collections.Generic.List<string>{
-					"fish", "flipper", "fin","fun","the","at","there","some","my","of","be","use","her","than","and","this","an","would","first","have","each","make","water","to","from","which","like","been","in","or","she","him","call","is","one","do","into","who","you","had","how","time","oil","that","by","their","has","its","it","word","if","look","now","he","but","will","two","find","was","not","up","more","long","for","what","other","write","down","on","all","about","go","day","are","were","out","see","did","as","we","many","number","get","with","when","then","no","come","his","your","them","way","made","they","can","these","could","may","said","so","people","part"
-				}
-			};
-
-			Win.Add (labelAppendAutocomplete);
-			Win.Add (appendAutocompleteTextField);
-		}
-
-		TimeField _timeField;
-		Label _labelMirroringTimeField;
+		};
+		Win.Add (labelMirroringHexEditor);
+
+		var dateField = new DateField (DateTime.Now) {
+			X = 1,
+			Y = Pos.Bottom (hexEditor) + 1,
+			Width = 20,
+			IsShortFormat = false
+		};
+		Win.Add (dateField);
+
+		var labelMirroringDateField = new Label (dateField.Text) {
+			X = Pos.Right (dateField) + 1,
+			Y = Pos.Top (dateField),
+			Width = Dim.Width (dateField),
+			Height = Dim.Height (dateField)
+		};
+		Win.Add (labelMirroringDateField);
+
+		dateField.TextChanged += (s, prev) => {
+			labelMirroringDateField.Text = dateField.Text;
+		};
+
+		_timeField = new TimeField (DateTime.Now.TimeOfDay) {
+			X = Pos.Right (labelMirroringDateField) + 5,
+			Y = Pos.Bottom (hexEditor) + 1,
+			Width = 20,
+			IsShortFormat = false
+		};
+		Win.Add (_timeField);
+
+		_labelMirroringTimeField = new Label (_timeField.Text) {
+			X = Pos.Right (_timeField) + 1,
+			Y = Pos.Top (_timeField),
+			Width = Dim.Width (_timeField),
+			Height = Dim.Height (_timeField)
+		};
+		Win.Add (_labelMirroringTimeField);
+
+		_timeField.TimeChanged += TimeChanged;
+
+		// MaskedTextProvider - uses .NET MaskedTextProvider
+		var netProviderLabel = new Label ("NetMaskedTextProvider [ 999 000 LLL >LLL| AAA aaa ]") {
+			X = Pos.Left (dateField),
+			Y = Pos.Bottom (dateField) + 1
+		};
+		Win.Add (netProviderLabel);
+
+		var netProvider = new NetMaskedTextProvider ("999 000 LLL > LLL | AAA aaa");
+
+		var netProviderField = new TextValidateField (netProvider) {
+			X = Pos.Right (netProviderLabel) + 1,
+			Y = Pos.Y (netProviderLabel)
+		};
+
+		Win.Add (netProviderField);
+
+		// TextRegexProvider - Regex provider implemented by Terminal.Gui
+		var regexProvider = new Label ("TextRegexProvider [ ^([0-9]?[0-9]?[0-9]|1000)$ ]") {
+			X = Pos.Left (netProviderLabel),
+			Y = Pos.Bottom (netProviderLabel) + 1
+		};
+		Win.Add (regexProvider);
+
+		var provider2 = new TextRegexProvider ("^([0-9]?[0-9]?[0-9]|1000)$") { ValidateOnInput = false };
+		var regexProviderField = new TextValidateField (provider2) {
+			X = Pos.Right (regexProvider) + 1,
+			Y = Pos.Y (regexProvider),
+			Width = 30,
+			TextAlignment = TextAlignment.Centered
+		};
+
+		Win.Add (regexProviderField);
+
+		var labelAppendAutocomplete = new Label ("Append Autocomplete:") {
+			Y = Pos.Y (regexProviderField) + 2,
+			X = 1
+		};
+		var appendAutocompleteTextField = new TextField {
+			X = Pos.Right (labelAppendAutocomplete),
+			Y = Pos.Bottom (labelAppendAutocomplete),
+			Width = Dim.Fill ()
+		};
+		appendAutocompleteTextField.Autocomplete = new AppendAutocomplete (appendAutocompleteTextField);
+		appendAutocompleteTextField.Autocomplete.SuggestionGenerator = new SingleWordSuggestionGenerator {
+			AllSuggestions = new List<string> {
+				"fish", "flipper", "fin", "fun", "the", "at", "there", "some", "my", "of", "be", "use", "her", "than", "and", "this", "an", "would", "first", "have", "each", "make", "water", "to", "from", "which", "like", "been", "in", "or", "she", "him", "call", "is", "one", "do", "into", "who", "you", "had", "how", "time", "oil", "that", "by", "their", "has", "its", "it", "word", "if", "look", "now", "he", "but", "will", "two", "find", "was", "not", "up", "more", "long", "for", "what", "other", "write",
+				"down", "on", "all", "about", "go", "day", "are", "were", "out", "see", "did", "as", "we", "many", "number", "get", "with", "when", "then", "no", "come", "his", "your", "them", "way", "made", "they", "can", "these", "could", "may", "said", "so", "people", "part"
+			}
+		};
 
-		private void TimeChanged (object sender, DateTimeEventArgs<TimeSpan> e)
-		{
-			_labelMirroringTimeField.Text = _timeField.Text;
-		}
+		Win.Add (labelAppendAutocomplete);
+		Win.Add (appendAutocompleteTextField);
 	}
-}
+
+	void TimeChanged (object sender, DateTimeEventArgs<TimeSpan> e) => _labelMirroringTimeField.Text = _timeField.Text;
+}

UICatalog/UICatalog.cs

@@ -63,6 +63,8 @@ class UICatalogApp {
 		/* etc. */
 	}
 
+	static Options _options;
+
 	static int Main (string [] args)
 	{
 		Console.OutputEncoding = Encoding.Default;
@@ -101,21 +103,13 @@ class UICatalogApp {
 				Scenario = context.ParseResult.GetValueForArgument (scenarioArgument),
 				/* etc. */
 			};
-			context.ExitCode = CommandWrapper (options);
+			// See https://github.com/dotnet/command-line-api/issues/796 for the rationale behind this hackery
+			_options = options; ;
 		});
 
-		return rootCommand.Invoke (args);
-	}
+		rootCommand.Invoke (args);
 
-	// See https://github.com/dotnet/command-line-api/issues/796 for the rationale behind this hackery
-	static int CommandWrapper (Options options)
-	{
-		try {
-			UICatalogMain (options);
-		} catch (Exception e) {
-			Console.WriteLine (e.ToString());
-			return 1;
-		}
+		UICatalogMain (_options);
 		return 0;
 	}
 

UnitTests/Application/ApplicationTests.cs

@@ -570,8 +570,6 @@ public class ApplicationTests {
 	public void Begin_Sets_Application_Top_To_Console_Size ()
 	{
 		Assert.Equal (new Rect (0, 0, 80, 25), Application.Top.Frame);
-
-		((FakeDriver)Application.Driver).SetBufferSize (5, 5);
 		Application.Begin (Application.Top);
 		Assert.Equal (new Rect (0, 0, 80, 25), Application.Top.Frame);
 		((FakeDriver)Application.Driver).SetBufferSize (5, 5);

UnitTests/Application/KeyboardTests.cs

@@ -16,7 +16,7 @@ public class KeyboardTests {
 		RunState.Instances.Clear ();
 #endif
 	}
-	
+
 	[Fact]
 	public void KeyUp_Event ()
 	{
@@ -193,7 +193,7 @@ public class KeyboardTests {
 		Assert.True (isQuiting);
 
 		isQuiting = false;
-		Application.OnKeyDown(new Key ( KeyCode.Q | KeyCode.CtrlMask));
+		Application.OnKeyDown (new Key (KeyCode.Q | KeyCode.CtrlMask));
 		Assert.True (isQuiting);
 
 		isQuiting = false;
@@ -332,7 +332,7 @@ public class KeyboardTests {
 		var view = new ScopedKeyBindingView ();
 		var invoked = false;
 		view.InvokingKeyBindings += (s, e) => invoked = true;
-		
+
 		Application.Top.Add (view);
 		Application.Begin (Application.Top);
 

UnitTests/Dialogs/DialogTests.cs

@@ -1,35 +1,13 @@
-using Xunit;
+using Xunit;
 using Xunit.Abstractions;
 using static Terminal.Gui.Application;
 
-namespace Terminal.Gui.DialogTests; 
+namespace Terminal.Gui.DialogTests;
 
 public class DialogTests {
-	readonly ITestOutputHelper output;
+	readonly ITestOutputHelper _output;
 
-	public DialogTests (ITestOutputHelper output) => this.output = output;
-
-	//[Fact]
-	//[AutoInitShutdown]
-	//public void Default_Has_Border ()
-	//{
-	//	var d = (FakeDriver)Application.Driver;
-	//	d.SetBufferSize (20, 5);
-	//	Application.RunState runstate = null;
-
-	//	var title = "Title";
-	//	var btnText = "ok";
-	//	var buttonRow = $"{CM.Glyphs.VLine}{CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket}{CM.Glyphs.VLine}";
-	//	var width = buttonRow.Length;
-	//	var topRow = $"┌┤{title} {new string (d.HLine.ToString () [0], width - title.Length - 2)}├┐";
-	//	var bottomRow = $"└{new string (d.HLine.ToString () [0], width - 2)}┘";
-
-	//	var dlg = new Dialog (title, new Button (btnText));
-	//	Application.Begin (dlg);
-
-	//	TestHelpers.AssertDriverContentsWithFrameAre ($"{topRow}\n{buttonRow}\n{bottomRow}", output);
-	//	Application.End (runstate);
-	//}
+	public DialogTests (ITestOutputHelper output) => _output = output;
 
 	(RunState, Dialog) RunButtonTestDialog (string title, int width, Dialog.ButtonAlignments align, params Button [] btns)
 	{
@@ -125,7 +103,7 @@ public class DialogTests {
      │   │
      │   │
      │   │
-     └───┘", output);
+     └───┘", _output);
 	}
 
 	[Fact]
@@ -158,7 +136,7 @@ public class DialogTests {
 ║    │   │         ║
 ║    └───┘         ║
 ║                  ║
-╚══════════════════╝", output);
+╚══════════════════╝", _output);
 
 				d = new Dialog {
 					X = 5,
@@ -168,18 +146,33 @@ public class DialogTests {
 
 				// This is because of PostionTopLevels and EnsureVisibleBounds
 				Assert.Equal (new Point (3, 2), d.Frame.Location);
-				Assert.Equal (new Size (17, 8), d.Frame.Size);
+				// #3127: Before					
+				//					Assert.Equal (new Size (17, 8), d.Frame.Size);
+				//					TestHelpers.AssertDriverContentsWithFrameAre (@"
+				//╔══════════════════╗
+				//║                  ║
+				//║  ┌───────────────┐
+				//║  │               │
+				//║  │               │
+				//║  │               │
+				//║  │               │
+				//║  │               │
+				//║  │               │
+				//╚══└───────────────┘", _output);
+
+				// #3127: After: Because Toplevel is now Width/Height = Dim.Filll
+				Assert.Equal (new Size (15, 6), d.Frame.Size);
 				TestHelpers.AssertDriverContentsWithFrameAre (@"
 ╔══════════════════╗
 ║                  ║
-║  ┌───────────────┐
-║  │               │
-║  │               │
-║  │               │
-║  │               │
-║  │               │
-║  │               │
-╚══└───────────────┘", output);
+║  ┌─────────────┐ ║
+║  │             │ ║
+║  │             │ ║
+║  │             │ ║
+║  │             │ ║
+║  └─────────────┘ ║
+║                  ║
+╚══════════════════╝", _output);
 
 			} else if (iterations > 0) {
 				RequestStop ();
@@ -208,28 +201,28 @@ public class DialogTests {
 
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, new Button (btnText));
 		// Center
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Justify 
 		buttonRow = $"{CM.Glyphs.VLine}    {CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Justify, new Button (btnText));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Right
 		buttonRow = $"{CM.Glyphs.VLine}    {CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, new Button (btnText));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Left
 		buttonRow = $"{CM.Glyphs.VLine}{CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket}    {CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, new Button (btnText));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Wider
@@ -239,28 +232,28 @@ public class DialogTests {
 		d.SetBufferSize (width, 1);
 
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, new Button (btnText));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Justify
 		buttonRow = $"{CM.Glyphs.VLine}      {CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Justify, new Button (btnText));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Right
 		buttonRow = $"{CM.Glyphs.VLine}      {CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, new Button (btnText));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Left
 		buttonRow = $"{CM.Glyphs.VLine}{CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket}      {CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, new Button (btnText));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 	}
 
@@ -285,28 +278,28 @@ public class DialogTests {
 		d.SetBufferSize (buttonRow.Length, 3);
 
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, new Button (btn1Text), new Button (btn2Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Justify
 		buttonRow = $@"{CM.Glyphs.VLine}{btn1}   {btn2}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Justify, new Button (btn1Text), new Button (btn2Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Right
 		buttonRow = $@"{CM.Glyphs.VLine}  {btn1} {btn2}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, new Button (btn1Text), new Button (btn2Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Left
 		buttonRow = $@"{CM.Glyphs.VLine}{btn1} {btn2}  {CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, new Button (btn1Text), new Button (btn2Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 	}
 
@@ -341,7 +334,7 @@ public class DialogTests {
 		button1.Visible = false;
 		RunIteration (ref runstate, ref firstIteration);
 		buttonRow = $@"{CM.Glyphs.VLine}         {btn2} {CM.Glyphs.VLine}";
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Justify
@@ -352,7 +345,7 @@ public class DialogTests {
 		button1.Visible = false;
 		RunIteration (ref runstate, ref firstIteration);
 		buttonRow = $@"{CM.Glyphs.VLine}          {btn2}{CM.Glyphs.VLine}";
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Right
@@ -362,7 +355,7 @@ public class DialogTests {
 		(runstate, dlg) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, button1, button2);
 		button1.Visible = false;
 		RunIteration (ref runstate, ref firstIteration);
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Left
@@ -373,7 +366,7 @@ public class DialogTests {
 		button1.Visible = false;
 		RunIteration (ref runstate, ref firstIteration);
 		buttonRow = $@"{CM.Glyphs.VLine}        {btn2}  {CM.Glyphs.VLine}";
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 	}
 
@@ -400,28 +393,28 @@ public class DialogTests {
 		d.SetBufferSize (buttonRow.Length, 3);
 
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Justify
 		buttonRow = $@"{CM.Glyphs.VLine}{btn1}  {btn2}  {btn3}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Justify, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Right
 		buttonRow = $@"{CM.Glyphs.VLine}  {btn1} {btn2} {btn3}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Left
 		buttonRow = $@"{CM.Glyphs.VLine}{btn1} {btn2} {btn3}  {CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 	}
 
@@ -451,28 +444,28 @@ public class DialogTests {
 
 		// Default - Center
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Justify
 		buttonRow = $"{CM.Glyphs.VLine}{btn1} {btn2}  {btn3}  {btn4}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Justify, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Right
 		buttonRow = $"{CM.Glyphs.VLine}  {btn1} {btn2} {btn3} {btn4}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Left
 		buttonRow = $"{CM.Glyphs.VLine}{btn1} {btn2} {btn3} {btn4}  {CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 	}
 
@@ -504,26 +497,26 @@ public class DialogTests {
 		buttonRow = $"{CM.Glyphs.VLine}es {CM.Glyphs.RightBracket} {btn2} {btn3} {CM.Glyphs.LeftBracket} neve{CM.Glyphs.VLine}";
 		(runstate, var dlg) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
 		Assert.Equal (new Size (width, 1), dlg.Frame.Size);
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Justify
 		buttonRow =
 			$"{CM.Glyphs.VLine}{CM.Glyphs.LeftBracket} yes {CM.Glyphs.LeftBracket} no {CM.Glyphs.LeftBracket} maybe {CM.Glyphs.LeftBracket} never {CM.Glyphs.RightBracket}{CM.Glyphs.VLine}";
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Justify, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Right
 		buttonRow = $"{CM.Glyphs.VLine}{CM.Glyphs.RightBracket} {btn2} {btn3} {btn4}{CM.Glyphs.VLine}";
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Left
 		buttonRow = $"{CM.Glyphs.VLine}{btn1} {btn2} {btn3} {CM.Glyphs.LeftBracket} n{CM.Glyphs.VLine}";
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 	}
 
@@ -556,28 +549,28 @@ public class DialogTests {
 
 		// Default - Center
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Justify
 		buttonRow = $"{CM.Glyphs.VLine}{btn1}     {btn2}     {btn3}     {btn4}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.GetColumns ());
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Justify, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Right
 		buttonRow = $"{CM.Glyphs.VLine}            {btn1} {btn2} {btn3} {btn4}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.GetColumns ());
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Left
 		buttonRow = $"{CM.Glyphs.VLine}{btn1} {btn2} {btn3} {btn4}            {CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.GetColumns ());
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 	}
 
@@ -609,28 +602,28 @@ public class DialogTests {
 
 		// Default - Center
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Justify
 		buttonRow = $"{CM.Glyphs.VLine}{btn1}     {btn2}     {btn3}     {btn4}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Justify, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Right
 		buttonRow = $"{CM.Glyphs.VLine}            {btn1} {btn2} {btn3} {btn4}{CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Right, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Left
 		buttonRow = $"{CM.Glyphs.VLine}{btn1} {btn2} {btn3} {btn4}            {CM.Glyphs.VLine}";
 		Assert.Equal (width, buttonRow.Length);
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Left, new Button (btn1Text), new Button (btn2Text), new Button (btn3Text), new Button (btn4Text));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 	}
 
@@ -649,7 +642,7 @@ public class DialogTests {
 		d.SetBufferSize (buttonRow.Length, 3);
 
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, null);
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 
 		End (runstate);
 	}
@@ -670,7 +663,7 @@ public class DialogTests {
 		d.SetBufferSize (buttonRow.Length, 10);
 
 		(runstate, var _) = RunButtonTestDialog (title, width, Dialog.ButtonAlignments.Center, new Button (btnText));
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 	}
 
@@ -698,14 +691,14 @@ public class DialogTests {
 		dlg.Border.Thickness = new Thickness (1, 0, 1, 0);
 		runstate = Begin (dlg);
 		var buttonRow = $"{CM.Glyphs.VLine}     {btn1}    {CM.Glyphs.VLine}";
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 
 		// Now add a second button
 		buttonRow = $"{CM.Glyphs.VLine} {btn1} {btn2} {CM.Glyphs.VLine}";
 		dlg.AddButton (new Button (btn2Text));
 		var first = false;
 		RunIteration (ref runstate, ref first);
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Justify
@@ -714,14 +707,14 @@ public class DialogTests {
 		dlg.Border.Thickness = new Thickness (1, 0, 1, 0);
 		runstate = Begin (dlg);
 		buttonRow = $"{CM.Glyphs.VLine}         {btn1}{CM.Glyphs.VLine}";
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 
 		// Now add a second button
 		buttonRow = $"{CM.Glyphs.VLine}{btn1}   {btn2}{CM.Glyphs.VLine}";
 		dlg.AddButton (new Button (btn2Text));
 		first = false;
 		RunIteration (ref runstate, ref first);
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Right
@@ -730,14 +723,14 @@ public class DialogTests {
 		dlg.Border.Thickness = new Thickness (1, 0, 1, 0);
 		runstate = Begin (dlg);
 		buttonRow = $"{CM.Glyphs.VLine}{new string (' ', width - btn1.Length - 2)}{btn1}{CM.Glyphs.VLine}";
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 
 		// Now add a second button
 		buttonRow = $"{CM.Glyphs.VLine}  {btn1} {btn2}{CM.Glyphs.VLine}";
 		dlg.AddButton (new Button (btn2Text));
 		first = false;
 		RunIteration (ref runstate, ref first);
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 
 		// Left
@@ -746,14 +739,14 @@ public class DialogTests {
 		dlg.Border.Thickness = new Thickness (1, 0, 1, 0);
 		runstate = Begin (dlg);
 		buttonRow = $"{CM.Glyphs.VLine}{btn1}{new string (' ', width - btn1.Length - 2)}{CM.Glyphs.VLine}";
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 
 		// Now add a second button
 		buttonRow = $"{CM.Glyphs.VLine}{btn1} {btn2}  {CM.Glyphs.VLine}";
 		dlg.AddButton (new Button (btn2Text));
 		first = false;
 		RunIteration (ref runstate, ref first);
-		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", output);
+		TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
 		End (runstate);
 	}
 
@@ -768,7 +761,8 @@ public class DialogTests {
 		}
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void Dialog_Opened_From_Another_Dialog ()
 	{
 		((FakeDriver)Driver).SetBufferSize (30, 10);
@@ -809,7 +803,7 @@ public class DialogTests {
   │                       │
   │{CM.Glyphs.LeftBracket} Show Sub {CM.Glyphs.RightBracket} {CM.Glyphs.LeftBracket} Close {CM.Glyphs.RightBracket} │
   └───────────────────────┘";
-				TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
+				TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
 
 				Assert.True (btn2.NewKeyDownEvent (new Key (KeyCode.Space)));
 			} else if (iterations == 2) {
@@ -821,15 +815,15 @@ public class DialogTests {
   │  │     {btn}     │ │
   │  └──────────────────┘ │
   │{CM.Glyphs.LeftBracket} Show Sub {CM.Glyphs.RightBracket} {CM.Glyphs.LeftBracket} Close {CM.Glyphs.RightBracket} │
-  └───────────────────────┘", output);
+  └───────────────────────┘", _output);
 
 				Assert.True (Current.NewKeyDownEvent (new Key (KeyCode.Enter)));
 			} else if (iterations == 3) {
-				TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
+				TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
 
 				Assert.True (btn3.NewKeyDownEvent (new Key (KeyCode.Space)));
 			} else if (iterations == 4) {
-				TestHelpers.AssertDriverContentsWithFrameAre ("", output);
+				TestHelpers.AssertDriverContentsWithFrameAre ("", _output);
 
 				RequestStop ();
 			}
@@ -841,7 +835,8 @@ public class DialogTests {
 		Assert.Equal (4, iterations);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void Dialog_In_Window_With_Size_One_Button_Aligns ()
 	{
 		((FakeDriver)Driver).SetBufferSize (20, 5);
@@ -867,7 +862,7 @@ public class DialogTests {
 ││     {btn}     ││
 │└────────────────┘│
 └──────────────────┘";
-				_ = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
+				_ = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
 			};
 
 			Run (dlg);
@@ -875,43 +870,74 @@ public class DialogTests {
 		Run (win);
 	}
 
-	//		[Theory, AutoInitShutdown]
-	//		[InlineData (5)]
-	//		//[InlineData (6)]
-	//		//[InlineData (7)]
-	//		//[InlineData (8)]
-	//		//[InlineData (9)]
-	//		public void Dialog_In_Window_Without_Size_One_Button_Aligns (int height)
-	//		{
-	//			((FakeDriver)Application.Driver).SetBufferSize (20, height);
-	//			var win = new Window ();
-
-	//			Application.Iteration += (s, a) => {
-	//				var dlg = new Dialog ("Test", new Button ("Ok"));
-
-	//				dlg.LayoutComplete += (s, a) => {
-	//					Application.Refresh ();
-	//					// BUGBUG: This seems wrong; is it a bug in Dim.Percent(85)??
-	//					var expected = @"
-	//┌┌┤Test├─────────┐─┐
-	//││               │ │
-	//││     [ Ok ]    │ │
-	//│└───────────────┘ │
-	//└──────────────────┘";
-	//					_ = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-
-	//					dlg.RequestStop ();
-	//					win.RequestStop ();
-	//				};
-
-	//				Application.Run (dlg);
-	//			};
-
-	//			Application.Run (win);
-	//			Application.Shutdown ();
-	//		}
-
-	[Fact] [AutoInitShutdown]
+	[Theory]
+	[AutoInitShutdown]
+	[InlineData (5, @"
+┌┌───────────────┐─┐
+││               │ │
+││     ⟦ Ok ⟧    │ │
+│└───────────────┘ │
+└──────────────────┘")]
+	[InlineData (6, @"
+┌┌───────────────┐─┐
+││               │ │
+││               │ │
+││     ⟦ Ok ⟧    │ │
+│└───────────────┘ │
+└──────────────────┘")]
+	[InlineData (7, @"
+┌──────────────────┐
+│┌───────────────┐ │
+││               │ │
+││               │ │
+││     ⟦ Ok ⟧    │ │
+│└───────────────┘ │
+└──────────────────┘")]
+	[InlineData (8, @"
+┌──────────────────┐
+│┌───────────────┐ │
+││               │ │
+││               │ │
+││               │ │
+││     ⟦ Ok ⟧    │ │
+│└───────────────┘ │
+└──────────────────┘")]
+	[InlineData (9, @"
+┌──────────────────┐
+│┌───────────────┐ │
+││               │ │
+││               │ │
+││               │ │
+││               │ │
+││     ⟦ Ok ⟧    │ │
+│└───────────────┘ │
+└──────────────────┘")]
+	public void Dialog_In_Window_Without_Size_One_Button_Aligns (int height, string expected)
+	{
+		((FakeDriver)Driver).SetBufferSize (20, height);
+		var win = new Window ();
+
+		var iterations = -1;
+		Iteration += (s, a) => {
+			iterations++;
+			if (iterations == 0) {
+				var dlg = new Dialog (new Button ("Ok"));
+				Run (dlg);
+			} else if (iterations == 1) {
+				// BUGBUG: This seems wrong; is it a bug in Dim.Percent(85)?? No
+				_ = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+			} else {
+				RequestStop ();
+			}
+		};
+
+		Run (win);
+	}
+
+	// TODO: This is not really a Dialog test, but a ViewLayout test (Width = Dim.Fill (1) - Dim.Function (Btn_Width))
+	// TODO: Move (and simplify)
+	[Fact]
+	[AutoInitShutdown]
 	public void Dialog_In_Window_With_TextField_And_Button_AnchorEnd ()
 	{
 		((FakeDriver)Driver).SetBufferSize (20, 5);
@@ -928,39 +954,60 @@ public class DialogTests {
 
 		win.Loaded += (s, a) => {
 			var dlg = new Dialog { Width = 18, Height = 3 };
+			Assert.Equal (16, dlg.Bounds.Width);
+
 			Button btn = null;
 			btn = new Button ("Ok") {
 				X = Pos.AnchorEnd () - Pos.Function (Btn_Width)
 			};
-			int Btn_Width () => btn?.Bounds.Width ?? 0;
+			btn.SetRelativeLayout (dlg.Bounds);
+			Assert.Equal (6, btn.Bounds.Width);
+			Assert.Equal (10, btn.Frame.X); // dlg.Bounds.Width (16) - btn.Frame.Width (6) = 10
+			Assert.Equal (0, btn.Frame.Y);
+			Assert.Equal (6, btn.Frame.Width);
+			Assert.Equal (1, btn.Frame.Height);
+			int Btn_Width ()
+			{
+				return btn?.Bounds.Width ?? 0;
+			}
 			var tf = new TextField ("01234567890123456789") {
+				// Dim.Fill (1) fills remaining space minus 1
+				// Dim.Function (Btn_Width) is 6
 				Width = Dim.Fill (1) - Dim.Function (Btn_Width)
 			};
+			tf.SetRelativeLayout (dlg.Bounds);
+			Assert.Equal (9, tf.Bounds.Width); // dlg.Bounds.Width (16) - Dim.Fill (1) - Dim.Function (6) = 9
+			Assert.Equal (0, tf.Frame.X);
+			Assert.Equal (0, tf.Frame.Y);
+			Assert.Equal (9, tf.Frame.Width);
+			Assert.Equal (1, tf.Frame.Height);
 
 			dlg.Loaded += (s, a) => {
 				Refresh ();
 				Assert.Equal (new Rect (10, 0, 6, 1), btn.Frame);
-				Assert.Equal (new Rect (0,  0, 6, 1), btn.Bounds);
-				var expected = @$"
+				Assert.Equal (new Rect (0, 0, 6, 1), btn.Bounds);
+
+				var expected = @"
 ┌──────────────────┐
 │┌────────────────┐│
-││23456789  {b}││
+││012345678 ⟦ Ok ⟧││
 │└────────────────┘│
 └──────────────────┘";
-				_ = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
+
+				_ = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
 
 				dlg.SetNeedsLayout ();
 				dlg.LayoutSubviews ();
 				Refresh ();
 				Assert.Equal (new Rect (10, 0, 6, 1), btn.Frame);
-				Assert.Equal (new Rect (0,  0, 6, 1), btn.Bounds);
-				expected = @$"
+				Assert.Equal (new Rect (0, 0, 6, 1), btn.Bounds);
+				expected = @"
 ┌──────────────────┐
 │┌────────────────┐│
-││23456789  {b}││
+││012345678 ⟦ Ok ⟧││
 │└────────────────┘│
 └──────────────────┘";
-				_ = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
+				_ = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
 			};
 			dlg.Add (btn, tf);
 
@@ -968,178 +1015,4 @@ public class DialogTests {
 		};
 		Run (win);
 	}
-
-	[Fact]
-	[AutoInitShutdown]
-	public void KeyBindings_Esc_Closes ()
-	{
-		// test that Esc is bound to the Cancel command
-		var dlg = new Dialog ();
-		var dlgClosed = false;
-		dlg.Closed += (s, e) => {
-			dlgClosed = true;
-		};
-
-		var iterations = 0;
-		Iteration += (s, a) => {
-			dlg.NewKeyDownEvent (Key.Esc);
-
-			if (++iterations > 1) {
-				Assert.Fail ();
-			}
-		};
-		Run (dlg);
-		Assert.True (dlgClosed);
-	}
-
-
-	[Fact]
-	[AutoInitShutdown]
-	public void KeyBindings_Enter_No_Default_Button_NoOp ()
-	{
-		// test that Enter does nothing if there's no default button
-		var dlg = new Dialog ();
-		var iterations = 0;
-		Iteration += (s, a) => {
-			if (++iterations > 1) {
-				// If we get here, the test passed
-				RequestStop ();
-			}
-			dlg.NewKeyDownEvent (Key.Enter);
-		};
-		Run (dlg);
-
-		Assert.Equal (2, iterations);
-	}
-
-	[Fact]
-	[AutoInitShutdown]
-	public void KeyBindings_Enter_Causes_Default_Button_Click ()
-	{
-		var dlg = new Dialog ();
-		var ok = new Button {
-			Text = "Ok",
-			IsDefault = true
-		};
-
-		var okClicked = false;
-		ok.Clicked += (s, e) => {
-			okClicked = true;
-			RequestStop ();
-		};
-
-		dlg.AddButton (ok);
-
-		var iterations = 0;
-		void JustButtonIteration (object sender, IterationEventArgs e)
-		{
-			if (++iterations > 1) {
-				Assert.Fail ();
-				RequestStop ();
-			}
-			Assert.True (ok.HasFocus);
-			dlg.NewKeyDownEvent (Key.Enter);
-		}
-
-		Iteration += JustButtonIteration;
-		Run (dlg);
-		Assert.True (okClicked);
-		Assert.Equal (1, iterations);
-		Iteration -= JustButtonIteration;
-		iterations = 0;
-		okClicked = false;
-
-		// Now try it without a default button being focused 
-		dlg = new Dialog ();
-		ok = new Button {
-			Text = "Ok",
-			IsDefault = true
-		};
-
-		ok.Clicked += (s, e) => {
-			okClicked = true;
-			RequestStop ();
-		};
-
-		dlg.AddButton (ok);
-
-		var focusableView = new View {
-			CanFocus = true
-		};
-
-		dlg.Add (focusableView);
-
-		void ButtonAndFocusableViewIteration (object sender, IterationEventArgs e)
-		{
-			if (++iterations > 1) {
-				Assert.Fail ();
-				RequestStop ();
-			}
-			focusableView.SetFocus ();
-			Assert.False (ok.HasFocus);
-			dlg.NewKeyDownEvent (Key.Enter);
-		}
-
-		Iteration += ButtonAndFocusableViewIteration;
-		Run (dlg);
-		Assert.Equal (1, iterations);
-		Iteration -= ButtonAndFocusableViewIteration;
-		iterations = 0;
-		okClicked = false;
-	}
-
-	[Fact]
-	[AutoInitShutdown]
-	public void KeyBindings_Enter_With_Focused_ViewThatEatsEnter_NoOp ()
-	{
-		var dlg = new Dialog ();
-		var ok = new Button {
-			Text = "Ok",
-			IsDefault = true
-		};
-
-		// Now try it without a default button being focused, with a view that 
-		// handles Enter. 
-		dlg = new Dialog ();
-		ok = new Button {
-			Text = "Ok",
-			IsDefault = true
-		};
-
-		var okClicked = false;
-		ok.Clicked += (s, e) => {
-			okClicked = true;
-			RequestStop ();
-		};
-
-		dlg.AddButton (ok);
-
-		var focusableView = new ViewThatEatsEnter ();
-
-		dlg.Add (focusableView);
-
-		var iterations = 0;
-		void Iteration (object sender, IterationEventArgs e)
-		{
-			if (++iterations > 1) {
-				RequestStop ();
-			}
-			focusableView.SetFocus ();
-			dlg.NewKeyDownEvent (Key.Enter);
-		}
-
-		Application.Iteration += Iteration;
-		Run (dlg);
-		Assert.Equal (2, iterations);
-		Assert.False (okClicked);
-	}
-
-	class ViewThatEatsEnter : View {
-		public ViewThatEatsEnter ()
-		{
-			CanFocus = true;
-			AddCommand (Command.Select, () => true);
-			KeyBindings.Add (Key.Enter, Command.Select);
-		}
-	}
 }

UnitTests/Dialogs/MessageBoxTests.cs

@@ -644,7 +644,7 @@ ffffffffffffffffffff
 				Application.OnKeyDown (Key.Tab);
 				Application.OnKeyDown (Key.Enter);
 				break;
-			
+
 			default:
 				Assert.Fail ();
 				break;
@@ -672,7 +672,7 @@ ffffffffffffffffffff
 				result = MessageBox.Query (title: string.Empty, message: string.Empty, defaultButton: 0, wrapMessage: false, "btn0", "btn1");
 				Application.RequestStop ();
 				break;
-				
+
 			case 2:
 				// Tab to btn2
 				Application.OnKeyDown (Key.Tab);

UnitTests/Input/KeyBindingTests.cs

@@ -225,7 +225,7 @@ public class KeyBindingTests {
 		Assert.Empty (keyBindings.GetCommands (Key.D));
 		Assert.Contains (Command.Default, keyBindings.GetCommands (Key.E));
 	}
-	
+
 	// TryGet
 	[Fact]
 	public void TryGet_Unknown_ReturnsFalse ()

UnitTests/Text/TextFormatterTests.cs

@@ -1,100 +1,96 @@
-using System.Text;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Xunit;
 using Xunit.Abstractions;
-
 // Alias Console to MockConsole so we don't accidentally use Console
 using Console = Terminal.Gui.FakeConsole;
 
-namespace Terminal.Gui.TextTests {
-	public class TextFormatterTests {
-		readonly ITestOutputHelper output;
+namespace Terminal.Gui.TextTests;
 
-		public TextFormatterTests (ITestOutputHelper output)
-		{
-			this.output = output;
-		}
+public class TextFormatterTests {
+	readonly ITestOutputHelper _output;
 
-		[Fact]
-		public void Basic_Usage ()
-		{
-			var testText = "test";
-			var expectedSize = new Size ();
-			var testBounds = new Rect (0, 0, 100, 1);
-			var tf = new TextFormatter ();
-
-			tf.Text = testText;
-			expectedSize = new Size (testText.Length, 1);
-			Assert.Equal (testText, tf.Text);
-			Assert.Equal (TextAlignment.Left, tf.Alignment);
-			Assert.Equal (expectedSize, tf.Size);
-			tf.Draw (testBounds, new Attribute (), new Attribute ());
-			Assert.Equal (expectedSize, tf.Size);
-			Assert.NotEmpty (tf.Lines);
-
-			tf.Alignment = TextAlignment.Right;
-			expectedSize = new Size (testText.Length, 1);
-			Assert.Equal (testText, tf.Text);
-			Assert.Equal (TextAlignment.Right, tf.Alignment);
-			Assert.Equal (expectedSize, tf.Size);
-			tf.Draw (testBounds, new Attribute (), new Attribute ());
-			Assert.Equal (expectedSize, tf.Size);
-			Assert.NotEmpty (tf.Lines);
-
-			tf.Alignment = TextAlignment.Right;
-			expectedSize = new Size (testText.Length * 2, 1);
-			tf.Size = expectedSize;
-			Assert.Equal (testText, tf.Text);
-			Assert.Equal (TextAlignment.Right, tf.Alignment);
-			Assert.Equal (expectedSize, tf.Size);
-			tf.Draw (testBounds, new Attribute (), new Attribute ());
-			Assert.Equal (expectedSize, tf.Size);
-			Assert.NotEmpty (tf.Lines);
-
-			tf.Alignment = TextAlignment.Centered;
-			expectedSize = new Size (testText.Length * 2, 1);
-			tf.Size = expectedSize;
-			Assert.Equal (testText, tf.Text);
-			Assert.Equal (TextAlignment.Centered, tf.Alignment);
-			Assert.Equal (expectedSize, tf.Size);
-			tf.Draw (testBounds, new Attribute (), new Attribute ());
-			Assert.Equal (expectedSize, tf.Size);
-			Assert.NotEmpty (tf.Lines);
-		}
+	public TextFormatterTests (ITestOutputHelper output) => _output = output;
 
-		[Theory]
-		[InlineData (TextDirection.LeftRight_TopBottom, false)]
-		[InlineData (TextDirection.LeftRight_TopBottom, true)]
-		[InlineData (TextDirection.TopBottom_LeftRight, false)]
-		[InlineData (TextDirection.TopBottom_LeftRight, true)]
-		public void TestSize_TextChange (TextDirection textDirection, bool autoSize)
-		{
-			var tf = new TextFormatter () { Direction = textDirection, Text = "你", AutoSize = autoSize };
-			Assert.Equal (2, tf.Size.Width);
-			Assert.Equal (1, tf.Size.Height);
-			tf.Text = "你你";
-			if (autoSize) {
-				if (textDirection == TextDirection.LeftRight_TopBottom) {
-					Assert.Equal (4, tf.Size.Width);
-					Assert.Equal (1, tf.Size.Height);
-				} else {
-					Assert.Equal (2, tf.Size.Width);
-					Assert.Equal (2, tf.Size.Height);
-				}
-			} else {
-				Assert.Equal (2, tf.Size.Width);
-				Assert.Equal (1, tf.Size.Height);
+	public static IEnumerable<object []> CMGlyphs =>
+		new List<object []> {
+			new object [] { $"{CM.Glyphs.LeftBracket} Say Hello 你 {CM.Glyphs.RightBracket}", 16, 15 }
+		};
+
+	public static IEnumerable<object []> FormatEnvironmentNewLine =>
+		new List<object []> {
+			new object [] { $"Line1{Environment.NewLine}Line2{Environment.NewLine}Line3{Environment.NewLine}", 60, new [] { "Line1", "Line2", "Line3" } }
+		};
+
+	public static IEnumerable<object []> SplitEnvironmentNewLine =>
+		new List<object []> {
+			new object [] { $"First Line 界{Environment.NewLine}Second Line 界{Environment.NewLine}Third Line 界", new [] { "First Line 界", "Second Line 界", "Third Line 界" } },
+			new object [] {
+				$"First Line 界{Environment.NewLine}Second Line 界{Environment.NewLine}Third Line 界{Environment.NewLine}", new [] { "First Line 界", "Second Line 界", "Third Line 界", "" }
 			}
-		}
+		};
 
-		[Theory]
-		[InlineData (TextDirection.LeftRight_TopBottom)]
-		[InlineData (TextDirection.TopBottom_LeftRight)]
-		public void TestSize_AutoSizeChange (TextDirection textDirection)
-		{
-			var tf = new TextFormatter () { Direction = textDirection, Text = "你你" };
+	[Fact]
+	public void Basic_Usage ()
+	{
+		var testText = "test";
+		var expectedSize = new Size ();
+		var testBounds = new Rect (0, 0, 100, 1);
+		var tf = new TextFormatter ();
+
+		tf.Text = testText;
+		expectedSize = new Size (testText.Length, 1);
+		Assert.Equal (testText, tf.Text);
+		Assert.Equal (TextAlignment.Left, tf.Alignment);
+		Assert.Equal (expectedSize, tf.Size);
+		tf.Draw (testBounds, new Attribute (), new Attribute ());
+		Assert.Equal (expectedSize, tf.Size);
+		Assert.NotEmpty (tf.Lines);
+
+		tf.Alignment = TextAlignment.Right;
+		expectedSize = new Size (testText.Length, 1);
+		Assert.Equal (testText, tf.Text);
+		Assert.Equal (TextAlignment.Right, tf.Alignment);
+		Assert.Equal (expectedSize, tf.Size);
+		tf.Draw (testBounds, new Attribute (), new Attribute ());
+		Assert.Equal (expectedSize, tf.Size);
+		Assert.NotEmpty (tf.Lines);
+
+		tf.Alignment = TextAlignment.Right;
+		expectedSize = new Size (testText.Length * 2, 1);
+		tf.Size = expectedSize;
+		Assert.Equal (testText, tf.Text);
+		Assert.Equal (TextAlignment.Right, tf.Alignment);
+		Assert.Equal (expectedSize, tf.Size);
+		tf.Draw (testBounds, new Attribute (), new Attribute ());
+		Assert.Equal (expectedSize, tf.Size);
+		Assert.NotEmpty (tf.Lines);
+
+		tf.Alignment = TextAlignment.Centered;
+		expectedSize = new Size (testText.Length * 2, 1);
+		tf.Size = expectedSize;
+		Assert.Equal (testText, tf.Text);
+		Assert.Equal (TextAlignment.Centered, tf.Alignment);
+		Assert.Equal (expectedSize, tf.Size);
+		tf.Draw (testBounds, new Attribute (), new Attribute ());
+		Assert.Equal (expectedSize, tf.Size);
+		Assert.NotEmpty (tf.Lines);
+	}
+
+	[Theory]
+	[InlineData (TextDirection.LeftRight_TopBottom, false)]
+	[InlineData (TextDirection.LeftRight_TopBottom, true)]
+	[InlineData (TextDirection.TopBottom_LeftRight, false)]
+	[InlineData (TextDirection.TopBottom_LeftRight, true)]
+	public void TestSize_TextChange (TextDirection textDirection, bool autoSize)
+	{
+		var tf = new TextFormatter { Direction = textDirection, Text = "你", AutoSize = autoSize };
+		Assert.Equal (2, tf.Size.Width);
+		Assert.Equal (1, tf.Size.Height);
+		tf.Text = "你你";
+		if (autoSize) {
 			if (textDirection == TextDirection.LeftRight_TopBottom) {
 				Assert.Equal (4, tf.Size.Width);
 				Assert.Equal (1, tf.Size.Height);
@@ -102,29 +98,58 @@ namespace Terminal.Gui.TextTests {
 				Assert.Equal (2, tf.Size.Width);
 				Assert.Equal (2, tf.Size.Height);
 			}
-			Assert.False (tf.AutoSize);
+		} else {
+			Assert.Equal (2, tf.Size.Width);
+			Assert.Equal (1, tf.Size.Height);
+		}
+	}
 
-			tf.Size = new Size (1, 1);
-			Assert.Equal (1, tf.Size.Width);
+	[Theory]
+	[InlineData (TextDirection.LeftRight_TopBottom)]
+	[InlineData (TextDirection.TopBottom_LeftRight)]
+	public void TestSize_AutoSizeChange (TextDirection textDirection)
+	{
+		var tf = new TextFormatter { Direction = textDirection, Text = "你你" };
+		if (textDirection == TextDirection.LeftRight_TopBottom) {
+			Assert.Equal (4, tf.Size.Width);
 			Assert.Equal (1, tf.Size.Height);
-			tf.AutoSize = true;
-			if (textDirection == TextDirection.LeftRight_TopBottom) {
-				Assert.Equal (4, tf.Size.Width);
-				Assert.Equal (1, tf.Size.Height);
-			} else {
-				Assert.Equal (2, tf.Size.Width);
-				Assert.Equal (2, tf.Size.Height);
-			}
+		} else {
+			Assert.Equal (2, tf.Size.Width);
+			Assert.Equal (2, tf.Size.Height);
+		}
+		Assert.False (tf.AutoSize);
+
+		tf.Size = new Size (1, 1);
+		Assert.Equal (1, tf.Size.Width);
+		Assert.Equal (1, tf.Size.Height);
+		tf.AutoSize = true;
+		if (textDirection == TextDirection.LeftRight_TopBottom) {
+			Assert.Equal (4, tf.Size.Width);
+			Assert.Equal (1, tf.Size.Height);
+		} else {
+			Assert.Equal (2, tf.Size.Width);
+			Assert.Equal (2, tf.Size.Height);
 		}
+	}
 
-		[Theory]
-		[InlineData (TextDirection.LeftRight_TopBottom, false)]
-		[InlineData (TextDirection.LeftRight_TopBottom, true)]
-		[InlineData (TextDirection.TopBottom_LeftRight, false)]
-		[InlineData (TextDirection.TopBottom_LeftRight, true)]
-		public void TestSize_SizeChange_AutoSize_True_Or_False (TextDirection textDirection, bool autoSize)
-		{
-			var tf = new TextFormatter () { Direction = textDirection, Text = "你你", AutoSize = autoSize };
+	[Theory]
+	[InlineData (TextDirection.LeftRight_TopBottom, false)]
+	[InlineData (TextDirection.LeftRight_TopBottom, true)]
+	[InlineData (TextDirection.TopBottom_LeftRight, false)]
+	[InlineData (TextDirection.TopBottom_LeftRight, true)]
+	public void TestSize_SizeChange_AutoSize_True_Or_False (TextDirection textDirection, bool autoSize)
+	{
+		var tf = new TextFormatter { Direction = textDirection, Text = "你你", AutoSize = autoSize };
+		if (textDirection == TextDirection.LeftRight_TopBottom) {
+			Assert.Equal (4, tf.Size.Width);
+			Assert.Equal (1, tf.Size.Height);
+		} else {
+			Assert.Equal (2, tf.Size.Width);
+			Assert.Equal (2, tf.Size.Height);
+		}
+
+		tf.Size = new Size (1, 1);
+		if (autoSize) {
 			if (textDirection == TextDirection.LeftRight_TopBottom) {
 				Assert.Equal (4, tf.Size.Width);
 				Assert.Equal (1, tf.Size.Height);
@@ -132,1639 +157,1695 @@ namespace Terminal.Gui.TextTests {
 				Assert.Equal (2, tf.Size.Width);
 				Assert.Equal (2, tf.Size.Height);
 			}
-
-			tf.Size = new Size (1, 1);
-			if (autoSize) {
-				if (textDirection == TextDirection.LeftRight_TopBottom) {
-					Assert.Equal (4, tf.Size.Width);
-					Assert.Equal (1, tf.Size.Height);
-				} else {
-					Assert.Equal (2, tf.Size.Width);
-					Assert.Equal (2, tf.Size.Height);
-				}
-			} else {
-				Assert.Equal (1, tf.Size.Width);
-				Assert.Equal (1, tf.Size.Height);
-			}
+		} else {
+			Assert.Equal (1, tf.Size.Width);
+			Assert.Equal (1, tf.Size.Height);
 		}
+	}
 
-		[Theory]
-		[InlineData (TextAlignment.Left, false)]
-		[InlineData (TextAlignment.Centered, true)]
-		[InlineData (TextAlignment.Right, false)]
-		[InlineData (TextAlignment.Justified, true)]
-		public void TestSize_SizeChange_AutoSize_True_Or_False_Horizontal (TextAlignment textAlignment, bool autoSize)
-		{
-			var tf = new TextFormatter () { Direction = TextDirection.LeftRight_TopBottom, Text = "你你", Alignment = textAlignment, AutoSize = autoSize };
-				Assert.Equal (4, tf.Size.Width);
-				Assert.Equal (1, tf.Size.Height);
-
-			tf.Size = new Size (1, 1);
-			if (autoSize && textAlignment != TextAlignment.Justified) {
-				Assert.Equal (4, tf.Size.Width);
-				Assert.Equal (1, tf.Size.Height);
-			} else {
-				Assert.Equal (1, tf.Size.Width);
-				Assert.Equal (1, tf.Size.Height);
-			}
+	[Theory]
+	[InlineData (TextAlignment.Left, false)]
+	[InlineData (TextAlignment.Centered, true)]
+	[InlineData (TextAlignment.Right, false)]
+	[InlineData (TextAlignment.Justified, true)]
+	public void TestSize_SizeChange_AutoSize_True_Or_False_Horizontal (TextAlignment textAlignment, bool autoSize)
+	{
+		var tf = new TextFormatter { Direction = TextDirection.LeftRight_TopBottom, Text = "你你", Alignment = textAlignment, AutoSize = autoSize };
+		Assert.Equal (4, tf.Size.Width);
+		Assert.Equal (1, tf.Size.Height);
+
+		tf.Size = new Size (1, 1);
+		if (autoSize && textAlignment != TextAlignment.Justified) {
+			Assert.Equal (4, tf.Size.Width);
+			Assert.Equal (1, tf.Size.Height);
+		} else {
+			Assert.Equal (1, tf.Size.Width);
+			Assert.Equal (1, tf.Size.Height);
 		}
+	}
 
-		[Theory]
-		[InlineData (VerticalTextAlignment.Top, false)]
-		[InlineData (VerticalTextAlignment.Middle, true)]
-		[InlineData (VerticalTextAlignment.Bottom, false)]
-		[InlineData (VerticalTextAlignment.Justified, true)]
-		public void TestSize_SizeChange_AutoSize_True_Or_False_Vertical (VerticalTextAlignment textAlignment, bool autoSize)
-		{
-			var tf = new TextFormatter () { Direction = TextDirection.TopBottom_LeftRight, Text = "你你", VerticalAlignment = textAlignment, AutoSize = autoSize };
+	[Theory]
+	[InlineData (VerticalTextAlignment.Top, false)]
+	[InlineData (VerticalTextAlignment.Middle, true)]
+	[InlineData (VerticalTextAlignment.Bottom, false)]
+	[InlineData (VerticalTextAlignment.Justified, true)]
+	public void TestSize_SizeChange_AutoSize_True_Or_False_Vertical (VerticalTextAlignment textAlignment, bool autoSize)
+	{
+		var tf = new TextFormatter { Direction = TextDirection.TopBottom_LeftRight, Text = "你你", VerticalAlignment = textAlignment, AutoSize = autoSize };
+		Assert.Equal (2, tf.Size.Width);
+		Assert.Equal (2, tf.Size.Height);
+
+		tf.Size = new Size (1, 1);
+		if (autoSize && textAlignment != VerticalTextAlignment.Justified) {
 			Assert.Equal (2, tf.Size.Width);
 			Assert.Equal (2, tf.Size.Height);
-
-			tf.Size = new Size (1, 1);
-			if (autoSize && textAlignment != VerticalTextAlignment.Justified) {
-				Assert.Equal (2, tf.Size.Width);
-				Assert.Equal (2, tf.Size.Height);
-			} else {
-				Assert.Equal (1, tf.Size.Width);
-				Assert.Equal (1, tf.Size.Height);
-			}
+		} else {
+			Assert.Equal (1, tf.Size.Width);
+			Assert.Equal (1, tf.Size.Height);
 		}
+	}
 
-		[Fact]
-		public void NeedsFormat_Sets ()
-		{
-			var testText = "test";
-			var testBounds = new Rect (0, 0, 100, 1);
-			var tf = new TextFormatter ();
-
-			tf.Text = "test";
-			Assert.True (tf.NeedsFormat); // get_Lines causes a Format
-			Assert.NotEmpty (tf.Lines);
-			Assert.False (tf.NeedsFormat); // get_Lines causes a Format
-			Assert.Equal (testText, tf.Text);
-			tf.Draw (testBounds, new Attribute (), new Attribute ());
-			Assert.False (tf.NeedsFormat);
-
-			tf.Size = new Size (1, 1);
-			Assert.True (tf.NeedsFormat);
-			Assert.NotEmpty (tf.Lines);
-			Assert.False (tf.NeedsFormat); // get_Lines causes a Format
-
-			tf.Alignment = TextAlignment.Centered;
-			Assert.True (tf.NeedsFormat);
-			Assert.NotEmpty (tf.Lines);
-			Assert.False (tf.NeedsFormat); // get_Lines causes a Format
+	[Theory]
+	[InlineData (TextAlignment.Left, false)]
+	[InlineData (TextAlignment.Centered, true)]
+	[InlineData (TextAlignment.Right, false)]
+	[InlineData (TextAlignment.Justified, true)]
+	public void TestSize_DirectionChange_AutoSize_True_Or_False_Horizontal (TextAlignment textAlignment, bool autoSize)
+	{
+		var tf = new TextFormatter { Direction = TextDirection.LeftRight_TopBottom, Text = "你你", Alignment = textAlignment, AutoSize = autoSize };
+		Assert.Equal (4, tf.Size.Width);
+		Assert.Equal (1, tf.Size.Height);
+
+		tf.Direction = TextDirection.TopBottom_LeftRight;
+		if (autoSize && textAlignment != TextAlignment.Justified) {
+			Assert.Equal (2, tf.Size.Width);
+			Assert.Equal (2, tf.Size.Height);
+		} else {
+			Assert.Equal (4, tf.Size.Width);
+			Assert.Equal (1, tf.Size.Height);
 		}
+	}
 
-		[Theory]
-		[InlineData (null)]
-		[InlineData ("")]
-		[InlineData ("no hotkey")]
-		[InlineData ("No hotkey, Upper Case")]
-		[InlineData ("Non-english: Сохранить")]
-		public void FindHotKey_Invalid_ReturnsFalse (string text)
-		{
-			Rune hotKeySpecifier = (Rune)'_';
-			bool supportFirstUpperCase = false;
-			int hotPos = 0;
-			Key hotKey = KeyCode.Null;
-			bool result = false;
-
-			result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out hotPos, out hotKey);
-			Assert.False (result);
-			Assert.Equal (-1, hotPos);
-			Assert.Equal (KeyCode.Null, hotKey);
+	[Theory]
+	[InlineData (VerticalTextAlignment.Top, false)]
+	[InlineData (VerticalTextAlignment.Middle, true)]
+	[InlineData (VerticalTextAlignment.Bottom, false)]
+	[InlineData (VerticalTextAlignment.Justified, true)]
+	public void TestSize_DirectionChange_AutoSize_True_Or_False_Vertical (VerticalTextAlignment textAlignment, bool autoSize)
+	{
+		var tf = new TextFormatter { Direction = TextDirection.TopBottom_LeftRight, Text = "你你", VerticalAlignment = textAlignment, AutoSize = autoSize };
+		Assert.Equal (2, tf.Size.Width);
+		Assert.Equal (2, tf.Size.Height);
+
+		tf.Direction = TextDirection.LeftRight_TopBottom;
+		if (autoSize && textAlignment != VerticalTextAlignment.Justified) {
+			Assert.Equal (4, tf.Size.Width);
+			Assert.Equal (1, tf.Size.Height);
+		} else {
+			Assert.Equal (2, tf.Size.Width);
+			Assert.Equal (2, tf.Size.Height);
 		}
+	}
 
-		[Theory]
-		[InlineData ("_K Before", true, 0, (KeyCode)'K')]
-		[InlineData ("a_K Second", true, 1, (KeyCode)'K')]
-		[InlineData ("Last _K", true, 5, (KeyCode)'K')]
-		[InlineData ("After K_", false, -1, KeyCode.Null)]
-		[InlineData ("Multiple _K and _R", true, 9, (KeyCode)'K')]
-		[InlineData ("Non-english: _Кдать", true, 13, (KeyCode)'К')] // Cryllic K (К)
-		[InlineData ("_K Before", true, 0, (KeyCode)'K', true)] // Turn on FirstUpperCase and verify same results
-		[InlineData ("a_K Second", true, 1, (KeyCode)'K', true)]
-		[InlineData ("Last _K", true, 5, (KeyCode)'K', true)]
-		[InlineData ("After K_", false, -1, KeyCode.Null, true)]
-		[InlineData ("Multiple _K and _R", true, 9, (KeyCode)'K', true)]
-		[InlineData ("Non-english: _Кдать", true, 13, (KeyCode)'К', true)] // Cryllic K (К)
-		public void FindHotKey_AlphaUpperCase_Succeeds (string text, bool expectedResult, int expectedHotPos, KeyCode expectedKey, bool supportFirstUpperCase = false)
-		{
-			Rune hotKeySpecifier = (Rune)'_';
-
-			var result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out int hotPos, out var hotKey);
-			if (expectedResult) {
-				Assert.True (result);
-			} else {
-				Assert.False (result);
-			}
-			Assert.Equal (expectedResult, result);
-			Assert.Equal (expectedHotPos, hotPos);
-			Assert.Equal ((Key)expectedKey, hotKey);
-		}
+	[Fact]
+	public void NeedsFormat_Sets ()
+	{
+		var testText = "test";
+		var testBounds = new Rect (0, 0, 100, 1);
+		var tf = new TextFormatter ();
+
+		tf.Text = "test";
+		Assert.True (tf.NeedsFormat); // get_Lines causes a Format
+		Assert.NotEmpty (tf.Lines);
+		Assert.False (tf.NeedsFormat); // get_Lines causes a Format
+		Assert.Equal (testText, tf.Text);
+		tf.Draw (testBounds, new Attribute (), new Attribute ());
+		Assert.False (tf.NeedsFormat);
+
+		tf.Size = new Size (1, 1);
+		Assert.True (tf.NeedsFormat);
+		Assert.NotEmpty (tf.Lines);
+		Assert.False (tf.NeedsFormat); // get_Lines causes a Format
+
+		tf.Alignment = TextAlignment.Centered;
+		Assert.True (tf.NeedsFormat);
+		Assert.NotEmpty (tf.Lines);
+		Assert.False (tf.NeedsFormat); // get_Lines causes a Format
+	}
 
-		[Theory]
-		[InlineData ("_k Before", true, 0, (KeyCode)'K')] // lower case should return uppercase Hotkey
-		[InlineData ("a_k Second", true, 1, (KeyCode)'K')]
-		[InlineData ("Last _k", true, 5, (KeyCode)'K')]
-		[InlineData ("After k_", false, -1, KeyCode.Null)]
-		[InlineData ("Multiple _k and _R", true, 9, (KeyCode)'K')]
-		[InlineData ("Non-english: _кдать", true, 13, (KeyCode)'к')] // Lower case Cryllic K (к)
-		[InlineData ("_k Before", true, 0, (KeyCode)'K', true)] // Turn on FirstUpperCase and verify same results
-		[InlineData ("a_k Second", true, 1, (KeyCode)'K', true)]
-		[InlineData ("Last _k", true, 5, (KeyCode)'K', true)]
-		[InlineData ("After k_", false, -1, KeyCode.Null, true)]
-		[InlineData ("Multiple _k and _r", true, 9, (KeyCode)'K', true)]
-		[InlineData ("Non-english: _кдать", true, 13, (KeyCode)'к', true)] // Cryllic K (К)
-		public void FindHotKey_AlphaLowerCase_Succeeds (string text, bool expectedResult, int expectedHotPos, KeyCode expectedKey, bool supportFirstUpperCase = false)
-		{
-			Rune hotKeySpecifier = (Rune)'_';
-
-			var result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out int hotPos, out var hotKey);
-			if (expectedResult) {
-				Assert.True (result);
-			} else {
-				Assert.False (result);
-			}
-			Assert.Equal (expectedResult, result);
-			Assert.Equal (expectedHotPos, hotPos);
-			Assert.Equal ((Key)expectedKey, hotKey);
-		}
+	[Theory]
+	[InlineData (null)]
+	[InlineData ("")]
+	[InlineData ("no hotkey")]
+	[InlineData ("No hotkey, Upper Case")]
+	[InlineData ("Non-english: Сохранить")]
+	public void FindHotKey_Invalid_ReturnsFalse (string text)
+	{
+		var hotKeySpecifier = (Rune)'_';
+		var supportFirstUpperCase = false;
+		var hotPos = 0;
+		Key hotKey = KeyCode.Null;
+		var result = false;
+
+		result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out hotPos, out hotKey);
+		Assert.False (result);
+		Assert.Equal (-1, hotPos);
+		Assert.Equal (KeyCode.Null, hotKey);
+	}
 
-		[Theory]
-		[InlineData ("_1 Before", true, 0, (KeyCode)'1')] // Digits 
-		[InlineData ("a_1 Second", true, 1, (KeyCode)'1')]
-		[InlineData ("Last _1", true, 5, (KeyCode)'1')]
-		[InlineData ("After 1_", false, -1, KeyCode.Null)]
-		[InlineData ("Multiple _1 and _2", true, 9, (KeyCode)'1')]
-		[InlineData ("_1 Before", true, 0, (KeyCode)'1', true)] // Turn on FirstUpperCase and verify same results
-		[InlineData ("a_1 Second", true, 1, (KeyCode)'1', true)]
-		[InlineData ("Last _1", true, 5, (KeyCode)'1', true)]
-		[InlineData ("After 1_", false, -1, KeyCode.Null, true)]
-		[InlineData ("Multiple _1 and _2", true, 9, (KeyCode)'1', true)]
-		public void FindHotKey_Numeric_Succeeds (string text, bool expectedResult, int expectedHotPos, KeyCode expectedKey, bool supportFirstUpperCase = false)
-		{
-			Rune hotKeySpecifier = (Rune)'_';
-
-			var result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out int hotPos, out var hotKey);
-			if (expectedResult) {
-				Assert.True (result);
-			} else {
-				Assert.False (result);
-			}
-			Assert.Equal (expectedResult, result);
-			Assert.Equal (expectedHotPos, hotPos);
-			Assert.Equal ((Key)expectedKey, hotKey);
+	[Theory]
+	[InlineData ("_K Before", true, 0, (KeyCode)'K')]
+	[InlineData ("a_K Second", true, 1, (KeyCode)'K')]
+	[InlineData ("Last _K", true, 5, (KeyCode)'K')]
+	[InlineData ("After K_", false, -1, KeyCode.Null)]
+	[InlineData ("Multiple _K and _R", true, 9, (KeyCode)'K')]
+	[InlineData ("Non-english: _Кдать", true, 13, (KeyCode)'К')]       // Cryllic K (К)
+	[InlineData ("_K Before", true, 0, (KeyCode)'K', true)] // Turn on FirstUpperCase and verify same results
+	[InlineData ("a_K Second", true, 1, (KeyCode)'K', true)]
+	[InlineData ("Last _K", true, 5, (KeyCode)'K', true)]
+	[InlineData ("After K_", false, -1, KeyCode.Null, true)]
+	[InlineData ("Multiple _K and _R", true, 9, (KeyCode)'K', true)]
+	[InlineData ("Non-english: _Кдать", true, 13, (KeyCode)'К', true)] // Cryllic K (К)
+	public void FindHotKey_AlphaUpperCase_Succeeds (string text, bool expectedResult, int expectedHotPos, KeyCode expectedKey, bool supportFirstUpperCase = false)
+	{
+		var hotKeySpecifier = (Rune)'_';
+
+		var result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out var hotPos, out var hotKey);
+		if (expectedResult) {
+			Assert.True (result);
+		} else {
+			Assert.False (result);
 		}
+		Assert.Equal (expectedResult, result);
+		Assert.Equal (expectedHotPos, hotPos);
+		Assert.Equal (expectedKey, hotKey);
+	}
 
-		[Theory]
-		[InlineData ("K Before", true, 0, (KeyCode)'K')]
-		[InlineData ("aK Second", true, 1, (KeyCode)'K')]
-		[InlineData ("last K", true, 5, (KeyCode)'K')]
-		[InlineData ("multiple K and R", true, 9, (KeyCode)'K')]
-		[InlineData ("non-english: Кдать", true, 13, (KeyCode)'К')] // Cryllic K (К)
-		public void FindHotKey_Legacy_FirstUpperCase_Succeeds (string text, bool expectedResult, int expectedHotPos, KeyCode expectedKey)
-		{
-			var supportFirstUpperCase = true;
-
-			Rune hotKeySpecifier = (Rune)0;
-
-			var result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out int hotPos, out var hotKey);
-			if (expectedResult) {
-				Assert.True (result);
-			} else {
-				Assert.False (result);
-			}
-			Assert.Equal (expectedResult, result);
-			Assert.Equal (expectedHotPos, hotPos);
-			Assert.Equal ((Key)expectedKey, hotKey);
-		}
-		
-		[Theory]
-		[InlineData ("_\"k before", true, (KeyCode)'"')] // BUGBUG: Not sure why this fails. " is a normal char
-		[InlineData ("\"_k before", true, KeyCode.K)]
-		[InlineData ("_`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?", true, (KeyCode)'`')]
-		[InlineData ("`_~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?", true, (KeyCode)'~')]
-		[InlineData ("`~!@#$%^&*()-__=+[{]}\\|;:'\",<.>/?", true, (KeyCode)'=')] // BUGBUG: Not sure why this fails. Ignore the first and consider the second
-		[InlineData ("_ ~  s  gui.cs   master ↑10", true, (KeyCode)'')] // ~IsLetterOrDigit + Unicode
-		[InlineData (" ~  s  gui.cs  _ master ↑10", true, (KeyCode)'')] // ~IsLetterOrDigit + Unicode
-		[InlineData ("non-english: _кдать", true, (KeyCode)'к')] // Lower case Cryllic K (к)
-		public void FindHotKey_Symbols_Returns_Symbol (string text, bool found, KeyCode expected)
-		{
-			var hotKeySpecifier = (Rune)'_';
-
-			var result = TextFormatter.FindHotKey (text, hotKeySpecifier, false, out int _, out var hotKey);
-			Assert.Equal (found, result);
-			Assert.Equal ((Key)expected, hotKey);
+	[Theory]
+	[InlineData ("_k Before", true, 0, (KeyCode)'K')] // lower case should return uppercase Hotkey
+	[InlineData ("a_k Second", true, 1, (KeyCode)'K')]
+	[InlineData ("Last _k", true, 5, (KeyCode)'K')]
+	[InlineData ("After k_", false, -1, KeyCode.Null)]
+	[InlineData ("Multiple _k and _R", true, 9, (KeyCode)'K')]
+	[InlineData ("Non-english: _кдать", true, 13, (KeyCode)'к')]       // Lower case Cryllic K (к)
+	[InlineData ("_k Before", true, 0, (KeyCode)'K', true)] // Turn on FirstUpperCase and verify same results
+	[InlineData ("a_k Second", true, 1, (KeyCode)'K', true)]
+	[InlineData ("Last _k", true, 5, (KeyCode)'K', true)]
+	[InlineData ("After k_", false, -1, KeyCode.Null, true)]
+	[InlineData ("Multiple _k and _r", true, 9, (KeyCode)'K', true)]
+	[InlineData ("Non-english: _кдать", true, 13, (KeyCode)'к', true)] // Cryllic K (К)
+	public void FindHotKey_AlphaLowerCase_Succeeds (string text, bool expectedResult, int expectedHotPos, KeyCode expectedKey, bool supportFirstUpperCase = false)
+	{
+		var hotKeySpecifier = (Rune)'_';
+
+		var result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out var hotPos, out var hotKey);
+		if (expectedResult) {
+			Assert.True (result);
+		} else {
+			Assert.False (result);
 		}
+		Assert.Equal (expectedResult, result);
+		Assert.Equal (expectedHotPos, hotPos);
+		Assert.Equal (expectedKey, hotKey);
+	}
 
-		[Theory]
-		[InlineData ("\"k before")]
-		[InlineData ("ak second")]
-		[InlineData ("last k")]
-		[InlineData ("multiple k and r")]
-		[InlineData ("12345")]
-		[InlineData ("`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?")] // punctuation
-		[InlineData (" ~  s  gui.cs   master ↑10")] // ~IsLetterOrDigit + Unicode
-		[InlineData ("non-english: кдать")] // Lower case Cryllic K (к)
-		public void FindHotKey_Legacy_FirstUpperCase_NotFound_Returns_False (string text)
-		{
-			bool supportFirstUpperCase = true;
-
-			var hotKeySpecifier = (Rune)0;
-
-			var result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out int hotPos, out var hotKey);
+	[Theory]
+	[InlineData ("_1 Before", true, 0, (KeyCode)'1')] // Digits 
+	[InlineData ("a_1 Second", true, 1, (KeyCode)'1')]
+	[InlineData ("Last _1", true, 5, (KeyCode)'1')]
+	[InlineData ("After 1_", false, -1, KeyCode.Null)]
+	[InlineData ("Multiple _1 and _2", true, 9, (KeyCode)'1')]
+	[InlineData ("_1 Before", true, 0, (KeyCode)'1', true)] // Turn on FirstUpperCase and verify same results
+	[InlineData ("a_1 Second", true, 1, (KeyCode)'1', true)]
+	[InlineData ("Last _1", true, 5, (KeyCode)'1', true)]
+	[InlineData ("After 1_", false, -1, KeyCode.Null, true)]
+	[InlineData ("Multiple _1 and _2", true, 9, (KeyCode)'1', true)]
+	public void FindHotKey_Numeric_Succeeds (string text, bool expectedResult, int expectedHotPos, KeyCode expectedKey, bool supportFirstUpperCase = false)
+	{
+		var hotKeySpecifier = (Rune)'_';
+
+		var result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out var hotPos, out var hotKey);
+		if (expectedResult) {
+			Assert.True (result);
+		} else {
 			Assert.False (result);
-			Assert.Equal (-1, hotPos);
-			Assert.Equal (KeyCode.Null, hotKey);
 		}
+		Assert.Equal (expectedResult, result);
+		Assert.Equal (expectedHotPos, hotPos);
+		Assert.Equal (expectedKey, hotKey);
+	}
 
-		[Theory]
-		[InlineData (null)]
-		[InlineData ("")]
-		[InlineData ("a")]
-		public void RemoveHotKeySpecifier_InValid_ReturnsOriginal (string text)
-		{
-			Rune hotKeySpecifier = (Rune)'_';
-
-			if (text == null) {
-				Assert.Null (TextFormatter.RemoveHotKeySpecifier (text, 0, hotKeySpecifier));
-				Assert.Null (TextFormatter.RemoveHotKeySpecifier (text, -1, hotKeySpecifier));
-				Assert.Null (TextFormatter.RemoveHotKeySpecifier (text, 100, hotKeySpecifier));
-			} else {
-				Assert.Equal (text, TextFormatter.RemoveHotKeySpecifier (text, 0, hotKeySpecifier));
-				Assert.Equal (text, TextFormatter.RemoveHotKeySpecifier (text, -1, hotKeySpecifier));
-				Assert.Equal (text, TextFormatter.RemoveHotKeySpecifier (text, 100, hotKeySpecifier));
-			}
+	[Theory]
+	[InlineData ("K Before", true, 0, (KeyCode)'K')]
+	[InlineData ("aK Second", true, 1, (KeyCode)'K')]
+	[InlineData ("last K", true, 5, (KeyCode)'K')]
+	[InlineData ("multiple K and R", true, 9, (KeyCode)'K')]
+	[InlineData ("non-english: Кдать", true, 13, (KeyCode)'К')] // Cryllic K (К)
+	public void FindHotKey_Legacy_FirstUpperCase_Succeeds (string text, bool expectedResult, int expectedHotPos, KeyCode expectedKey)
+	{
+		var supportFirstUpperCase = true;
+
+		var hotKeySpecifier = (Rune)0;
+
+		var result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out var hotPos, out var hotKey);
+		if (expectedResult) {
+			Assert.True (result);
+		} else {
+			Assert.False (result);
 		}
+		Assert.Equal (expectedResult, result);
+		Assert.Equal (expectedHotPos, hotPos);
+		Assert.Equal (expectedKey, hotKey);
+	}
 
-		[Theory]
-		[InlineData ("_K Before", 0, "K Before")]
-		[InlineData ("a_K Second", 1, "aK Second")]
-		[InlineData ("Last _K", 5, "Last K")]
-		[InlineData ("After K_", 7, "After K")]
-		[InlineData ("Multiple _K and _R", 9, "Multiple K and _R")]
-		[InlineData ("Non-english: _Кдать", 13, "Non-english: Кдать")]
-		public void RemoveHotKeySpecifier_Valid_ReturnsStripped (string text, int hotPos, string expectedText)
-		{
-			Rune hotKeySpecifier = (Rune)'_';
-
-			Assert.Equal (expectedText, TextFormatter.RemoveHotKeySpecifier (text, hotPos, hotKeySpecifier));
-		}
+	[Theory]
+	[InlineData ("_\"k before", true, (KeyCode)'"')] // BUGBUG: Not sure why this fails. " is a normal char
+	[InlineData ("\"_k before", true, KeyCode.K)]
+	[InlineData ("_`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?", true, (KeyCode)'`')]
+	[InlineData ("`_~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?", true, (KeyCode)'~')]
+	[InlineData ("`~!@#$%^&*()-__=+[{]}\\|;:'\",<.>/?", true, (KeyCode)'=')] // BUGBUG: Not sure why this fails. Ignore the first and consider the second
+	[InlineData ("_ ~  s  gui.cs   master ↑10", true, (KeyCode)'')] // ~IsLetterOrDigit + Unicode
+	[InlineData (" ~  s  gui.cs  _ master ↑10", true, (KeyCode)'')] // ~IsLetterOrDigit + Unicode
+	[InlineData ("non-english: _кдать", true, (KeyCode)'к')] // Lower case Cryllic K (к)
+	public void FindHotKey_Symbols_Returns_Symbol (string text, bool found, KeyCode expected)
+	{
+		var hotKeySpecifier = (Rune)'_';
+
+		var result = TextFormatter.FindHotKey (text, hotKeySpecifier, false, out var _, out var hotKey);
+		Assert.Equal (found, result);
+		Assert.Equal (expected, hotKey);
+	}
 
-		[Theory]
-		[InlineData ("all lower case", 0)]
-		[InlineData ("K Before", 0)]
-		[InlineData ("aK Second", 1)]
-		[InlineData ("Last K", 5)]
-		[InlineData ("fter K", 7)]
-		[InlineData ("Multiple K and R", 9)]
-		[InlineData ("Non-english: Кдать", 13)]
-		public void RemoveHotKeySpecifier_Valid_Legacy_ReturnsOriginal (string text, int hotPos)
-		{
-			Rune hotKeySpecifier = (Rune)'_';
-
-			Assert.Equal (text, TextFormatter.RemoveHotKeySpecifier (text, hotPos, hotKeySpecifier));
-		}
+	[Theory]
+	[InlineData ("\"k before")]
+	[InlineData ("ak second")]
+	[InlineData ("last k")]
+	[InlineData ("multiple k and r")]
+	[InlineData ("12345")]
+	[InlineData ("`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?")] // punctuation
+	[InlineData (" ~  s  gui.cs   master ↑10")]    // ~IsLetterOrDigit + Unicode
+	[InlineData ("non-english: кдать")]                 // Lower case Cryllic K (к)
+	public void FindHotKey_Legacy_FirstUpperCase_NotFound_Returns_False (string text)
+	{
+		var supportFirstUpperCase = true;
+
+		var hotKeySpecifier = (Rune)0;
+
+		var result = TextFormatter.FindHotKey (text, hotKeySpecifier, supportFirstUpperCase, out var hotPos, out var hotKey);
+		Assert.False (result);
+		Assert.Equal (-1, hotPos);
+		Assert.Equal (KeyCode.Null, hotKey);
+	}
 
-		[Theory]
-		[InlineData (null)]
-		[InlineData ("")]
-		public void CalcRect_Invalid_Returns_Empty (string text)
-		{
-			Assert.Equal (Rect.Empty, TextFormatter.CalcRect (0, 0, text));
-			Assert.Equal (new Rect (new Point (1, 2), Size.Empty), TextFormatter.CalcRect (1, 2, text));
-			Assert.Equal (new Rect (new Point (-1, -2), Size.Empty), TextFormatter.CalcRect (-1, -2, text));
+	[Theory]
+	[InlineData (null)]
+	[InlineData ("")]
+	[InlineData ("a")]
+	public void RemoveHotKeySpecifier_InValid_ReturnsOriginal (string text)
+	{
+		var hotKeySpecifier = (Rune)'_';
+
+		if (text == null) {
+			Assert.Null (TextFormatter.RemoveHotKeySpecifier (text, 0, hotKeySpecifier));
+			Assert.Null (TextFormatter.RemoveHotKeySpecifier (text, -1, hotKeySpecifier));
+			Assert.Null (TextFormatter.RemoveHotKeySpecifier (text, 100, hotKeySpecifier));
+		} else {
+			Assert.Equal (text, TextFormatter.RemoveHotKeySpecifier (text, 0, hotKeySpecifier));
+			Assert.Equal (text, TextFormatter.RemoveHotKeySpecifier (text, -1, hotKeySpecifier));
+			Assert.Equal (text, TextFormatter.RemoveHotKeySpecifier (text, 100, hotKeySpecifier));
 		}
+	}
 
-		[Theory]
-		[InlineData ("test")]
-		[InlineData (" ~  s  gui.cs   master ↑10")]
-		public void CalcRect_SingleLine_Returns_1High (string text)
-		{
-			Assert.Equal (new Rect (0, 0, text.GetRuneCount (), 1), TextFormatter.CalcRect (0, 0, text));
-			Assert.Equal (new Rect (0, 0, text.GetColumns (), 1), TextFormatter.CalcRect (0, 0, text));
-		}
+	[Theory]
+	[InlineData ("_K Before", 0, "K Before")]
+	[InlineData ("a_K Second", 1, "aK Second")]
+	[InlineData ("Last _K", 5, "Last K")]
+	[InlineData ("After K_", 7, "After K")]
+	[InlineData ("Multiple _K and _R", 9, "Multiple K and _R")]
+	[InlineData ("Non-english: _Кдать", 13, "Non-english: Кдать")]
+	public void RemoveHotKeySpecifier_Valid_ReturnsStripped (string text, int hotPos, string expectedText)
+	{
+		var hotKeySpecifier = (Rune)'_';
+
+		Assert.Equal (expectedText, TextFormatter.RemoveHotKeySpecifier (text, hotPos, hotKeySpecifier));
+	}
 
-		[Theory]
-		[InlineData ("line1\nline2", 5, 2)]
-		[InlineData ("\nline2", 5, 2)]
-		[InlineData ("\n\n", 0, 3)]
-		[InlineData ("\n\n\n", 0, 4)]
-		[InlineData ("line1\nline2\nline3long!", 10, 3)]
-		[InlineData ("line1\nline2\n\n", 5, 4)]
-		[InlineData ("line1\r\nline2", 5, 2)]
-		[InlineData (" ~  s  gui.cs   master ↑10\n", 31, 2)]
-		[InlineData ("\n ~  s  gui.cs   master ↑10", 31, 2)]
-		[InlineData (" ~  s  gui.cs   master\n↑10", 27, 2)]
-		public void CalcRect_MultiLine_Returns_nHigh (string text, int expectedWidth, int expectedLines)
-		{
-			Assert.Equal (new Rect (0, 0, expectedWidth, expectedLines), TextFormatter.CalcRect (0, 0, text));
-			var lines = text.Split (text.Contains (Environment.NewLine) ? Environment.NewLine : "\n");
-			var maxWidth = lines.Max (s => s.GetColumns ());
-			var lineWider = 0;
-			for (int i = 0; i < lines.Length; i++) {
-				var w = lines [i].GetColumns ();
-				if (w == maxWidth) {
-					lineWider = i;
-				}
-			}
-			Assert.Equal (new Rect (0, 0, maxWidth, expectedLines), TextFormatter.CalcRect (0, 0, text));
-			Assert.Equal (new Rect (0, 0, lines [lineWider].ToRuneList ().Sum (r => Math.Max (r.GetColumns (), 0)), expectedLines), TextFormatter.CalcRect (0, 0, text));
-		}
+	[Theory]
+	[InlineData ("all lower case", 0)]
+	[InlineData ("K Before", 0)]
+	[InlineData ("aK Second", 1)]
+	[InlineData ("Last K", 5)]
+	[InlineData ("fter K", 7)]
+	[InlineData ("Multiple K and R", 9)]
+	[InlineData ("Non-english: Кдать", 13)]
+	public void RemoveHotKeySpecifier_Valid_Legacy_ReturnsOriginal (string text, int hotPos)
+	{
+		var hotKeySpecifier = (Rune)'_';
+
+		Assert.Equal (text, TextFormatter.RemoveHotKeySpecifier (text, hotPos, hotKeySpecifier));
+	}
 
-		[Theory]
-		[InlineData ("")]
-		[InlineData (null)]
-		[InlineData ("test")]
-		public void ClipAndJustify_Invalid_Returns_Original (string text)
-		{
-			var expected = string.IsNullOrEmpty (text) ? text : "";
-			Assert.Equal (expected, TextFormatter.ClipAndJustify (text, 0, TextAlignment.Left));
-			Assert.Equal (expected, TextFormatter.ClipAndJustify (text, 0, TextAlignment.Left));
-			Assert.Throws<ArgumentOutOfRangeException> (() => TextFormatter.ClipAndJustify (text, -1, TextAlignment.Left));
-		}
+	[Theory]
+	[InlineData (null)]
+	[InlineData ("")]
+	public void CalcRect_Invalid_Returns_Empty (string text)
+	{
+		Assert.Equal (Rect.Empty, TextFormatter.CalcRect (0, 0, text));
+		Assert.Equal (new Rect (new Point (1, 2), Size.Empty), TextFormatter.CalcRect (1, 2, text));
+		Assert.Equal (new Rect (new Point (-1, -2), Size.Empty), TextFormatter.CalcRect (-1, -2, text));
+	}
 
-		[Theory]
-		[InlineData ("test", "", 0)]
-		[InlineData ("test", "te", 2)]
-		[InlineData ("test", "test", int.MaxValue)]
-		[InlineData ("A sentence has words.", "A sentence has words.", 22)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words.", 21)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words.", int.MaxValue)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words", 20)] // Should not fit
-		[InlineData ("A sentence has words.", "A sentence", 10)] // Should not fit
-		[InlineData ("A\tsentence\thas\twords.", "A sentence has words.", int.MaxValue)]
-		[InlineData ("A\tsentence\thas\twords.", "A sentence", 10)]
-		[InlineData ("line1\nline2\nline3long!", "line1\nline2\nline3long!", int.MaxValue)]
-		[InlineData ("line1\nline2\nline3long!", "line1\nline", 10)]
-		[InlineData (" ~  s  gui.cs   master ↑10", " ~  s  ", 10)] // Unicode
-		[InlineData ("Ð ÑÐ", "Ð ÑÐ", 5)] // should fit
-		[InlineData ("Ð ÑÐ", "Ð ÑÐ", 4)] // should fit
-		[InlineData ("Ð ÑÐ", "Ð Ñ", 3)] // Should not fit
-		public void ClipAndJustify_Valid_Left (string text, string justifiedText, int maxWidth)
-		{
-			var align = TextAlignment.Left;
-			var textDirection = TextDirection.LeftRight_BottomTop;
-			var tabWidth = 1;
-
-			Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
-			var expectedClippedWidth = Math.Min (justifiedText.GetRuneCount (), maxWidth);
-			Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
-			Assert.True (justifiedText.GetRuneCount () <= maxWidth);
-			Assert.True (justifiedText.GetColumns () <= maxWidth);
-			Assert.Equal (expectedClippedWidth, justifiedText.GetRuneCount ());
-			Assert.Equal (expectedClippedWidth, justifiedText.ToRuneList ().Sum (r => Math.Max (r.GetColumns (), 1)));
-			Assert.True (expectedClippedWidth <= maxWidth);
-			Assert.Equal (StringExtensions.ToString (justifiedText.ToRunes () [0..expectedClippedWidth]), justifiedText);
-		}
+	[Theory]
+	[InlineData ("test")]
+	[InlineData (" ~  s  gui.cs   master ↑10")]
+	public void CalcRect_SingleLine_Returns_1High (string text)
+	{
+		Assert.Equal (new Rect (0, 0, text.GetRuneCount (), 1), TextFormatter.CalcRect (0, 0, text));
+		Assert.Equal (new Rect (0, 0, text.GetColumns (), 1), TextFormatter.CalcRect (0, 0, text));
+	}
 
-		[Theory]
-		[InlineData ("test", "", 0)]
-		[InlineData ("test", "te", 2)]
-		[InlineData ("test", "test", int.MaxValue)]
-		[InlineData ("A sentence has words.", "A sentence has words.", 22)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words.", 21)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words.", int.MaxValue)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words", 20)] // Should not fit
-		[InlineData ("A sentence has words.", "A sentence", 10)] // Should not fit
-		[InlineData ("A\tsentence\thas\twords.", "A sentence has words.", int.MaxValue)]
-		[InlineData ("A\tsentence\thas\twords.", "A sentence", 10)]
-		[InlineData ("line1\nline2\nline3long!", "line1\nline2\nline3long!", int.MaxValue)]
-		[InlineData ("line1\nline2\nline3long!", "line1\nline", 10)]
-		[InlineData (" ~  s  gui.cs   master ↑10", " ~  s  ", 10)] // Unicode
-		[InlineData ("Ð ÑÐ", "Ð ÑÐ", 5)] // should fit
-		[InlineData ("Ð ÑÐ", "Ð ÑÐ", 4)] // should fit
-		[InlineData ("Ð ÑÐ", "Ð Ñ", 3)] // Should not fit
-		public void ClipAndJustify_Valid_Right (string text, string justifiedText, int maxWidth)
-		{
-			var align = TextAlignment.Right;
-			var textDirection = TextDirection.LeftRight_BottomTop;
-			var tabWidth = 1;
-
-			Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
-			var expectedClippedWidth = Math.Min (justifiedText.GetRuneCount (), maxWidth);
-			Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
-			Assert.True (justifiedText.GetRuneCount () <= maxWidth);
-			Assert.True (justifiedText.GetColumns () <= maxWidth);
-			Assert.Equal (expectedClippedWidth, justifiedText.GetRuneCount ());
-			Assert.Equal (expectedClippedWidth, justifiedText.ToRuneList ().Sum (r => Math.Max (r.GetColumns (), 1)));
-			Assert.True (expectedClippedWidth <= maxWidth);
-			Assert.Equal (StringExtensions.ToString (justifiedText.ToRunes () [0..expectedClippedWidth]), justifiedText);
+	[Theory]
+	[InlineData ("line1\nline2", 5, 2)]
+	[InlineData ("\nline2", 5, 2)]
+	[InlineData ("\n\n", 0, 3)]
+	[InlineData ("\n\n\n", 0, 4)]
+	[InlineData ("line1\nline2\nline3long!", 10, 3)]
+	[InlineData ("line1\nline2\n\n", 5, 4)]
+	[InlineData ("line1\r\nline2", 5, 2)]
+	[InlineData (" ~  s  gui.cs   master ↑10\n", 31, 2)]
+	[InlineData ("\n ~  s  gui.cs   master ↑10", 31, 2)]
+	[InlineData (" ~  s  gui.cs   master\n↑10", 27, 2)]
+	public void CalcRect_MultiLine_Returns_nHigh (string text, int expectedWidth, int expectedLines)
+	{
+		Assert.Equal (new Rect (0, 0, expectedWidth, expectedLines), TextFormatter.CalcRect (0, 0, text));
+		var lines = text.Split (text.Contains (Environment.NewLine) ? Environment.NewLine : "\n");
+		var maxWidth = lines.Max (s => s.GetColumns ());
+		var lineWider = 0;
+		for (var i = 0; i < lines.Length; i++) {
+			var w = lines [i].GetColumns ();
+			if (w == maxWidth) {
+				lineWider = i;
+			}
 		}
+		Assert.Equal (new Rect (0, 0, maxWidth, expectedLines), TextFormatter.CalcRect (0, 0, text));
+		Assert.Equal (new Rect (0, 0, lines [lineWider].ToRuneList ().Sum (r => Math.Max (r.GetColumns (), 0)), expectedLines), TextFormatter.CalcRect (0, 0, text));
+	}
 
-		[Theory]
-		[InlineData ("test", "", 0)]
-		[InlineData ("test", "te", 2)]
-		[InlineData ("test", "test", int.MaxValue)]
-		[InlineData ("A sentence has words.", "A sentence has words.", 22)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words.", 21)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words.", int.MaxValue)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words", 20)] // Should not fit
-		[InlineData ("A sentence has words.", "A sentence", 10)] // Should not fit
-		[InlineData ("A\tsentence\thas\twords.", "A sentence has words.", int.MaxValue)]
-		[InlineData ("A\tsentence\thas\twords.", "A sentence", 10)]
-		[InlineData ("line1\nline2\nline3long!", "line1\nline2\nline3long!", int.MaxValue)]
-		[InlineData ("line1\nline2\nline3long!", "line1\nline", 10)]
-		[InlineData (" ~  s  gui.cs   master ↑10", " ~  s  ", 10)] // Unicode
-		[InlineData ("Ð ÑÐ", "Ð ÑÐ", 5)] // should fit
-		[InlineData ("Ð ÑÐ", "Ð ÑÐ", 4)] // should fit
-		[InlineData ("Ð ÑÐ", "Ð Ñ", 3)] // Should not fit
-		public void ClipAndJustify_Valid_Centered (string text, string justifiedText, int maxWidth)
-		{
-			var align = TextAlignment.Centered;
-			var textDirection = TextDirection.LeftRight_TopBottom;
-			var tabWidth = 1;
-
-			Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
-			var expectedClippedWidth = Math.Min (justifiedText.GetRuneCount (), maxWidth);
-			Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
-			Assert.True (justifiedText.GetRuneCount () <= maxWidth);
-			Assert.True (justifiedText.GetColumns () <= maxWidth);
-			Assert.Equal (expectedClippedWidth, justifiedText.GetRuneCount ());
-			Assert.Equal (expectedClippedWidth, justifiedText.ToRuneList ().Sum (r => Math.Max (r.GetColumns (), 1)));
-			Assert.True (expectedClippedWidth <= maxWidth);
-			Assert.Equal (StringExtensions.ToString (justifiedText.ToRunes () [0..expectedClippedWidth]), justifiedText);
-		}
+	[Theory]
+	[InlineData ("")]
+	[InlineData (null)]
+	[InlineData ("test")]
+	public void ClipAndJustify_Invalid_Returns_Original (string text)
+	{
+		var expected = string.IsNullOrEmpty (text) ? text : "";
+		Assert.Equal (expected, TextFormatter.ClipAndJustify (text, 0, TextAlignment.Left));
+		Assert.Equal (expected, TextFormatter.ClipAndJustify (text, 0, TextAlignment.Left));
+		Assert.Throws<ArgumentOutOfRangeException> (() => TextFormatter.ClipAndJustify (text, -1, TextAlignment.Left));
+	}
 
-		[Theory]
-		[InlineData ("test", "", 0)]
-		[InlineData ("test", "te", 2)]
-		[InlineData ("test", "test", int.MaxValue)] // This doesn't throw because it only create a word with length 1
-		[InlineData ("A sentence has words.", "A  sentence has words.", 22)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words.", 21)] // should fit
-		[InlineData ("A sentence has words.", "A                                                                                                                                                                 sentence                                                                                                                                                                 has                                                                                                                                                                words.", 500)] // should fit
-		[InlineData ("A sentence has words.", "A sentence has words", 20)] // Should not fit
-		[InlineData ("A sentence has words.", "A sentence", 10)] // Should not fit
-									 // Now throw System.OutOfMemoryException. See https://stackoverflow.com/questions/20672920/maxcapacity-of-stringbuilder
-									 //[InlineData ("A\tsentence\thas\twords.", "A sentence has words.", int.MaxValue)]
-		[InlineData ("A\tsentence\thas\twords.", "A sentence", 10)]
-		[InlineData ("line1\nline2\nline3long!", "line1\nline2\nline3long!", int.MaxValue)] // This doesn't throw because it only create a line with length 1
-		[InlineData ("line1\nline2\nline3long!", "line1\nline", 10)]
-		[InlineData (" ~  s  gui.cs   master ↑10", " ~  s  ", 10)] // Unicode
-		[InlineData ("Ð ÑÐ", "Ð  ÑÐ", 5)] // should fit
-		[InlineData ("Ð ÑÐ", "Ð ÑÐ", 4)] // should fit
-		[InlineData ("Ð ÑÐ", "Ð Ñ", 3)] // Should not fit
-		public void ClipAndJustify_Valid_Justified (string text, string justifiedText, int maxWidth)
-		{
-			var align = TextAlignment.Justified;
-			var textDirection = TextDirection.LeftRight_TopBottom;
-			var tabWidth = 1;
-
-			Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
-			var expectedClippedWidth = Math.Min (justifiedText.GetRuneCount (), maxWidth);
-			Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
-			Assert.True (justifiedText.GetRuneCount () <= maxWidth);
-			Assert.True (justifiedText.GetColumns () <= maxWidth);
-			Assert.Equal (expectedClippedWidth, justifiedText.GetRuneCount ());
-			Assert.Equal (expectedClippedWidth, justifiedText.ToRuneList ().Sum (r => Math.Max (r.GetColumns (), 1)));
-			Assert.True (expectedClippedWidth <= maxWidth);
-			Assert.Equal (StringExtensions.ToString (justifiedText.ToRunes () [0..expectedClippedWidth]), justifiedText);
-
-			// see Justify_ tests below
-		}
+	[Theory]
+	[InlineData ("test", "", 0)]
+	[InlineData ("test", "te", 2)]
+	[InlineData ("test", "test", int.MaxValue)]
+	[InlineData ("A sentence has words.", "A sentence has words.", 22)]           // should fit
+	[InlineData ("A sentence has words.", "A sentence has words.", 21)]           // should fit
+	[InlineData ("A sentence has words.", "A sentence has words.", int.MaxValue)] // should fit
+	[InlineData ("A sentence has words.", "A sentence has words", 20)]           // Should not fit
+	[InlineData ("A sentence has words.", "A sentence", 10)]           // Should not fit
+	[InlineData ("A\tsentence\thas\twords.", "A sentence has words.", int.MaxValue)]
+	[InlineData ("A\tsentence\thas\twords.", "A sentence", 10)]
+	[InlineData ("line1\nline2\nline3long!", "line1\nline2\nline3long!", int.MaxValue)]
+	[InlineData ("line1\nline2\nline3long!", "line1\nline", 10)]
+	[InlineData (" ~  s  gui.cs   master ↑10", " ~  s  ", 10)] // Unicode
+	[InlineData ("Ð ÑÐ", "Ð ÑÐ", 5)]  // should fit
+	[InlineData ("Ð ÑÐ", "Ð ÑÐ", 4)]  // should fit
+	[InlineData ("Ð ÑÐ", "Ð Ñ", 3)]  // Should not fit
+	public void ClipAndJustify_Valid_Left (string text, string justifiedText, int maxWidth)
+	{
+		var align = TextAlignment.Left;
+		var textDirection = TextDirection.LeftRight_BottomTop;
+		var tabWidth = 1;
+
+		Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
+		var expectedClippedWidth = Math.Min (justifiedText.GetRuneCount (), maxWidth);
+		Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
+		Assert.True (justifiedText.GetRuneCount () <= maxWidth);
+		Assert.True (justifiedText.GetColumns () <= maxWidth);
+		Assert.Equal (expectedClippedWidth, justifiedText.GetRuneCount ());
+		Assert.Equal (expectedClippedWidth, justifiedText.ToRuneList ().Sum (r => Math.Max (r.GetColumns (), 1)));
+		Assert.True (expectedClippedWidth <= maxWidth);
+		Assert.Equal (StringExtensions.ToString (justifiedText.ToRunes () [..expectedClippedWidth]), justifiedText);
+	}
 
-		[Theory]
-		[InlineData ("")]
-		[InlineData (null)]
-		[InlineData ("test")]
-		public void Justify_Invalid (string text)
-		{
-			Assert.Equal (text, TextFormatter.Justify (text, 0));
-			Assert.Equal (text, TextFormatter.Justify (text, 0));
-			Assert.Throws<ArgumentOutOfRangeException> (() => TextFormatter.Justify (text, -1));
-		}
+	[Theory]
+	[InlineData ("test", "", 0)]
+	[InlineData ("test", "te", 2)]
+	[InlineData ("test", "test", int.MaxValue)]
+	[InlineData ("A sentence has words.", "A sentence has words.", 22)]           // should fit
+	[InlineData ("A sentence has words.", "A sentence has words.", 21)]           // should fit
+	[InlineData ("A sentence has words.", "A sentence has words.", int.MaxValue)] // should fit
+	[InlineData ("A sentence has words.", "A sentence has words", 20)]           // Should not fit
+	[InlineData ("A sentence has words.", "A sentence", 10)]           // Should not fit
+	[InlineData ("A\tsentence\thas\twords.", "A sentence has words.", int.MaxValue)]
+	[InlineData ("A\tsentence\thas\twords.", "A sentence", 10)]
+	[InlineData ("line1\nline2\nline3long!", "line1\nline2\nline3long!", int.MaxValue)]
+	[InlineData ("line1\nline2\nline3long!", "line1\nline", 10)]
+	[InlineData (" ~  s  gui.cs   master ↑10", " ~  s  ", 10)] // Unicode
+	[InlineData ("Ð ÑÐ", "Ð ÑÐ", 5)]  // should fit
+	[InlineData ("Ð ÑÐ", "Ð ÑÐ", 4)]  // should fit
+	[InlineData ("Ð ÑÐ", "Ð Ñ", 3)]  // Should not fit
+	public void ClipAndJustify_Valid_Right (string text, string justifiedText, int maxWidth)
+	{
+		var align = TextAlignment.Right;
+		var textDirection = TextDirection.LeftRight_BottomTop;
+		var tabWidth = 1;
+
+		Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
+		var expectedClippedWidth = Math.Min (justifiedText.GetRuneCount (), maxWidth);
+		Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
+		Assert.True (justifiedText.GetRuneCount () <= maxWidth);
+		Assert.True (justifiedText.GetColumns () <= maxWidth);
+		Assert.Equal (expectedClippedWidth, justifiedText.GetRuneCount ());
+		Assert.Equal (expectedClippedWidth, justifiedText.ToRuneList ().Sum (r => Math.Max (r.GetColumns (), 1)));
+		Assert.True (expectedClippedWidth <= maxWidth);
+		Assert.Equal (StringExtensions.ToString (justifiedText.ToRunes () [..expectedClippedWidth]), justifiedText);
+	}
 
-		[Theory]
-		[InlineData ("word")] // Even # of chars
-		[InlineData ("word.")] // Odd # of chars
-		[InlineData ("пÑивеÑ")] // Unicode (even #)
-		[InlineData ("пÑивеÑ.")] // Unicode (odd # of chars)
-		public void Justify_SingleWord (string text)
-		{
-			var justifiedText = text;
-			char fillChar = '+';
-
-			int width = text.GetRuneCount ();
-			Assert.Equal (justifiedText, TextFormatter.Justify (text, width, fillChar));
-			width = text.GetRuneCount () + 1;
-			Assert.Equal (justifiedText, TextFormatter.Justify (text, width, fillChar));
-			width = text.GetRuneCount () + 2;
-			Assert.Equal (justifiedText, TextFormatter.Justify (text, width, fillChar));
-			width = text.GetRuneCount () + 10;
-			Assert.Equal (justifiedText, TextFormatter.Justify (text, width, fillChar));
-			width = text.GetRuneCount () + 11;
-			Assert.Equal (justifiedText, TextFormatter.Justify (text, width, fillChar));
-		}
+	[Theory]
+	[InlineData ("test", "", 0)]
+	[InlineData ("test", "te", 2)]
+	[InlineData ("test", "test", int.MaxValue)]
+	[InlineData ("A sentence has words.", "A sentence has words.", 22)]           // should fit
+	[InlineData ("A sentence has words.", "A sentence has words.", 21)]           // should fit
+	[InlineData ("A sentence has words.", "A sentence has words.", int.MaxValue)] // should fit
+	[InlineData ("A sentence has words.", "A sentence has words", 20)]           // Should not fit
+	[InlineData ("A sentence has words.", "A sentence", 10)]           // Should not fit
+	[InlineData ("A\tsentence\thas\twords.", "A sentence has words.", int.MaxValue)]
+	[InlineData ("A\tsentence\thas\twords.", "A sentence", 10)]
+	[InlineData ("line1\nline2\nline3long!", "line1\nline2\nline3long!", int.MaxValue)]
+	[InlineData ("line1\nline2\nline3long!", "line1\nline", 10)]
+	[InlineData (" ~  s  gui.cs   master ↑10", " ~  s  ", 10)] // Unicode
+	[InlineData ("Ð ÑÐ", "Ð ÑÐ", 5)]  // should fit
+	[InlineData ("Ð ÑÐ", "Ð ÑÐ", 4)]  // should fit
+	[InlineData ("Ð ÑÐ", "Ð Ñ", 3)]  // Should not fit
+	public void ClipAndJustify_Valid_Centered (string text, string justifiedText, int maxWidth)
+	{
+		var align = TextAlignment.Centered;
+		var textDirection = TextDirection.LeftRight_TopBottom;
+		var tabWidth = 1;
+
+		Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
+		var expectedClippedWidth = Math.Min (justifiedText.GetRuneCount (), maxWidth);
+		Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
+		Assert.True (justifiedText.GetRuneCount () <= maxWidth);
+		Assert.True (justifiedText.GetColumns () <= maxWidth);
+		Assert.Equal (expectedClippedWidth, justifiedText.GetRuneCount ());
+		Assert.Equal (expectedClippedWidth, justifiedText.ToRuneList ().Sum (r => Math.Max (r.GetColumns (), 1)));
+		Assert.True (expectedClippedWidth <= maxWidth);
+		Assert.Equal (StringExtensions.ToString (justifiedText.ToRunes () [..expectedClippedWidth]), justifiedText);
+	}
 
-		[Theory]
-		// Even # of spaces
-		//            0123456789
-		[InlineData ("012 456 89", "012 456 89", 10, 0, "+", true)]
-		[InlineData ("012 456 89", "012++456+89", 11, 1)]
-		[InlineData ("012 456 89", "012 456 89", 12, 2, "++", true)]
-		[InlineData ("012 456 89", "012+++456++89", 13, 3)]
-		[InlineData ("012 456 89", "012 456 89", 14, 4, "+++", true)]
-		[InlineData ("012 456 89", "012++++456+++89", 15, 5)]
-		[InlineData ("012 456 89", "012 456 89", 16, 6, "++++", true)]
-		[InlineData ("012 456 89", "012 456 89", 30, 20, "+++++++++++", true)]
-		[InlineData ("012 456 89", "012+++++++++++++456++++++++++++89", 33, 23)]
-		// Odd # of spaces
-		//            01234567890123
-		[InlineData ("012 456 89 end", "012 456 89 end", 14, 0, "+", true)]
-		[InlineData ("012 456 89 end", "012++456+89+end", 15, 1)]
-		[InlineData ("012 456 89 end", "012++456++89+end", 16, 2)]
-		[InlineData ("012 456 89 end", "012 456 89 end", 17, 3, "++", true)]
-		[InlineData ("012 456 89 end", "012+++456++89++end", 18, 4)]
-		[InlineData ("012 456 89 end", "012+++456+++89++end", 19, 5)]
-		[InlineData ("012 456 89 end", "012 456 89 end", 20, 6, "+++", true)]
-		[InlineData ("012 456 89 end", "012++++++++456++++++++89+++++++end", 34, 20)]
-		[InlineData ("012 456 89 end", "012+++++++++456+++++++++89++++++++end", 37, 23)]
-		// Unicode
-		// Even # of chars
-		//            0123456789
-		[InlineData ("пÑРвРÑ", "пÑРвРÑ", 10, 0, "+", true)]
-		[InlineData ("пÑРвРÑ", "пÑÐ++вÐ+Ñ", 11, 1)]
-		[InlineData ("пÑРвРÑ", "пÑРвРÑ", 12, 2, "++", true)]
-		[InlineData ("пÑРвРÑ", "пÑÐ+++вÐ++Ñ", 13, 3)]
-		[InlineData ("пÑРвРÑ", "пÑРвРÑ", 14, 4, "+++", true)]
-		[InlineData ("пÑРвРÑ", "пÑÐ++++вÐ+++Ñ", 15, 5)]
-		[InlineData ("пÑРвРÑ", "пÑРвРÑ", 16, 6, "++++", true)]
-		[InlineData ("пÑРвРÑ", "пÑРвРÑ", 30, 20, "+++++++++++", true)]
-		[InlineData ("пÑРвРÑ", "пÑÐ+++++++++++++вÐ++++++++++++Ñ", 33, 23)]
-		// Unicode
-		// Odd # of chars
-		//            0123456789
-		[InlineData ("Ð ÑРвРÑ", "Ð ÑРвРÑ", 10, 0, "+", true)]
-		[InlineData ("Ð ÑРвРÑ", "Ð++ÑÐ+вÐ+Ñ", 11, 1)]
-		[InlineData ("Ð ÑРвРÑ", "Ð++ÑÐ++вÐ+Ñ", 12, 2)]
-		[InlineData ("Ð ÑРвРÑ", "Ð ÑРвРÑ", 13, 3, "++", true)]
-		[InlineData ("Ð ÑРвРÑ", "Ð+++ÑÐ++вÐ++Ñ", 14, 4)]
-		[InlineData ("Ð ÑРвРÑ", "Ð+++ÑÐ+++вÐ++Ñ", 15, 5)]
-		[InlineData ("Ð ÑРвРÑ", "Ð ÑРвРÑ", 16, 6, "+++", true)]
-		[InlineData ("Ð ÑРвРÑ", "Ð++++++++ÑÐ++++++++вÐ+++++++Ñ", 30, 20)]
-		[InlineData ("Ð ÑРвРÑ", "Ð+++++++++ÑÐ+++++++++вÐ++++++++Ñ", 33, 23)]
-		public void Justify_Sentence (string text, string justifiedText, int forceToWidth, int widthOffset, string replaceWith = null, bool replace = false)
-		{
-			char fillChar = '+';
-
-			Assert.Equal (forceToWidth, text.GetRuneCount () + widthOffset);
-			if (replace) {
-				justifiedText = text.Replace (" ", replaceWith);
-			}
-			Assert.Equal (justifiedText, TextFormatter.Justify (text, forceToWidth, fillChar));
-			Assert.True (Math.Abs (forceToWidth - justifiedText.GetRuneCount ()) < text.Count (s => s == ' '));
-			Assert.True (Math.Abs (forceToWidth - justifiedText.GetColumns ()) < text.Count (s => s == ' '));
-		}
+	[Theory]
+	[InlineData ("test", "", 0)]
+	[InlineData ("test", "te", 2)]
+	[InlineData ("test", "test", int.MaxValue)] // This doesn't throw because it only create a word with length 1
+	[InlineData ("A sentence has words.", "A  sentence has words.", 22)]           // should fit
+	[InlineData ("A sentence has words.", "A sentence has words.", 21)]           // should fit
+	[InlineData ("A sentence has words.",
+		"A                                                                                                                                                                 sentence                                                                                                                                                                 has                                                                                                                                                                words.",
+		500)]                                                      // should fit
+	[InlineData ("A sentence has words.", "A sentence has words", 20)] // Should not fit
+	[InlineData ("A sentence has words.", "A sentence", 10)] // Should not fit
+								 // Now throw System.OutOfMemoryException. See https://stackoverflow.com/questions/20672920/maxcapacity-of-stringbuilder
+								 //[InlineData ("A\tsentence\thas\twords.", "A sentence has words.", int.MaxValue)]
+	[InlineData ("A\tsentence\thas\twords.", "A sentence", 10)]
+	[InlineData ("line1\nline2\nline3long!", "line1\nline2\nline3long!", int.MaxValue)] // This doesn't throw because it only create a line with length 1
+	[InlineData ("line1\nline2\nline3long!", "line1\nline", 10)]
+	[InlineData (" ~  s  gui.cs   master ↑10", " ~  s  ", 10)] // Unicode
+	[InlineData ("Ð ÑÐ", "Ð  ÑÐ", 5)]  // should fit
+	[InlineData ("Ð ÑÐ", "Ð ÑÐ", 4)]  // should fit
+	[InlineData ("Ð ÑÐ", "Ð Ñ", 3)]  // Should not fit
+	public void ClipAndJustify_Valid_Justified (string text, string justifiedText, int maxWidth)
+	{
+		var align = TextAlignment.Justified;
+		var textDirection = TextDirection.LeftRight_TopBottom;
+		var tabWidth = 1;
+
+		Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
+		var expectedClippedWidth = Math.Min (justifiedText.GetRuneCount (), maxWidth);
+		Assert.Equal (justifiedText, TextFormatter.ClipAndJustify (text, maxWidth, align, textDirection, tabWidth));
+		Assert.True (justifiedText.GetRuneCount () <= maxWidth);
+		Assert.True (justifiedText.GetColumns () <= maxWidth);
+		Assert.Equal (expectedClippedWidth, justifiedText.GetRuneCount ());
+		Assert.Equal (expectedClippedWidth, justifiedText.ToRuneList ().Sum (r => Math.Max (r.GetColumns (), 1)));
+		Assert.True (expectedClippedWidth <= maxWidth);
+		Assert.Equal (StringExtensions.ToString (justifiedText.ToRunes () [..expectedClippedWidth]), justifiedText);
+
+		// see Justify_ tests below
+	}
 
-		[Fact]
-		public void WordWrap_Invalid ()
-		{
-			var text = string.Empty;
-			int width = 0;
+	[Theory]
+	[InlineData ("")]
+	[InlineData (null)]
+	[InlineData ("test")]
+	public void Justify_Invalid (string text)
+	{
+		Assert.Equal (text, TextFormatter.Justify (text, 0));
+		Assert.Equal (text, TextFormatter.Justify (text, 0));
+		Assert.Throws<ArgumentOutOfRangeException> (() => TextFormatter.Justify (text, -1));
+	}
 
-			Assert.Empty (TextFormatter.WordWrapText (null, width));
-			Assert.Empty (TextFormatter.WordWrapText (text, width));
-			Assert.Throws<ArgumentOutOfRangeException> (() => TextFormatter.WordWrapText (text, -1));
-		}
+	[Theory]
+	[InlineData ("word")]        // Even # of chars
+	[InlineData ("word.")]       // Odd # of chars
+	[InlineData ("пÑивеÑ")]  // Unicode (even #)
+	[InlineData ("пÑивеÑ.")] // Unicode (odd # of chars)
+	public void Justify_SingleWord (string text)
+	{
+		var justifiedText = text;
+		var fillChar = '+';
+
+		var width = text.GetRuneCount ();
+		Assert.Equal (justifiedText, TextFormatter.Justify (text, width, fillChar));
+		width = text.GetRuneCount () + 1;
+		Assert.Equal (justifiedText, TextFormatter.Justify (text, width, fillChar));
+		width = text.GetRuneCount () + 2;
+		Assert.Equal (justifiedText, TextFormatter.Justify (text, width, fillChar));
+		width = text.GetRuneCount () + 10;
+		Assert.Equal (justifiedText, TextFormatter.Justify (text, width, fillChar));
+		width = text.GetRuneCount () + 11;
+		Assert.Equal (justifiedText, TextFormatter.Justify (text, width, fillChar));
+	}
 
-		[Fact]
-		public void WordWrap_BigWidth ()
-		{
-			List<string> wrappedLines;
+	[Theory]
+	// Even # of spaces
+	//            0123456789
+	[InlineData ("012 456 89", "012 456 89", 10, 0, "+", true)]
+	[InlineData ("012 456 89", "012++456+89", 11, 1)]
+	[InlineData ("012 456 89", "012 456 89", 12, 2, "++", true)]
+	[InlineData ("012 456 89", "012+++456++89", 13, 3)]
+	[InlineData ("012 456 89", "012 456 89", 14, 4, "+++", true)]
+	[InlineData ("012 456 89", "012++++456+++89", 15, 5)]
+	[InlineData ("012 456 89", "012 456 89", 16, 6, "++++", true)]
+	[InlineData ("012 456 89", "012 456 89", 30, 20, "+++++++++++", true)]
+	[InlineData ("012 456 89", "012+++++++++++++456++++++++++++89", 33, 23)]
+	// Odd # of spaces
+	//            01234567890123
+	[InlineData ("012 456 89 end", "012 456 89 end", 14, 0, "+", true)]
+	[InlineData ("012 456 89 end", "012++456+89+end", 15, 1)]
+	[InlineData ("012 456 89 end", "012++456++89+end", 16, 2)]
+	[InlineData ("012 456 89 end", "012 456 89 end", 17, 3, "++", true)]
+	[InlineData ("012 456 89 end", "012+++456++89++end", 18, 4)]
+	[InlineData ("012 456 89 end", "012+++456+++89++end", 19, 5)]
+	[InlineData ("012 456 89 end", "012 456 89 end", 20, 6, "+++", true)]
+	[InlineData ("012 456 89 end", "012++++++++456++++++++89+++++++end", 34, 20)]
+	[InlineData ("012 456 89 end", "012+++++++++456+++++++++89++++++++end", 37, 23)]
+	// Unicode
+	// Even # of chars
+	//            0123456789
+	[InlineData ("пÑРвРÑ", "пÑРвРÑ", 10, 0, "+", true)]
+	[InlineData ("пÑРвРÑ", "пÑÐ++вÐ+Ñ", 11, 1)]
+	[InlineData ("пÑРвРÑ", "пÑРвРÑ", 12, 2, "++", true)]
+	[InlineData ("пÑРвРÑ", "пÑÐ+++вÐ++Ñ", 13, 3)]
+	[InlineData ("пÑРвРÑ", "пÑРвРÑ", 14, 4, "+++", true)]
+	[InlineData ("пÑРвРÑ", "пÑÐ++++вÐ+++Ñ", 15, 5)]
+	[InlineData ("пÑРвРÑ", "пÑРвРÑ", 16, 6, "++++", true)]
+	[InlineData ("пÑРвРÑ", "пÑРвРÑ", 30, 20, "+++++++++++", true)]
+	[InlineData ("пÑРвРÑ", "пÑÐ+++++++++++++вÐ++++++++++++Ñ", 33, 23)]
+	// Unicode
+	// Odd # of chars
+	//            0123456789
+	[InlineData ("Ð ÑРвРÑ", "Ð ÑРвРÑ", 10, 0, "+", true)]
+	[InlineData ("Ð ÑРвРÑ", "Ð++ÑÐ+вÐ+Ñ", 11, 1)]
+	[InlineData ("Ð ÑРвРÑ", "Ð++ÑÐ++вÐ+Ñ", 12, 2)]
+	[InlineData ("Ð ÑРвРÑ", "Ð ÑРвРÑ", 13, 3, "++", true)]
+	[InlineData ("Ð ÑРвРÑ", "Ð+++ÑÐ++вÐ++Ñ", 14, 4)]
+	[InlineData ("Ð ÑРвРÑ", "Ð+++ÑÐ+++вÐ++Ñ", 15, 5)]
+	[InlineData ("Ð ÑРвРÑ", "Ð ÑРвРÑ", 16, 6, "+++", true)]
+	[InlineData ("Ð ÑРвРÑ", "Ð++++++++ÑÐ++++++++вÐ+++++++Ñ", 30, 20)]
+	[InlineData ("Ð ÑРвРÑ", "Ð+++++++++ÑÐ+++++++++вÐ++++++++Ñ", 33, 23)]
+	public void Justify_Sentence (string text, string justifiedText, int forceToWidth, int widthOffset, string replaceWith = null, bool replace = false)
+	{
+		var fillChar = '+';
+
+		Assert.Equal (forceToWidth, text.GetRuneCount () + widthOffset);
+		if (replace) {
+			justifiedText = text.Replace (" ", replaceWith);
+		}
+		Assert.Equal (justifiedText, TextFormatter.Justify (text, forceToWidth, fillChar));
+		Assert.True (Math.Abs (forceToWidth - justifiedText.GetRuneCount ()) < text.Count (s => s == ' '));
+		Assert.True (Math.Abs (forceToWidth - justifiedText.GetColumns ()) < text.Count (s => s == ' '));
+	}
 
-			var text = "Constantinople";
-			wrappedLines = TextFormatter.WordWrapText (text, 100);
-			Assert.True (wrappedLines.Count == 1);
-			Assert.Equal ("Constantinople", wrappedLines [0]);
-		}
+	[Fact]
+	public void WordWrap_Invalid ()
+	{
+		var text = string.Empty;
+		var width = 0;
 
-		[Theory]
-		[InlineData ("Constantinople", 14, 0, new string [] { "Constantinople" })]
-		[InlineData ("Constantinople", 12, -2, new string [] { "Constantinop", "le" })]
-		[InlineData ("Constantinople", 9, -5, new string [] { "Constanti", "nople" })]
-		[InlineData ("Constantinople", 7, -7, new string [] { "Constan", "tinople" })]
-		[InlineData ("Constantinople", 5, -9, new string [] { "Const", "antin", "ople" })]
-		[InlineData ("Constantinople", 4, -10, new string [] { "Cons", "tant", "inop", "le" })]
-		[InlineData ("Constantinople", 1, -13, new string [] { "C", "o", "n", "s", "t", "a", "n", "t", "i", "n", "o", "p", "l", "e" })]
-		public void WordWrap_SingleWordLine (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+		Assert.Empty (TextFormatter.WordWrapText (null, width));
+		Assert.Empty (TextFormatter.WordWrapText (text, width));
+		Assert.Throws<ArgumentOutOfRangeException> (() => TextFormatter.WordWrapText (text, -1));
+	}
 
-		[Theory]
-		[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 51, 0, new string [] { "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ" })]
-		[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 50, -1, new string [] { "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ" })]
-		[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 46, -5, new string [] { "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮ", "ฯะัาำ" })]
-		[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 26, -25, new string [] { "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบ", "ปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ" })]
-		[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 17, -34, new string [] { "กขฃคฅฆงจฉชซฌญฎฏฐฑ", "ฒณดตถทธนบปผฝพฟภมย", "รฤลฦวศษสหฬอฮฯะัาำ" })]
-		[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 13, -38, new string [] { "กขฃคฅฆงจฉชซฌญ", "ฎฏฐฑฒณดตถทธนบ", "ปผฝพฟภมยรฤลฦว", "ศษสหฬอฮฯะัาำ" })]
-		[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 1, -50, new string [] { "ก", "ข", "ฃ", "ค", "ฅ", "ฆ", "ง", "จ", "ฉ", "ช", "ซ", "ฌ", "ญ", "ฎ", "ฏ", "ฐ", "ฑ", "ฒ", "ณ", "ด", "ต", "ถ", "ท", "ธ", "น", "บ", "ป", "ผ", "ฝ", "พ", "ฟ", "ภ", "ม", "ย", "ร", "ฤ", "ล", "ฦ", "ว", "ศ", "ษ", "ส", "ห", "ฬ", "อ", "ฮ", "ฯ", "ะั", "า", "ำ" })]
-		public void WordWrap_Unicode_SingleWordLine (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			List<string> wrappedLines;
-
-			var zeroWidth = text.EnumerateRunes ().Where (r => r.GetColumns () == 0);
-			Assert.Single (zeroWidth);
-			Assert.Equal ('ั', zeroWidth.ElementAt (0).Value);
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount () + zeroWidth.Count () - 1 + widthOffset) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+	[Fact]
+	public void WordWrap_BigWidth ()
+	{
+		List<string> wrappedLines;
 
-		[Theory]
-		[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 19, 0, new string [] { "This\u00A0is\u00A0a\u00A0sentence." })]
-		[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 18, -1, new string [] { "This\u00A0is\u00A0a\u00A0sentence", "." })]
-		[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 17, -2, new string [] { "This\u00A0is\u00A0a\u00A0sentenc", "e." })]
-		[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 14, -5, new string [] { "This\u00A0is\u00A0a\u00A0sent", "ence." })]
-		[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 10, -9, new string [] { "This\u00A0is\u00A0a\u00A0", "sentence." })]
-		[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 7, -12, new string [] { "This\u00A0is", "\u00A0a\u00A0sent", "ence." })]
-		[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 5, -14, new string [] { "This\u00A0", "is\u00A0a\u00A0", "sente", "nce." })]
-		[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 1, -18, new string [] { "T", "h", "i", "s", "\u00A0", "i", "s", "\u00A0", "a", "\u00A0", "s", "e", "n", "t", "e", "n", "c", "e", "." })]
-		public void WordWrap_Unicode_LineWithNonBreakingSpace (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+		var text = "Constantinople";
+		wrappedLines = TextFormatter.WordWrapText (text, 100);
+		Assert.True (wrappedLines.Count == 1);
+		Assert.Equal ("Constantinople", wrappedLines [0]);
+	}
 
-		[Theory]
-		[InlineData ("This\u00A0is\n\u00A0a\u00A0sentence.", 20, 0, new string [] { "This\u00A0is\u00A0a\u00A0sentence." })]
-		[InlineData ("This\u00A0is\n\u00A0a\u00A0sentence.", 19, -1, new string [] { "This\u00A0is\u00A0a\u00A0sentence." })]
-		[InlineData ("\u00A0\u00A0\u00A0\u00A0\u00A0test\u00A0sentence.", 19, 0, new string [] { "\u00A0\u00A0\u00A0\u00A0\u00A0test\u00A0sentence." })]
-		public void WordWrap_Unicode_2LinesWithNonBreakingSpace (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+	[Theory]
+	[InlineData ("Constantinople", 14, 0, new [] { "Constantinople" })]
+	[InlineData ("Constantinople", 12, -2, new [] { "Constantinop", "le" })]
+	[InlineData ("Constantinople", 9, -5, new [] { "Constanti", "nople" })]
+	[InlineData ("Constantinople", 7, -7, new [] { "Constan", "tinople" })]
+	[InlineData ("Constantinople", 5, -9, new [] { "Const", "antin", "ople" })]
+	[InlineData ("Constantinople", 4, -10, new [] { "Cons", "tant", "inop", "le" })]
+	[InlineData ("Constantinople", 1, -13, new [] { "C", "o", "n", "s", "t", "a", "n", "t", "i", "n", "o", "p", "l", "e" })]
+	public void WordWrap_SingleWordLine (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData ("A sentence has words.", 21, 0, new string [] { "A sentence has words." })]
-		[InlineData ("A sentence has words.", 20, -1, new string [] { "A sentence has", "words." })]
-		[InlineData ("A sentence has words.", 15, -6, new string [] { "A sentence has", "words." })]
-		[InlineData ("A sentence has words.", 14, -7, new string [] { "A sentence has", "words." })]
-		[InlineData ("A sentence has words.", 13, -8, new string [] { "A sentence", "has words." })]
-		// Unicode 
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 42, 0, new string [] { "A Unicode sentence (пÑивеÑ) has words." })]
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 41, -1, new string [] { "A Unicode sentence (пÑивеÑ) has", "words." })]
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 36, -6, new string [] { "A Unicode sentence (пÑивеÑ) has", "words." })]
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 35, -7, new string [] { "A Unicode sentence (пÑивеÑ) has", "words." })]
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 34, -8, new string [] { "A Unicode sentence (пÑивеÑ)", "has words." })]
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 25, -17, new string [] { "A Unicode sentence", "(пÑивеÑ) has words." })]
-		public void WordWrap_NoNewLines_Default (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			// Calls WordWrapText (text, width) and thus preserveTrailingSpaces defaults to false
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+	[Theory]
+	[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 51, 0, new [] { "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ" })]
+	[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 50, -1, new [] { "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ" })]
+	[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 46, -5, new [] { "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮ", "ฯะัาำ" })]
+	[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 26, -25, new [] { "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบ", "ปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ" })]
+	[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 17, -34, new [] { "กขฃคฅฆงจฉชซฌญฎฏฐฑ", "ฒณดตถทธนบปผฝพฟภมย", "รฤลฦวศษสหฬอฮฯะัาำ" })]
+	[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 13, -38, new [] { "กขฃคฅฆงจฉชซฌญ", "ฎฏฐฑฒณดตถทธนบ", "ปผฝพฟภมยรฤลฦว", "ศษสหฬอฮฯะัาำ" })]
+	[InlineData ("กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำ", 1, -50,
+		new [] {
+			"ก", "ข", "ฃ", "ค", "ฅ", "ฆ", "ง", "จ", "ฉ", "ช", "ซ", "ฌ", "ญ", "ฎ", "ฏ", "ฐ", "ฑ", "ฒ", "ณ", "ด", "ต", "ถ", "ท", "ธ", "น", "บ", "ป", "ผ", "ฝ", "พ", "ฟ", "ภ", "ม", "ย", "ร",
+			"ฤ", "ล", "ฦ", "ว", "ศ", "ษ", "ส", "ห", "ฬ", "อ", "ฮ", "ฯ", "ะั", "า", "ำ"
+		})]
+	public void WordWrap_Unicode_SingleWordLine (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		List<string> wrappedLines;
+
+		var zeroWidth = text.EnumerateRunes ().Where (r => r.GetColumns () == 0);
+		Assert.Single (zeroWidth);
+		Assert.Equal ('ั', zeroWidth.ElementAt (0).Value);
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount () + zeroWidth.Count () - 1 + widthOffset) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		/// <summary>
-		/// WordWrap strips CRLF
-		/// </summary>
-		[Theory]
-		[InlineData ("A sentence has words.\nA paragraph has lines.", 44, 0, new string [] { "A sentence has words.A paragraph has lines." })]
-		[InlineData ("A sentence has words.\nA paragraph has lines.", 43, -1, new string [] { "A sentence has words.A paragraph has lines." })]
-		[InlineData ("A sentence has words.\nA paragraph has lines.", 38, -6, new string [] { "A sentence has words.A paragraph has", "lines." })]
-		[InlineData ("A sentence has words.\nA paragraph has lines.", 34, -10, new string [] { "A sentence has words.A paragraph", "has lines." })]
-		[InlineData ("A sentence has words.\nA paragraph has lines.", 27, -17, new string [] { "A sentence has words.A", "paragraph has lines." })]
-		// Unicode 
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.\nA Unicode Пункт has Линии.", 69, 0, new string [] { "A Unicode sentence (пÑивеÑ) has words.A Unicode Пункт has Линии." })]
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.\nA Unicode Пункт has Линии.", 68, -1, new string [] { "A Unicode sentence (пÑивеÑ) has words.A Unicode Пункт has Линии." })]
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.\nA Unicode Пункт has Линии.", 63, -6, new string [] { "A Unicode sentence (пÑивеÑ) has words.A Unicode Пункт has", "Линии." })]
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.\nA Unicode Пункт has Линии.", 59, -10, new string [] { "A Unicode sentence (пÑивеÑ) has words.A Unicode Пункт", "has Линии." })]
-		[InlineData ("A Unicode sentence (пÑивеÑ) has words.\nA Unicode Пункт has Линии.", 52, -17, new string [] { "A Unicode sentence (пÑивеÑ) has words.A Unicode", "Пункт has Линии." })]
-		public void WordWrap_WithNewLines (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+	[Theory]
+	[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 19, 0, new [] { "This\u00A0is\u00A0a\u00A0sentence." })]
+	[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 18, -1, new [] { "This\u00A0is\u00A0a\u00A0sentence", "." })]
+	[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 17, -2, new [] { "This\u00A0is\u00A0a\u00A0sentenc", "e." })]
+	[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 14, -5, new [] { "This\u00A0is\u00A0a\u00A0sent", "ence." })]
+	[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 10, -9, new [] { "This\u00A0is\u00A0a\u00A0", "sentence." })]
+	[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 7, -12, new [] { "This\u00A0is", "\u00A0a\u00A0sent", "ence." })]
+	[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 5, -14, new [] { "This\u00A0", "is\u00A0a\u00A0", "sente", "nce." })]
+	[InlineData ("This\u00A0is\u00A0a\u00A0sentence.", 1, -18, new [] { "T", "h", "i", "s", "\u00A0", "i", "s", "\u00A0", "a", "\u00A0", "s", "e", "n", "t", "e", "n", "c", "e", "." })]
+	public void WordWrap_Unicode_LineWithNonBreakingSpace (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData ("A sentence has words.", 3, -18, new string [] { "A", "sen", "ten", "ce", "has", "wor", "ds." })]
-		[InlineData ("A sentence has words.", 2, -19, new string [] { "A", "se", "nt", "en", "ce", "ha", "s", "wo", "rd", "s." })]
-		[InlineData ("A sentence has words.", 1, -20, new string [] { "A", "s", "e", "n", "t", "e", "n", "c", "e", "h", "a", "s", "w", "o", "r", "d", "s", "." })]
-		public void WordWrap_Narrow_Default (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			// Calls WordWrapText (text, width) and thus preserveTrailingSpaces defaults to false
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+	[Theory]
+	[InlineData ("This\u00A0is\n\u00A0a\u00A0sentence.", 20, 0, new [] { "This\u00A0is\u00A0a\u00A0sentence." })]
+	[InlineData ("This\u00A0is\n\u00A0a\u00A0sentence.", 19, -1, new [] { "This\u00A0is\u00A0a\u00A0sentence." })]
+	[InlineData ("\u00A0\u00A0\u00A0\u00A0\u00A0test\u00A0sentence.", 19, 0, new [] { "\u00A0\u00A0\u00A0\u00A0\u00A0test\u00A0sentence." })]
+	public void WordWrap_Unicode_2LinesWithNonBreakingSpace (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData ("A sentence has words.", 14, -7, new string [] { "A sentence ", "has words." })]
-		[InlineData ("A sentence has words.", 8, -13, new string [] { "A ", "sentence", " has ", "words." })]
-		[InlineData ("A sentence has words.", 6, -15, new string [] { "A ", "senten", "ce ", "has ", "words." })]
-		[InlineData ("A sentence has words.", 3, -18, new string [] { "A ", "sen", "ten", "ce ", "has", " ", "wor", "ds." })]
-		[InlineData ("A sentence has words.", 2, -19, new string [] { "A ", "se", "nt", "en", "ce", " ", "ha", "s ", "wo", "rd", "s." })]
-		[InlineData ("A sentence has words.", 1, -20, new string [] { "A", " ", "s", "e", "n", "t", "e", "n", "c", "e", " ", "h", "a", "s", " ", "w", "o", "r", "d", "s", "." })]
-		public void WordWrap_PreserveTrailingSpaces_True (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth, preserveTrailingSpaces: true);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+	[Theory]
+	[InlineData ("A sentence has words.", 21, 0, new [] { "A sentence has words." })]
+	[InlineData ("A sentence has words.", 20, -1, new [] { "A sentence has", "words." })]
+	[InlineData ("A sentence has words.", 15, -6, new [] { "A sentence has", "words." })]
+	[InlineData ("A sentence has words.", 14, -7, new [] { "A sentence has", "words." })]
+	[InlineData ("A sentence has words.", 13, -8, new [] { "A sentence", "has words." })]
+	// Unicode 
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 42, 0, new [] { "A Unicode sentence (пÑивеÑ) has words." })]
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 41, -1, new [] { "A Unicode sentence (пÑивеÑ) has", "words." })]
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 36, -6, new [] { "A Unicode sentence (пÑивеÑ) has", "words." })]
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 35, -7, new [] { "A Unicode sentence (пÑивеÑ) has", "words." })]
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 34, -8, new [] { "A Unicode sentence (пÑивеÑ)", "has words." })]
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.", 25, -17, new [] { "A Unicode sentence", "(пÑивеÑ) has words." })]
+	public void WordWrap_NoNewLines_Default (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		// Calls WordWrapText (text, width) and thus preserveTrailingSpaces defaults to false
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData ("文に は言葉 があり ます。", 14, 0, new string [] { "文に は言葉 ", "があり ます。" })]
-		[InlineData ("文に は言葉 があり ます。", 3, -11, new string [] { "文", "に ", "は", "言", "葉 ", "が", "あ", "り ", "ま", "す", "。" })]
-		[InlineData ("文に は言葉 があり ます。", 2, -12, new string [] { "文", "に", " ", "は", "言", "葉", " ", "が", "あ", "り", " ", "ま", "す", "。" })]
-		[InlineData ("文に は言葉 があり ます。", 1, -13, new string [] { })]
-		public void WordWrap_PreserveTrailingSpaces_True_Wide_Runes (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth, preserveTrailingSpaces: true);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+	/// <summary>
+	/// WordWrap strips CRLF
+	/// </summary>
+	[Theory]
+	[InlineData ("A sentence has words.\nA paragraph has lines.", 44, 0, new [] { "A sentence has words.A paragraph has lines." })]
+	[InlineData ("A sentence has words.\nA paragraph has lines.", 43, -1, new [] { "A sentence has words.A paragraph has lines." })]
+	[InlineData ("A sentence has words.\nA paragraph has lines.", 38, -6, new [] { "A sentence has words.A paragraph has", "lines." })]
+	[InlineData ("A sentence has words.\nA paragraph has lines.", 34, -10, new [] { "A sentence has words.A paragraph", "has lines." })]
+	[InlineData ("A sentence has words.\nA paragraph has lines.", 27, -17, new [] { "A sentence has words.A", "paragraph has lines." })]
+	// Unicode 
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.\nA Unicode Пункт has Линии.", 69, 0, new [] { "A Unicode sentence (пÑивеÑ) has words.A Unicode Пункт has Линии." })]
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.\nA Unicode Пункт has Линии.", 68, -1, new [] { "A Unicode sentence (пÑивеÑ) has words.A Unicode Пункт has Линии." })]
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.\nA Unicode Пункт has Линии.", 63, -6, new [] { "A Unicode sentence (пÑивеÑ) has words.A Unicode Пункт has", "Линии." })]
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.\nA Unicode Пункт has Линии.", 59, -10, new [] { "A Unicode sentence (пÑивеÑ) has words.A Unicode Пункт", "has Линии." })]
+	[InlineData ("A Unicode sentence (пÑивеÑ) has words.\nA Unicode Пункт has Линии.", 52, -17, new [] { "A Unicode sentence (пÑивеÑ) has words.A Unicode", "Пункт has Линии." })]
+	public void WordWrap_WithNewLines (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData ("文に は言葉 があり ます。", 14, 0, new string [] { "文に は言葉", "があり ます。" })]
-		[InlineData ("文に は言葉 があり ます。", 3, -11, new string [] { "文", "に", "は", "言", "葉", "が", "あ", "り", "ま", "す", "。" })]
-		[InlineData ("文に は言葉 があり ます。", 2, -12, new string [] { "文", "に", "は", "言", "葉", "が", "あ", "り", "ま", "す", "。" })]
-		[InlineData ("文に は言葉 があり ます。", 1, -13, new string [] { " ", " ", " " })] // Just Spaces; should result in a single space for each line
-		public void WordWrap_PreserveTrailingSpaces_False_Wide_Runes (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+	[Theory]
+	[InlineData ("A sentence has words.", 3, -18, new [] { "A", "sen", "ten", "ce", "has", "wor", "ds." })]
+	[InlineData ("A sentence has words.", 2, -19, new [] { "A", "se", "nt", "en", "ce", "ha", "s", "wo", "rd", "s." })]
+	[InlineData ("A sentence has words.", 1, -20, new [] { "A", "s", "e", "n", "t", "e", "n", "c", "e", "h", "a", "s", "w", "o", "r", "d", "s", "." })]
+	public void WordWrap_Narrow_Default (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		// Calls WordWrapText (text, width) and thus preserveTrailingSpaces defaults to false
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData ("A sentence has words. ", 3, new string [] { "A ", "sen", "ten", "ce ", "has", " ", "wor", "ds.", " " })]
-		[InlineData ("A   sentence          has  words.  ", 3, new string [] { "A  ", " ", "sen", "ten", "ce ", "   ", "   ", "   ", "has", "  ", "wor", "ds.", "  " })]
-		public void WordWrap_PreserveTrailingSpaces_True_With_Simple_Runes_Width_3 (string text, int width, IEnumerable<string> resultLines)
-		{
-			var wrappedLines = TextFormatter.WordWrapText (text, width, preserveTrailingSpaces: true);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.Equal (resultLines, wrappedLines);
-			var breakLines = "";
-			foreach (var line in wrappedLines) {
-				breakLines += $"{line}{Environment.NewLine}";
-			}
-			var expected = string.Empty;
-			foreach (var line in resultLines) {
-				expected += $"{line}{Environment.NewLine}";
-			}
-			Assert.Equal (expected, breakLines);
-
-			// Double space Complex example - this is how VS 2022 does it
-			//text = "A  sentence      has words.  ";
-			//breakLines = "";
-			//wrappedLines = TextFormatter.WordWrapText (text, width, preserveTrailingSpaces: true);
-			//foreach (var line in wrappedLines) {
-			//	breakLines += $"{line}{Environment.NewLine}";
-			//}
-			//expected = "A  " + Environment.NewLine +
-			//	" se" + Environment.NewLine +
-			//	" nt" + Environment.NewLine +
-			//	" en" + Environment.NewLine +
-			//	" ce" + Environment.NewLine +
-			//	"  " + Environment.NewLine +
-			//	"  " + Environment.NewLine +
-			//	"  " + Environment.NewLine +
-			//	" ha" + Environment.NewLine +
-			//	" s " + Environment.NewLine +
-			//	" wo" + Environment.NewLine +
-			//	" rd" + Environment.NewLine +
-			//	" s." + Environment.NewLine;
-			//Assert.Equal (expected, breakLines);
-		}
+	[Theory]
+	[InlineData ("A sentence has words.", 14, -7, new [] { "A sentence ", "has words." })]
+	[InlineData ("A sentence has words.", 8, -13, new [] { "A ", "sentence", " has ", "words." })]
+	[InlineData ("A sentence has words.", 6, -15, new [] { "A ", "senten", "ce ", "has ", "words." })]
+	[InlineData ("A sentence has words.", 3, -18, new [] { "A ", "sen", "ten", "ce ", "has", " ", "wor", "ds." })]
+	[InlineData ("A sentence has words.", 2, -19, new [] { "A ", "se", "nt", "en", "ce", " ", "ha", "s ", "wo", "rd", "s." })]
+	[InlineData ("A sentence has words.", 1, -20, new [] { "A", " ", "s", "e", "n", "t", "e", "n", "c", "e", " ", "h", "a", "s", " ", "w", "o", "r", "d", "s", "." })]
+	public void WordWrap_PreserveTrailingSpaces_True (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth, true);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData (null, 1, new string [] { })] // null input
-		[InlineData ("", 1, new string [] { })] // Empty input
-		[InlineData ("1 34", 1, new string [] { "1", "3", "4" })] // Single Spaces
-		[InlineData ("1", 1, new string [] { "1" })] // Short input
-		[InlineData ("12", 1, new string [] { "1", "2" })]
-		[InlineData ("123", 1, new string [] { "1", "2", "3" })]
-		[InlineData ("123456", 1, new string [] { "1", "2", "3", "4", "5", "6" })] // No spaces
-		[InlineData (" ", 1, new string [] { " " })] // Just Spaces; should result in a single space
-		[InlineData ("  ", 1, new string [] { " " })]
-		[InlineData ("   ", 1, new string [] { " ", " " })]
-		[InlineData ("    ", 1, new string [] { " ", " " })]
-		[InlineData ("12 456", 1, new string [] { "1", "2", "4", "5", "6" })] // Single Spaces
-		[InlineData (" 2 456", 1, new string [] { " ", "2", "4", "5", "6" })] // Leading spaces should be preserved.
-		[InlineData (" 2 456 8", 1, new string [] { " ", "2", "4", "5", "6", "8" })]
-		[InlineData ("A sentence has words. ", 1, new string [] { "A", "s", "e", "n", "t", "e", "n", "c", "e", "h", "a", "s", "w", "o", "r", "d", "s", "." })] // Complex example
-		[InlineData ("12  567", 1, new string [] { "1", "2", " ", "5", "6", "7" })] // Double Spaces
-		[InlineData ("  3 567", 1, new string [] { " ", "3", "5", "6", "7" })] // Double Leading spaces should be preserved.
-		[InlineData ("  3  678  1", 1, new string [] { " ", "3", " ", "6", "7", "8", " ", "1" })]
-		[InlineData ("1  456", 1, new string [] { "1", " ", "4", "5", "6" })]
-		[InlineData ("A  sentence   has words.  ", 1, new string [] { "A", " ", "s", "e", "n", "t", "e", "n", "c", "e", " ", "h", "a", "s", "w", "o", "r", "d", "s", ".", " " })] // Double space Complex example
-		public void WordWrap_PreserveTrailingSpaces_False_With_Simple_Runes_Width_1 (string text, int width, IEnumerable<string> resultLines)
-		{
-			var wrappedLines = TextFormatter.WordWrapText (text, width, preserveTrailingSpaces: false);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.Equal (resultLines, wrappedLines);
-			var breakLines = "";
-			foreach (var line in wrappedLines) {
-				breakLines += $"{line}{Environment.NewLine}";
-			}
-			var expected = string.Empty;
-			foreach (var line in resultLines) {
-				expected += $"{line}{Environment.NewLine}";
-			}
-			Assert.Equal (expected, breakLines);
-		}
+	[Theory]
+	[InlineData ("文に は言葉 があり ます。", 14, 0, new [] { "文に は言葉 ", "があり ます。" })]
+	[InlineData ("文に は言葉 があり ます。", 3, -11, new [] { "文", "に ", "は", "言", "葉 ", "が", "あ", "り ", "ま", "す", "。" })]
+	[InlineData ("文に は言葉 があり ます。", 2, -12, new [] { "文", "に", " ", "は", "言", "葉", " ", "が", "あ", "り", " ", "ま", "す", "。" })]
+	[InlineData ("文に は言葉 があり ます。", 1, -13, new string [] { })]
+	public void WordWrap_PreserveTrailingSpaces_True_Wide_Runes (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth, true);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData (null, 3, new string [] { })] // null input
-		[InlineData ("", 3, new string [] { })] // Empty input
-		[InlineData ("1", 3, new string [] { "1" })] // Short input
-		[InlineData ("12", 3, new string [] { "12" })]
-		[InlineData ("123", 3, new string [] { "123" })]
-		[InlineData ("123456", 3, new string [] { "123", "456" })] // No spaces
-		[InlineData ("1234567", 3, new string [] { "123", "456", "7" })] // No spaces
-		[InlineData (" ", 3, new string [] { " " })] // Just Spaces; should result in a single space
-		[InlineData ("  ", 3, new string [] { "  " })]
-		[InlineData ("   ", 3, new string [] { "   " })]
-		[InlineData ("    ", 3, new string [] { "   " })]
-		[InlineData ("12 456", 3, new string [] { "12", "456" })] // Single Spaces
-		[InlineData (" 2 456", 3, new string [] { " 2", "456" })] // Leading spaces should be preserved.
-		[InlineData (" 2 456 8", 3, new string [] { " 2", "456", "8" })]
-		[InlineData ("A sentence has words. ", 3, new string [] { "A", "sen", "ten", "ce", "has", "wor", "ds." })] // Complex example
-		[InlineData ("12  567", 3, new string [] { "12 ", "567" })] // Double Spaces
-		[InlineData ("  3 567", 3, new string [] { "  3", "567" })] // Double Leading spaces should be preserved.
-		[InlineData ("  3  678  1", 3, new string [] { "  3", " 67", "8 ", "1" })]
-		[InlineData ("1  456", 3, new string [] { "1 ", "456" })]
-		[InlineData ("A  sentence      has words.  ", 3, new string [] { "A ", "sen", "ten", "ce ", "   ", "has", "wor", "ds.", " " })] // Double space Complex example
-		public void WordWrap_PreserveTrailingSpaces_False_With_Simple_Runes_Width_3 (string text, int width, IEnumerable<string> resultLines)
-		{
-			var wrappedLines = TextFormatter.WordWrapText (text, width, preserveTrailingSpaces: false);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.Equal (resultLines, wrappedLines);
-			var breakLines = "";
-			foreach (var line in wrappedLines) {
-				breakLines += $"{line}{Environment.NewLine}";
-			}
-			var expected = string.Empty;
-			foreach (var line in resultLines) {
-				expected += $"{line}{Environment.NewLine}";
-			}
-			Assert.Equal (expected, breakLines);
-		}
+	[Theory]
+	[InlineData ("文に は言葉 があり ます。", 14, 0, new [] { "文に は言葉", "があり ます。" })]
+	[InlineData ("文に は言葉 があり ます。", 3, -11, new [] { "文", "に", "は", "言", "葉", "が", "あ", "り", "ま", "す", "。" })]
+	[InlineData ("文に は言葉 があり ます。", 2, -12, new [] { "文", "に", "は", "言", "葉", "が", "あ", "り", "ま", "す", "。" })]
+	[InlineData ("文に は言葉 があり ます。", 1, -13, new [] { " ", " ", " " })] // Just Spaces; should result in a single space for each line
+	public void WordWrap_PreserveTrailingSpaces_False_Wide_Runes (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData (null, 50, new string [] { })] // null input
-		[InlineData ("", 50, new string [] { })] // Empty input
-		[InlineData ("1", 50, new string [] { "1" })] // Short input
-		[InlineData ("12", 50, new string [] { "12" })]
-		[InlineData ("123", 50, new string [] { "123" })]
-		[InlineData ("123456", 50, new string [] { "123456" })] // No spaces
-		[InlineData ("1234567", 50, new string [] { "1234567" })] // No spaces
-		[InlineData (" ", 50, new string [] { " " })] // Just Spaces; should result in a single space
-		[InlineData ("  ", 50, new string [] { "  " })]
-		[InlineData ("   ", 50, new string [] { "   " })]
-		[InlineData ("12 456", 50, new string [] { "12 456" })] // Single Spaces
-		[InlineData (" 2 456", 50, new string [] { " 2 456" })] // Leading spaces should be preserved.
-		[InlineData (" 2 456 8", 50, new string [] { " 2 456 8" })]
-		[InlineData ("A sentence has words. ", 50, new string [] { "A sentence has words. " })] // Complex example
-		[InlineData ("12  567", 50, new string [] { "12  567" })] // Double Spaces
-		[InlineData ("  3 567", 50, new string [] { "  3 567" })] // Double Leading spaces should be preserved.
-		[InlineData ("  3  678  1", 50, new string [] { "  3  678  1" })]
-		[InlineData ("1  456", 50, new string [] { "1  456" })]
-		[InlineData ("A  sentence      has words.  ", 50, new string [] { "A  sentence      has words.  " })] // Double space Complex example
-		public void WordWrap_PreserveTrailingSpaces_False_With_Simple_Runes_Width_50 (string text, int width, IEnumerable<string> resultLines)
-		{
-			var wrappedLines = TextFormatter.WordWrapText (text, width, preserveTrailingSpaces: false);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.Equal (resultLines, wrappedLines);
-			var breakLines = "";
-			foreach (var line in wrappedLines) {
-				breakLines += $"{line}{Environment.NewLine}";
-			}
-			var expected = string.Empty;
-			foreach (var line in resultLines) {
-				expected += $"{line}{Environment.NewLine}";
-			}
-			Assert.Equal (expected, breakLines);
-		}
+	[Theory]
+	[InlineData ("A sentence has words. ", 3, new [] { "A ", "sen", "ten", "ce ", "has", " ", "wor", "ds.", " " })]
+	[InlineData ("A   sentence          has  words.  ", 3, new [] { "A  ", " ", "sen", "ten", "ce ", "   ", "   ", "   ", "has", "  ", "wor", "ds.", "  " })]
+	public void WordWrap_PreserveTrailingSpaces_True_With_Simple_Runes_Width_3 (string text, int width, IEnumerable<string> resultLines)
+	{
+		var wrappedLines = TextFormatter.WordWrapText (text, width, true);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.Equal (resultLines, wrappedLines);
+		var breakLines = "";
+		foreach (var line in wrappedLines) {
+			breakLines += $"{line}{Environment.NewLine}";
+		}
+		var expected = string.Empty;
+		foreach (var line in resultLines) {
+			expected += $"{line}{Environment.NewLine}";
+		}
+		Assert.Equal (expected, breakLines);
+
+		// Double space Complex example - this is how VS 2022 does it
+		//text = "A  sentence      has words.  ";
+		//breakLines = "";
+		//wrappedLines = TextFormatter.WordWrapText (text, width, preserveTrailingSpaces: true);
+		//foreach (var line in wrappedLines) {
+		//	breakLines += $"{line}{Environment.NewLine}";
+		//}
+		//expected = "A  " + Environment.NewLine +
+		//	" se" + Environment.NewLine +
+		//	" nt" + Environment.NewLine +
+		//	" en" + Environment.NewLine +
+		//	" ce" + Environment.NewLine +
+		//	"  " + Environment.NewLine +
+		//	"  " + Environment.NewLine +
+		//	"  " + Environment.NewLine +
+		//	" ha" + Environment.NewLine +
+		//	" s " + Environment.NewLine +
+		//	" wo" + Environment.NewLine +
+		//	" rd" + Environment.NewLine +
+		//	" s." + Environment.NewLine;
+		//Assert.Equal (expected, breakLines);
+	}
 
-		[Theory]
-		[InlineData ("A sentence\t\t\t has words.", 14, -10, new string [] { "A sentence\t", "\t\t has ", "words." })]
-		[InlineData ("A sentence\t\t\t has words.", 8, -16, new string [] { "A ", "sentence", "\t\t", "\t ", "has ", "words." })]
-		[InlineData ("A sentence\t\t\t has words.", 3, -21, new string [] { "A ", "sen", "ten", "ce", "\t", "\t", "\t", " ", "has", " ", "wor", "ds." })]
-		[InlineData ("A sentence\t\t\t has words.", 2, -22, new string [] { "A ", "se", "nt", "en", "ce", "\t", "\t", "\t", " ", "ha", "s ", "wo", "rd", "s." })]
-		[InlineData ("A sentence\t\t\t has words.", 1, -23, new string [] { "A", " ", "s", "e", "n", "t", "e", "n", "c", "e", "\t", "\t", "\t", " ", "h", "a", "s", " ", "w", "o", "r", "d", "s", "." })]
-		public void WordWrap_PreserveTrailingSpaces_True_With_Tab (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines, int tabWidth = 4)
-		{
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth, preserveTrailingSpaces: true, tabWidth: tabWidth);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+	[Theory]
+	[InlineData (null, 1, new string [] { })] // null input
+	[InlineData ("", 1, new string [] { })] // Empty input
+	[InlineData ("1 34", 1, new [] { "1", "3", "4" })] // Single Spaces
+	[InlineData ("1", 1, new [] { "1" })] // Short input
+	[InlineData ("12", 1, new [] { "1", "2" })]
+	[InlineData ("123", 1, new [] { "1", "2", "3" })]
+	[InlineData ("123456", 1, new [] { "1", "2", "3", "4", "5", "6" })] // No spaces
+	[InlineData (" ", 1, new [] { " " })] // Just Spaces; should result in a single space
+	[InlineData ("  ", 1, new [] { " " })]
+	[InlineData ("   ", 1, new [] { " ", " " })]
+	[InlineData ("    ", 1, new [] { " ", " " })]
+	[InlineData ("12 456", 1, new [] { "1", "2", "4", "5", "6" })] // Single Spaces
+	[InlineData (" 2 456", 1, new [] { " ", "2", "4", "5", "6" })] // Leading spaces should be preserved.
+	[InlineData (" 2 456 8", 1, new [] { " ", "2", "4", "5", "6", "8" })]
+	[InlineData ("A sentence has words. ", 1, new [] { "A", "s", "e", "n", "t", "e", "n", "c", "e", "h", "a", "s", "w", "o", "r", "d", "s", "." })] // Complex example
+	[InlineData ("12  567", 1, new [] { "1", "2", " ", "5", "6", "7" })] // Double Spaces
+	[InlineData ("  3 567", 1, new [] { " ", "3", "5", "6", "7" })] // Double Leading spaces should be preserved.
+	[InlineData ("  3  678  1", 1, new [] { " ", "3", " ", "6", "7", "8", " ", "1" })]
+	[InlineData ("1  456", 1, new [] { "1", " ", "4", "5", "6" })]
+	[InlineData ("A  sentence   has words.  ", 1,
+		new [] { "A", " ", "s", "e", "n", "t", "e", "n", "c", "e", " ", "h", "a", "s", "w", "o", "r", "d", "s", ".", " " })] // Double space Complex example
+	public void WordWrap_PreserveTrailingSpaces_False_With_Simple_Runes_Width_1 (string text, int width, IEnumerable<string> resultLines)
+	{
+		var wrappedLines = TextFormatter.WordWrapText (text, width);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.Equal (resultLines, wrappedLines);
+		var breakLines = "";
+		foreach (var line in wrappedLines) {
+			breakLines += $"{line}{Environment.NewLine}";
+		}
+		var expected = string.Empty;
+		foreach (var line in resultLines) {
+			expected += $"{line}{Environment.NewLine}";
+		}
+		Assert.Equal (expected, breakLines);
+	}
 
-		[Theory]
-		[InlineData ("これが最初の行です。 こんにちは世界。 これが2行目です。", 29, 0, new string [] { "これが最初の行です。", "こんにちは世界。", "これが2行目です。" })]
-		public void WordWrap_PreserveTrailingSpaces_False_Unicode_Wide_Runes (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
-		{
-			List<string> wrappedLines;
-
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			wrappedLines = TextFormatter.WordWrapText (text, maxWidth, preserveTrailingSpaces: false);
-			Assert.Equal (wrappedLines.Count, resultLines.Count ());
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
-			Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
-			Assert.Equal (resultLines, wrappedLines);
-		}
+	[Theory]
+	[InlineData (null, 3, new string [] { })] // null input
+	[InlineData ("", 3, new string [] { })] // Empty input
+	[InlineData ("1", 3, new [] { "1" })]    // Short input
+	[InlineData ("12", 3, new [] { "12" })]
+	[InlineData ("123", 3, new [] { "123" })]
+	[InlineData ("123456", 3, new [] { "123", "456" })]      // No spaces
+	[InlineData ("1234567", 3, new [] { "123", "456", "7" })] // No spaces
+	[InlineData (" ", 3, new [] { " " })]               // Just Spaces; should result in a single space
+	[InlineData ("  ", 3, new [] { "  " })]
+	[InlineData ("   ", 3, new [] { "   " })]
+	[InlineData ("    ", 3, new [] { "   " })]
+	[InlineData ("12 456", 3, new [] { "12", "456" })] // Single Spaces
+	[InlineData (" 2 456", 3, new [] { " 2", "456" })] // Leading spaces should be preserved.
+	[InlineData (" 2 456 8", 3, new [] { " 2", "456", "8" })]
+	[InlineData ("A sentence has words. ", 3, new [] { "A", "sen", "ten", "ce", "has", "wor", "ds." })] // Complex example
+	[InlineData ("12  567", 3, new [] { "12 ", "567" })]                                 // Double Spaces
+	[InlineData ("  3 567", 3, new [] { "  3", "567" })]                                 // Double Leading spaces should be preserved.
+	[InlineData ("  3  678  1", 3, new [] { "  3", " 67", "8 ", "1" })]
+	[InlineData ("1  456", 3, new [] { "1 ", "456" })]
+	[InlineData ("A  sentence      has words.  ", 3, new [] { "A ", "sen", "ten", "ce ", "   ", "has", "wor", "ds.", " " })] // Double space Complex example
+	public void WordWrap_PreserveTrailingSpaces_False_With_Simple_Runes_Width_3 (string text, int width, IEnumerable<string> resultLines)
+	{
+		var wrappedLines = TextFormatter.WordWrapText (text, width);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.Equal (resultLines, wrappedLines);
+		var breakLines = "";
+		foreach (var line in wrappedLines) {
+			breakLines += $"{line}{Environment.NewLine}";
+		}
+		var expected = string.Empty;
+		foreach (var line in resultLines) {
+			expected += $"{line}{Environment.NewLine}";
+		}
+		Assert.Equal (expected, breakLines);
+	}
 
-		[Theory]
-		[InlineData ("test", 0, 't', "test")]
-		[InlineData ("test", 1, 'e', "test")]
-		[InlineData ("Ok", 0, 'O', "Ok")]
-		[InlineData ("[◦ Ok ◦]", 3, 'O', "[◦ Ok ◦]")]
-		[InlineData ("^k", 0, '^', "^k")]
-		public void ReplaceHotKeyWithTag (string text, int hotPos, uint tag, string expected)
-		{
-			var tf = new TextFormatter ();
-			var runes = text.ToRuneList ();
-			Rune rune;
-			if (Rune.TryGetRuneAt (text, hotPos, out rune)) {
-				Assert.Equal (rune, (Rune)tag);
+	[Theory]
+	[InlineData (null, 50, new string [] { })] // null input
+	[InlineData ("", 50, new string [] { })] // Empty input
+	[InlineData ("1", 50, new [] { "1" })]    // Short input
+	[InlineData ("12", 50, new [] { "12" })]
+	[InlineData ("123", 50, new [] { "123" })]
+	[InlineData ("123456", 50, new [] { "123456" })]  // No spaces
+	[InlineData ("1234567", 50, new [] { "1234567" })] // No spaces
+	[InlineData (" ", 50, new [] { " " })]       // Just Spaces; should result in a single space
+	[InlineData ("  ", 50, new [] { "  " })]
+	[InlineData ("   ", 50, new [] { "   " })]
+	[InlineData ("12 456", 50, new [] { "12 456" })] // Single Spaces
+	[InlineData (" 2 456", 50, new [] { " 2 456" })] // Leading spaces should be preserved.
+	[InlineData (" 2 456 8", 50, new [] { " 2 456 8" })]
+	[InlineData ("A sentence has words. ", 50, new [] { "A sentence has words. " })] // Complex example
+	[InlineData ("12  567", 50, new [] { "12  567" })]                // Double Spaces
+	[InlineData ("  3 567", 50, new [] { "  3 567" })]                // Double Leading spaces should be preserved.
+	[InlineData ("  3  678  1", 50, new [] { "  3  678  1" })]
+	[InlineData ("1  456", 50, new [] { "1  456" })]
+	[InlineData ("A  sentence      has words.  ", 50, new [] { "A  sentence      has words.  " })] // Double space Complex example
+	public void WordWrap_PreserveTrailingSpaces_False_With_Simple_Runes_Width_50 (string text, int width, IEnumerable<string> resultLines)
+	{
+		var wrappedLines = TextFormatter.WordWrapText (text, width);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.Equal (resultLines, wrappedLines);
+		var breakLines = "";
+		foreach (var line in wrappedLines) {
+			breakLines += $"{line}{Environment.NewLine}";
+		}
+		var expected = string.Empty;
+		foreach (var line in resultLines) {
+			expected += $"{line}{Environment.NewLine}";
+		}
+		Assert.Equal (expected, breakLines);
+	}
 
-			}
-			var result = tf.ReplaceHotKeyWithTag (text, hotPos);
-			Assert.Equal (result, expected);
-			Assert.Equal ((Rune)tag, result.ToRunes () [hotPos]);
-			Assert.Equal (text.GetRuneCount (), runes.Count);
-			Assert.Equal (text, StringExtensions.ToString (runes));
-		}
+	[Theory]
+	[InlineData ("A sentence\t\t\t has words.", 14, -10, new [] { "A sentence\t", "\t\t has ", "words." })]
+	[InlineData ("A sentence\t\t\t has words.", 8, -16, new [] { "A ", "sentence", "\t\t", "\t ", "has ", "words." })]
+	[InlineData ("A sentence\t\t\t has words.", 3, -21, new [] { "A ", "sen", "ten", "ce", "\t", "\t", "\t", " ", "has", " ", "wor", "ds." })]
+	[InlineData ("A sentence\t\t\t has words.", 2, -22, new [] { "A ", "se", "nt", "en", "ce", "\t", "\t", "\t", " ", "ha", "s ", "wo", "rd", "s." })]
+	[InlineData ("A sentence\t\t\t has words.", 1, -23, new [] { "A", " ", "s", "e", "n", "t", "e", "n", "c", "e", "\t", "\t", "\t", " ", "h", "a", "s", " ", "w", "o", "r", "d", "s", "." })]
+	public void WordWrap_PreserveTrailingSpaces_True_With_Tab (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines, int tabWidth = 4)
+	{
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth, true, tabWidth);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData ("", -1, TextAlignment.Left, false, 0)]
-		[InlineData (null, 0, TextAlignment.Left, false, 1)]
-		[InlineData (null, 0, TextAlignment.Left, true, 1)]
-		[InlineData ("", 0, TextAlignment.Left, false, 1)]
-		[InlineData ("", 0, TextAlignment.Left, true, 1)]
-		public void Reformat_Invalid (string text, int maxWidth, TextAlignment textAlignment, bool wrap, int linesCount)
-		{
-			if (maxWidth < 0) {
-				Assert.Throws<ArgumentOutOfRangeException> (() => TextFormatter.Format (text, maxWidth, textAlignment, wrap));
-			} else {
-				var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap);
-				Assert.NotEmpty (list);
-				Assert.True (list.Count == linesCount);
-				Assert.Equal (string.Empty, list [0]);
-			}
-		}
+	[Theory]
+	[InlineData ("これが最初の行です。 こんにちは世界。 これが2行目です。", 29, 0, new [] { "これが最初の行です。", "こんにちは世界。", "これが2行目です。" })]
+	public void WordWrap_PreserveTrailingSpaces_False_Unicode_Wide_Runes (string text, int maxWidth, int widthOffset, IEnumerable<string> resultLines)
+	{
+		List<string> wrappedLines;
+
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		wrappedLines = TextFormatter.WordWrapText (text, maxWidth);
+		Assert.Equal (wrappedLines.Count, resultLines.Count ());
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetRuneCount ()) : 0));
+		Assert.True (expectedClippedWidth >= (wrappedLines.Count > 0 ? wrappedLines.Max (l => l.GetColumns ()) : 0));
+		Assert.Equal (resultLines, wrappedLines);
+	}
 
-		[Theory]
-		[InlineData ("", 0, 0, TextAlignment.Left, false, 1, true)]
-		[InlineData ("", 1, 1, TextAlignment.Left, false, 1, true)]
-		[InlineData ("A sentence has words.", 0, -21, TextAlignment.Left, false, 1, true)]
-		[InlineData ("A sentence has words.", 1, -20, TextAlignment.Left, false, 1, false)]
-		[InlineData ("A sentence has words.", 5, -16, TextAlignment.Left, false, 1, false)]
-		[InlineData ("A sentence has words.", 20, -1, TextAlignment.Left, false, 1, false)]
-		// no clip
-		[InlineData ("A sentence has words.", 21, 0, TextAlignment.Left, false, 1, false)]
-		[InlineData ("A sentence has words.", 22, 1, TextAlignment.Left, false, 1, false)]
-		public void Reformat_NoWordrap_SingleLine (string text, int maxWidth, int widthOffset, TextAlignment textAlignment, bool wrap, int linesCount, bool stringEmpty)
-		{
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap);
-			Assert.NotEmpty (list);
-			Assert.True (list.Count == linesCount);
-			if (stringEmpty) {
-				Assert.Equal (string.Empty, list [0]);
-			} else {
-				Assert.NotEqual (string.Empty, list [0]);
-			}
-			Assert.Equal (StringExtensions.ToString (text.ToRunes () [0..expectedClippedWidth]), list [0]);
-		}
+	[Theory]
+	[InlineData ("test", 0, 't', "test")]
+	[InlineData ("test", 1, 'e', "test")]
+	[InlineData ("Ok", 0, 'O', "Ok")]
+	[InlineData ("[◦ Ok ◦]", 3, 'O', "[◦ Ok ◦]")]
+	[InlineData ("^k", 0, '^', "^k")]
+	public void ReplaceHotKeyWithTag (string text, int hotPos, uint tag, string expected)
+	{
+		var tf = new TextFormatter ();
+		var runes = text.ToRuneList ();
+		Rune rune;
+		if (Rune.TryGetRuneAt (text, hotPos, out rune)) {
+			Assert.Equal (rune, (Rune)tag);
+
+		}
+		var result = tf.ReplaceHotKeyWithTag (text, hotPos);
+		Assert.Equal (result, expected);
+		Assert.Equal ((Rune)tag, result.ToRunes () [hotPos]);
+		Assert.Equal (text.GetRuneCount (), runes.Count);
+		Assert.Equal (text, StringExtensions.ToString (runes));
+	}
 
-		[Theory]
-		[InlineData ("A sentence has words.\nLine 2.", 0, -29, TextAlignment.Left, false, 1, true)]
-		[InlineData ("A sentence has words.\nLine 2.", 1, -28, TextAlignment.Left, false, 1, false)]
-		[InlineData ("A sentence has words.\nLine 2.", 5, -24, TextAlignment.Left, false, 1, false)]
-		[InlineData ("A sentence has words.\nLine 2.", 28, -1, TextAlignment.Left, false, 1, false)]
-		// no clip
-		[InlineData ("A sentence has words.\nLine 2.", 29, 0, TextAlignment.Left, false, 1, false)]
-		[InlineData ("A sentence has words.\nLine 2.", 30, 1, TextAlignment.Left, false, 1, false)]
-		[InlineData ("A sentence has words.\r\nLine 2.", 0, -30, TextAlignment.Left, false, 1, true)]
-		[InlineData ("A sentence has words.\r\nLine 2.", 1, -29, TextAlignment.Left, false, 1, false)]
-		[InlineData ("A sentence has words.\r\nLine 2.", 5, -25, TextAlignment.Left, false, 1, false)]
-		[InlineData ("A sentence has words.\r\nLine 2.", 29, -1, TextAlignment.Left, false, 1, false, 1)]
-		[InlineData ("A sentence has words.\r\nLine 2.", 30, 0, TextAlignment.Left, false, 1, false)]
-		[InlineData ("A sentence has words.\r\nLine 2.", 31, 1, TextAlignment.Left, false, 1, false)]
-		public void Reformat_NoWordrap_NewLines_MultiLine_False (string text, int maxWidth, int widthOffset, TextAlignment textAlignment, bool wrap, int linesCount, bool stringEmpty, int clipWidthOffset = 0)
-		{
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth) + clipWidthOffset;
+	[Theory]
+	[InlineData ("", -1, TextAlignment.Left, false, 0)]
+	[InlineData (null, 0, TextAlignment.Left, false, 1)]
+	[InlineData (null, 0, TextAlignment.Left, true, 1)]
+	[InlineData ("", 0, TextAlignment.Left, false, 1)]
+	[InlineData ("", 0, TextAlignment.Left, true, 1)]
+	public void Reformat_Invalid (string text, int maxWidth, TextAlignment textAlignment, bool wrap, int linesCount)
+	{
+		if (maxWidth < 0) {
+			Assert.Throws<ArgumentOutOfRangeException> (() => TextFormatter.Format (text, maxWidth, textAlignment, wrap));
+		} else {
 			var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap);
 			Assert.NotEmpty (list);
 			Assert.True (list.Count == linesCount);
-			if (stringEmpty) {
-				Assert.Equal (string.Empty, list [0]);
-			} else {
-				Assert.NotEqual (string.Empty, list [0]);
-			}
-			if (text.Contains ("\r\n") && maxWidth > 0) {
-				Assert.Equal (StringExtensions.ToString (text.ToRunes () [0..expectedClippedWidth]).Replace ("\r\n", " "), list [0]);
-			} else if (text.Contains ('\n') && maxWidth > 0) {
-				Assert.Equal (StringExtensions.ToString (text.ToRunes () [0..expectedClippedWidth]).Replace ("\n", " "), list [0]);
-			} else {
-				Assert.Equal (StringExtensions.ToString (text.ToRunes () [0..expectedClippedWidth]), list [0]);
-			}
+			Assert.Equal (string.Empty, list [0]);
 		}
+	}
 
-		[Theory]
-		[InlineData ("A sentence has words.\nLine 2.", 0, -29, TextAlignment.Left, false, 1, true, new string [] { "" })]
-		[InlineData ("A sentence has words.\nLine 2.", 1, -28, TextAlignment.Left, false, 2, false, new string [] { "A", "L" })]
-		[InlineData ("A sentence has words.\nLine 2.", 5, -24, TextAlignment.Left, false, 2, false, new string [] { "A sen", "Line " })]
-		[InlineData ("A sentence has words.\nLine 2.", 28, -1, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		//// no clip
-		[InlineData ("A sentence has words.\nLine 2.", 29, 0, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		[InlineData ("A sentence has words.\nLine 2.", 30, 1, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 0, -30, TextAlignment.Left, false, 1, true, new string [] { "" })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 1, -29, TextAlignment.Left, false, 2, false, new string [] { "A", "L" })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 5, -25, TextAlignment.Left, false, 2, false, new string [] { "A sen", "Line " })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 29, -1, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 30, 0, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 31, 1, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		public void Reformat_NoWordrap_NewLines_MultiLine_True (string text, int maxWidth, int widthOffset, TextAlignment textAlignment, bool wrap, int linesCount, bool stringEmpty, IEnumerable<string> resultLines)
-		{
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, false, 0, TextDirection.LeftRight_TopBottom, true);
-			Assert.NotEmpty (list);
-			Assert.True (list.Count == linesCount);
-			if (stringEmpty) {
-				Assert.Equal (string.Empty, list [0]);
-			} else {
-				Assert.NotEqual (string.Empty, list [0]);
-			}
+	[Theory]
+	[InlineData ("", 0, 0, TextAlignment.Left, false, 1, true)]
+	[InlineData ("", 1, 1, TextAlignment.Left, false, 1, true)]
+	[InlineData ("A sentence has words.", 0, -21, TextAlignment.Left, false, 1, true)]
+	[InlineData ("A sentence has words.", 1, -20, TextAlignment.Left, false, 1, false)]
+	[InlineData ("A sentence has words.", 5, -16, TextAlignment.Left, false, 1, false)]
+	[InlineData ("A sentence has words.", 20, -1, TextAlignment.Left, false, 1, false)]
+	// no clip
+	[InlineData ("A sentence has words.", 21, 0, TextAlignment.Left, false, 1, false)]
+	[InlineData ("A sentence has words.", 22, 1, TextAlignment.Left, false, 1, false)]
+	public void Reformat_NoWordrap_SingleLine (string text, int maxWidth, int widthOffset, TextAlignment textAlignment, bool wrap, int linesCount, bool stringEmpty)
+	{
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap);
+		Assert.NotEmpty (list);
+		Assert.True (list.Count == linesCount);
+		if (stringEmpty) {
+			Assert.Equal (string.Empty, list [0]);
+		} else {
+			Assert.NotEqual (string.Empty, list [0]);
+		}
+		Assert.Equal (StringExtensions.ToString (text.ToRunes () [..expectedClippedWidth]), list [0]);
+	}
 
-			Assert.Equal (list, resultLines);
+	[Theory]
+	[InlineData ("A sentence has words.\nLine 2.", 0, -29, TextAlignment.Left, false, 1, true)]
+	[InlineData ("A sentence has words.\nLine 2.", 1, -28, TextAlignment.Left, false, 1, false)]
+	[InlineData ("A sentence has words.\nLine 2.", 5, -24, TextAlignment.Left, false, 1, false)]
+	[InlineData ("A sentence has words.\nLine 2.", 28, -1, TextAlignment.Left, false, 1, false)]
+	// no clip
+	[InlineData ("A sentence has words.\nLine 2.", 29, 0, TextAlignment.Left, false, 1, false)]
+	[InlineData ("A sentence has words.\nLine 2.", 30, 1, TextAlignment.Left, false, 1, false)]
+	[InlineData ("A sentence has words.\r\nLine 2.", 0, -30, TextAlignment.Left, false, 1, true)]
+	[InlineData ("A sentence has words.\r\nLine 2.", 1, -29, TextAlignment.Left, false, 1, false)]
+	[InlineData ("A sentence has words.\r\nLine 2.", 5, -25, TextAlignment.Left, false, 1, false)]
+	[InlineData ("A sentence has words.\r\nLine 2.", 29, -1, TextAlignment.Left, false, 1, false, 1)]
+	[InlineData ("A sentence has words.\r\nLine 2.", 30, 0, TextAlignment.Left, false, 1, false)]
+	[InlineData ("A sentence has words.\r\nLine 2.", 31, 1, TextAlignment.Left, false, 1, false)]
+	public void Reformat_NoWordrap_NewLines_MultiLine_False (string text,
+								 int maxWidth,
+								 int widthOffset,
+								 TextAlignment textAlignment,
+								 bool wrap,
+								 int linesCount,
+								 bool stringEmpty,
+								 int clipWidthOffset = 0)
+	{
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth) + clipWidthOffset;
+		var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap);
+		Assert.NotEmpty (list);
+		Assert.True (list.Count == linesCount);
+		if (stringEmpty) {
+			Assert.Equal (string.Empty, list [0]);
+		} else {
+			Assert.NotEqual (string.Empty, list [0]);
+		}
+		if (text.Contains ("\r\n") && maxWidth > 0) {
+			Assert.Equal (StringExtensions.ToString (text.ToRunes () [..expectedClippedWidth]).Replace ("\r\n", " "), list [0]);
+		} else if (text.Contains ('\n') && maxWidth > 0) {
+			Assert.Equal (StringExtensions.ToString (text.ToRunes () [..expectedClippedWidth]).Replace ("\n", " "), list [0]);
+		} else {
+			Assert.Equal (StringExtensions.ToString (text.ToRunes () [..expectedClippedWidth]), list [0]);
 		}
+	}
 
-		[Theory]
-		[InlineData ("A sentence has words.\nLine 2.", 0, -29, TextAlignment.Left, false, 1, true, new string [] { "" })]
-		[InlineData ("A sentence has words.\nLine 2.", 1, -28, TextAlignment.Left, false, 2, false, new string [] { "A", "L" })]
-		[InlineData ("A sentence has words.\nLine 2.", 5, -24, TextAlignment.Left, false, 2, false, new string [] { "A sen", "Line " })]
-		[InlineData ("A sentence has words.\nLine 2.", 28, -1, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		//// no clip
-		[InlineData ("A sentence has words.\nLine 2.", 29, 0, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		[InlineData ("A sentence has words.\nLine 2.", 30, 1, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 0, -30, TextAlignment.Left, false, 1, true, new string [] { "" })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 1, -29, TextAlignment.Left, false, 2, false, new string [] { "A", "L" })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 5, -25, TextAlignment.Left, false, 2, false, new string [] { "A sen", "Line " })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 29, -1, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 30, 0, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		[InlineData ("A sentence has words.\r\nLine 2.", 31, 1, TextAlignment.Left, false, 2, false, new string [] { "A sentence has words.", "Line 2." })]
-		public void Reformat_NoWordrap_NewLines_MultiLine_True_Vertical (string text, int maxWidth, int widthOffset, TextAlignment textAlignment, bool wrap, int linesCount, bool stringEmpty, IEnumerable<string> resultLines)
-		{
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, false, 0, TextDirection.TopBottom_LeftRight, true);
-			Assert.NotEmpty (list);
-			Assert.True (list.Count == linesCount);
-			if (stringEmpty) {
-				Assert.Equal (string.Empty, list [0]);
-			} else {
-				Assert.NotEqual (string.Empty, list [0]);
-			}
+	[Theory]
+	[InlineData ("A sentence has words.\nLine 2.", 0, -29, TextAlignment.Left, false, 1, true, new [] { "" })]
+	[InlineData ("A sentence has words.\nLine 2.", 1, -28, TextAlignment.Left, false, 2, false, new [] { "A", "L" })]
+	[InlineData ("A sentence has words.\nLine 2.", 5, -24, TextAlignment.Left, false, 2, false, new [] { "A sen", "Line " })]
+	[InlineData ("A sentence has words.\nLine 2.", 28, -1, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	//// no clip
+	[InlineData ("A sentence has words.\nLine 2.", 29, 0, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	[InlineData ("A sentence has words.\nLine 2.", 30, 1, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 0, -30, TextAlignment.Left, false, 1, true, new [] { "" })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 1, -29, TextAlignment.Left, false, 2, false, new [] { "A", "L" })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 5, -25, TextAlignment.Left, false, 2, false, new [] { "A sen", "Line " })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 29, -1, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 30, 0, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 31, 1, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	public void Reformat_NoWordrap_NewLines_MultiLine_True (string text,
+								int maxWidth,
+								int widthOffset,
+								TextAlignment textAlignment,
+								bool wrap,
+								int linesCount,
+								bool stringEmpty,
+								IEnumerable<string> resultLines)
+	{
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, false, 0, TextDirection.LeftRight_TopBottom, true);
+		Assert.NotEmpty (list);
+		Assert.True (list.Count == linesCount);
+		if (stringEmpty) {
+			Assert.Equal (string.Empty, list [0]);
+		} else {
+			Assert.NotEqual (string.Empty, list [0]);
+		}
+
+		Assert.Equal (list, resultLines);
+	}
 
-			Assert.Equal (list, resultLines);
-		}
+	[Theory]
+	[InlineData ("A sentence has words.\nLine 2.", 0, -29, TextAlignment.Left, false, 1, true, new [] { "" })]
+	[InlineData ("A sentence has words.\nLine 2.", 1, -28, TextAlignment.Left, false, 2, false, new [] { "A", "L" })]
+	[InlineData ("A sentence has words.\nLine 2.", 5, -24, TextAlignment.Left, false, 2, false, new [] { "A sen", "Line " })]
+	[InlineData ("A sentence has words.\nLine 2.", 28, -1, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	//// no clip
+	[InlineData ("A sentence has words.\nLine 2.", 29, 0, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	[InlineData ("A sentence has words.\nLine 2.", 30, 1, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 0, -30, TextAlignment.Left, false, 1, true, new [] { "" })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 1, -29, TextAlignment.Left, false, 2, false, new [] { "A", "L" })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 5, -25, TextAlignment.Left, false, 2, false, new [] { "A sen", "Line " })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 29, -1, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 30, 0, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	[InlineData ("A sentence has words.\r\nLine 2.", 31, 1, TextAlignment.Left, false, 2, false, new [] { "A sentence has words.", "Line 2." })]
+	public void Reformat_NoWordrap_NewLines_MultiLine_True_Vertical (string text,
+									 int maxWidth,
+									 int widthOffset,
+									 TextAlignment textAlignment,
+									 bool wrap,
+									 int linesCount,
+									 bool stringEmpty,
+									 IEnumerable<string> resultLines)
+	{
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, false, 0, TextDirection.TopBottom_LeftRight, true);
+		Assert.NotEmpty (list);
+		Assert.True (list.Count == linesCount);
+		if (stringEmpty) {
+			Assert.Equal (string.Empty, list [0]);
+		} else {
+			Assert.NotEqual (string.Empty, list [0]);
+		}
+
+		Assert.Equal (list, resultLines);
+	}
 
-		[Theory]
-		// Even # of spaces
-		//            0123456789
-		[InlineData ("012 456 89", 0, -10, TextAlignment.Left, true, true, true, new string [] { "" })]
-		[InlineData ("012 456 89", 1, -9, TextAlignment.Left, true, true, false, new string [] { "0", "1", "2", " ", "4", "5", "6", " ", "8", "9" }, "01245689")]
-		[InlineData ("012 456 89", 5, -5, TextAlignment.Left, true, true, false, new string [] { "012 ", "456 ", "89" })]
-		[InlineData ("012 456 89", 9, -1, TextAlignment.Left, true, true, false, new string [] { "012 456 ", "89" })]
-		// no clip
-		[InlineData ("012 456 89", 10, 0, TextAlignment.Left, true, true, false, new string [] { "012 456 89" })]
-		[InlineData ("012 456 89", 11, 1, TextAlignment.Left, true, true, false, new string [] { "012 456 89" })]
-		// Odd # of spaces
-		//            01234567890123
-		[InlineData ("012 456 89 end", 13, -1, TextAlignment.Left, true, true, false, new string [] { "012 456 89 ", "end" })]
-		// no clip
-		[InlineData ("012 456 89 end", 14, 0, TextAlignment.Left, true, true, false, new string [] { "012 456 89 end" })]
-		[InlineData ("012 456 89 end", 15, 1, TextAlignment.Left, true, true, false, new string [] { "012 456 89 end" })]
-		public void Reformat_Wrap_Spaces_No_NewLines (string text, int maxWidth, int widthOffset, TextAlignment textAlignment, bool wrap, bool preserveTrailingSpaces, bool stringEmpty, IEnumerable<string> resultLines, string noSpaceText = "")
-		{
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
-			var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, preserveTrailingSpaces);
-			Assert.NotEmpty (list);
-			Assert.True (list.Count == resultLines.Count ());
-			if (stringEmpty) {
-				Assert.Equal (string.Empty, list [0]);
+	[Theory]
+	// Even # of spaces
+	//            0123456789
+	[InlineData ("012 456 89", 0, -10, TextAlignment.Left, true, true, true, new [] { "" })]
+	[InlineData ("012 456 89", 1, -9, TextAlignment.Left, true, true, false, new [] { "0", "1", "2", " ", "4", "5", "6", " ", "8", "9" }, "01245689")]
+	[InlineData ("012 456 89", 5, -5, TextAlignment.Left, true, true, false, new [] { "012 ", "456 ", "89" })]
+	[InlineData ("012 456 89", 9, -1, TextAlignment.Left, true, true, false, new [] { "012 456 ", "89" })]
+	// no clip
+	[InlineData ("012 456 89", 10, 0, TextAlignment.Left, true, true, false, new [] { "012 456 89" })]
+	[InlineData ("012 456 89", 11, 1, TextAlignment.Left, true, true, false, new [] { "012 456 89" })]
+	// Odd # of spaces
+	//            01234567890123
+	[InlineData ("012 456 89 end", 13, -1, TextAlignment.Left, true, true, false, new [] { "012 456 89 ", "end" })]
+	// no clip
+	[InlineData ("012 456 89 end", 14, 0, TextAlignment.Left, true, true, false, new [] { "012 456 89 end" })]
+	[InlineData ("012 456 89 end", 15, 1, TextAlignment.Left, true, true, false, new [] { "012 456 89 end" })]
+	public void Reformat_Wrap_Spaces_No_NewLines (string text,
+						      int maxWidth,
+						      int widthOffset,
+						      TextAlignment textAlignment,
+						      bool wrap,
+						      bool preserveTrailingSpaces,
+						      bool stringEmpty,
+						      IEnumerable<string> resultLines,
+						      string noSpaceText = "")
+	{
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth);
+		var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, preserveTrailingSpaces);
+		Assert.NotEmpty (list);
+		Assert.True (list.Count == resultLines.Count ());
+		if (stringEmpty) {
+			Assert.Equal (string.Empty, list [0]);
+		} else {
+			Assert.NotEqual (string.Empty, list [0]);
+		}
+		Assert.Equal (resultLines, list);
+
+		if (maxWidth > 0) {
+			// remove whitespace chars
+			if (maxWidth < 5) {
+				expectedClippedWidth = text.GetRuneCount () - text.Sum (r => r == ' ' ? 1 : 0);
 			} else {
-				Assert.NotEqual (string.Empty, list [0]);
+				expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth - text.Sum (r => r == ' ' ? 1 : 0));
 			}
-			Assert.Equal (resultLines, list);
-
-			if (maxWidth > 0) {
-				// remove whitespace chars
-				if (maxWidth < 5) {
-					expectedClippedWidth = text.GetRuneCount () - text.Sum (r => r == ' ' ? 1 : 0);
-				} else {
-					expectedClippedWidth = Math.Min (text.GetRuneCount (), maxWidth - text.Sum (r => r == ' ' ? 1 : 0));
-				}
-				list = TextFormatter.Format (text, maxWidth, TextAlignment.Left, wrap, preserveTrailingSpaces: false);
-				if (maxWidth == 1) {
-					Assert.Equal (expectedClippedWidth, list.Count);
-					Assert.Equal (noSpaceText, string.Concat (list.ToArray ()));
-				}
-				if (maxWidth > 1 && maxWidth < 10) {
-					Assert.Equal (StringExtensions.ToString (text.ToRunes () [0..expectedClippedWidth]), list [0]);
-				}
+			list = TextFormatter.Format (text, maxWidth, TextAlignment.Left, wrap);
+			if (maxWidth == 1) {
+				Assert.Equal (expectedClippedWidth, list.Count);
+				Assert.Equal (noSpaceText, string.Concat (list.ToArray ()));
 			}
-		}
-
-		[Theory]
-		// Unicode
-		// Even # of chars
-		//       0123456789
-		[InlineData ("\u2660пÑРвРÑ", 10, -1, TextAlignment.Left, true, false, new string [] { "\u2660пÑРвÐ", "Ñ" })]
-		// no clip
-		[InlineData ("\u2660пÑРвРÑ", 11, 0, TextAlignment.Left, true, false, new string [] { "\u2660пÑРвРÑ" })]
-		[InlineData ("\u2660пÑРвРÑ", 12, 1, TextAlignment.Left, true, false, new string [] { "\u2660пÑРвРÑ" })]
-		// Unicode
-		// Odd # of chars
-		//            0123456789
-		[InlineData ("\u2660 ÑРвРÑ", 9, -1, TextAlignment.Left, true, false, new string [] { "\u2660 ÑРвÐ", "Ñ" })]
-		// no clip
-		[InlineData ("\u2660 ÑРвРÑ", 10, 0, TextAlignment.Left, true, false, new string [] { "\u2660 ÑРвРÑ" })]
-		[InlineData ("\u2660 ÑРвРÑ", 11, 1, TextAlignment.Left, true, false, new string [] { "\u2660 ÑРвРÑ" })]
-		public void Reformat_Unicode_Wrap_Spaces_No_NewLines (string text, int maxWidth, int widthOffset, TextAlignment textAlignment, bool wrap, bool preserveTrailingSpaces, IEnumerable<string> resultLines)
-		{
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, preserveTrailingSpaces);
-			Assert.Equal (list.Count, resultLines.Count ());
-			Assert.Equal (resultLines, list);
-		}
-
-		[Theory]
-		// Unicode
-		[InlineData ("\u2460\u2461\u2462\n\u2460\u2461\u2462\u2463\u2464", 8, -1, TextAlignment.Left, true, false, new string [] { "\u2460\u2461\u2462", "\u2460\u2461\u2462\u2463\u2464" })]
-		// no clip
-		[InlineData ("\u2460\u2461\u2462\n\u2460\u2461\u2462\u2463\u2464", 9, 0, TextAlignment.Left, true, false, new string [] { "\u2460\u2461\u2462", "\u2460\u2461\u2462\u2463\u2464" })]
-		[InlineData ("\u2460\u2461\u2462\n\u2460\u2461\u2462\u2463\u2464", 10, 1, TextAlignment.Left, true, false, new string [] { "\u2460\u2461\u2462", "\u2460\u2461\u2462\u2463\u2464" })]
-		public void Reformat_Unicode_Wrap_Spaces_NewLines (string text, int maxWidth, int widthOffset, TextAlignment textAlignment, bool wrap, bool preserveTrailingSpaces, IEnumerable<string> resultLines)
-		{
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, preserveTrailingSpaces);
-			Assert.Equal (list.Count, resultLines.Count ());
-			Assert.Equal (resultLines, list);
-		}
-
-		[Theory]
-		[InlineData (" A sentence has words. \n This is the second Line - 2. ", 4, -50, TextAlignment.Left, true, false, new string [] { " A", "sent", "ence", "has", "word", "s. ", " Thi", "s is", "the", "seco", "nd", "Line", "- 2." }, " Asentencehaswords.  This isthesecondLine- 2.")]
-		[InlineData (" A sentence has words. \n This is the second Line - 2. ", 4, -50, TextAlignment.Left, true, true, new string [] { " A ", "sent", "ence", " ", "has ", "word", "s. ", " ", "This", " is ", "the ", "seco", "nd ", "Line", " - ", "2. " }, " A sentence has words.  This is the second Line - 2. ")]
-		public void Format_WordWrap_PreserveTrailingSpaces (string text, int maxWidth, int widthOffset, TextAlignment textAlignment, bool wrap, bool preserveTrailingSpaces, IEnumerable<string> resultLines, string expectedWrappedText)
-		{
-			Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
-			var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, preserveTrailingSpaces);
-			Assert.Equal (list.Count, resultLines.Count ());
-			Assert.Equal (resultLines, list);
-			string wrappedText = string.Empty;
-			foreach (var txt in list) wrappedText += txt;
-			Assert.Equal (expectedWrappedText, wrappedText);
-		}
-
-		[Fact]
-		public void Format_Dont_Throw_ArgumentException_With_WordWrap_As_False_And_Keep_End_Spaces_As_True ()
-		{
-			var exception = Record.Exception (() => TextFormatter.Format ("Some text", 4, TextAlignment.Left, false, true));
-			Assert.Null (exception);
-		}
-
-		[Theory]
-		[InlineData ("Hello world, how are you today? Pretty neat!", 44, 80, "Hello      world,      how      are      you      today?      Pretty      neat!")]
-		public void Format_Justified_Always_Returns_Text_Width_Equal_To_Passed_Width_Horizontal (string text, int runeCount, int maxWidth, string justifiedText)
-		{
-			Assert.Equal (runeCount, text.GetRuneCount ());
-
-			var fmtText = string.Empty;
-			for (int i = text.GetRuneCount (); i < maxWidth; i++) {
-				fmtText = TextFormatter.Format (text, i, TextAlignment.Justified, false, true) [0];
-				Assert.Equal (i, fmtText.GetRuneCount ());
-				var c = fmtText [^1];
-				Assert.True (text.EndsWith (c));
+			if (maxWidth > 1 && maxWidth < 10) {
+				Assert.Equal (StringExtensions.ToString (text.ToRunes () [..expectedClippedWidth]), list [0]);
 			}
-			Assert.Equal (justifiedText, fmtText);
 		}
+	}
 
-		[Theory]
-		[InlineData ("Hello world, how are you today? Pretty neat!", 44, 80, "Hello      world,      how      are      you      today?      Pretty      neat!")]
-		public void Format_Justified_Always_Returns_Text_Width_Equal_To_Passed_Width_Vertical (string text, int runeCount, int maxWidth, string justifiedText)
-		{
-			Assert.Equal (runeCount, text.GetRuneCount ());
-
-			var fmtText = string.Empty;
-			for (int i = text.GetRuneCount (); i < maxWidth; i++) {
-				fmtText = TextFormatter.Format (text, i, TextAlignment.Justified, false, true, 0, TextDirection.TopBottom_LeftRight) [0];
-				Assert.Equal (i, fmtText.GetRuneCount ());
-				var c = fmtText [^1];
-				Assert.True (text.EndsWith (c));
-			}
-			Assert.Equal (justifiedText, fmtText);
-		}
+	[Theory]
+	// Unicode
+	// Even # of chars
+	//       0123456789
+	[InlineData ("\u2660пÑРвРÑ", 10, -1, TextAlignment.Left, true, false, new [] { "\u2660пÑРвÐ", "Ñ" })]
+	// no clip
+	[InlineData ("\u2660пÑРвРÑ", 11, 0, TextAlignment.Left, true, false, new [] { "\u2660пÑРвРÑ" })]
+	[InlineData ("\u2660пÑРвРÑ", 12, 1, TextAlignment.Left, true, false, new [] { "\u2660пÑРвРÑ" })]
+	// Unicode
+	// Odd # of chars
+	//            0123456789
+	[InlineData ("\u2660 ÑРвРÑ", 9, -1, TextAlignment.Left, true, false, new [] { "\u2660 ÑРвÐ", "Ñ" })]
+	// no clip
+	[InlineData ("\u2660 ÑРвРÑ", 10, 0, TextAlignment.Left, true, false, new [] { "\u2660 ÑРвРÑ" })]
+	[InlineData ("\u2660 ÑРвРÑ", 11, 1, TextAlignment.Left, true, false, new [] { "\u2660 ÑРвРÑ" })]
+	public void Reformat_Unicode_Wrap_Spaces_No_NewLines (string text,
+							      int maxWidth,
+							      int widthOffset,
+							      TextAlignment textAlignment,
+							      bool wrap,
+							      bool preserveTrailingSpaces,
+							      IEnumerable<string> resultLines)
+	{
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, preserveTrailingSpaces);
+		Assert.Equal (list.Count, resultLines.Count ());
+		Assert.Equal (resultLines, list);
+	}
 
-		[Theory]
-		[InlineData ("fff", 6, "fff   ")]
-		[InlineData ("Hello World", 16, "Hello World     ")]
-		public void TestClipOrPad_ShortWord (string text, int fillPad, string expectedText)
-		{
-			// word is short but we want it to fill # so it should be padded
-			Assert.Equal (expectedText, TextFormatter.ClipOrPad (text, fillPad));
-		}
+	[Theory]
+	// Unicode
+	[InlineData ("\u2460\u2461\u2462\n\u2460\u2461\u2462\u2463\u2464", 8, -1, TextAlignment.Left, true, false, new [] { "\u2460\u2461\u2462", "\u2460\u2461\u2462\u2463\u2464" })]
+	// no clip
+	[InlineData ("\u2460\u2461\u2462\n\u2460\u2461\u2462\u2463\u2464", 9, 0, TextAlignment.Left, true, false, new [] { "\u2460\u2461\u2462", "\u2460\u2461\u2462\u2463\u2464" })]
+	[InlineData ("\u2460\u2461\u2462\n\u2460\u2461\u2462\u2463\u2464", 10, 1, TextAlignment.Left, true, false, new [] { "\u2460\u2461\u2462", "\u2460\u2461\u2462\u2463\u2464" })]
+	public void Reformat_Unicode_Wrap_Spaces_NewLines (string text,
+							   int maxWidth,
+							   int widthOffset,
+							   TextAlignment textAlignment,
+							   bool wrap,
+							   bool preserveTrailingSpaces,
+							   IEnumerable<string> resultLines)
+	{
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, preserveTrailingSpaces);
+		Assert.Equal (list.Count, resultLines.Count ());
+		Assert.Equal (resultLines, list);
+	}
 
-		[Theory]
-		[InlineData ("123456789", 3, "123")]
-		[InlineData ("Hello World", 8, "Hello Wo")]
-		public void TestClipOrPad_LongWord (string text, int fillPad, string expectedText)
-		{
-			// word is long but we want it to fill # space only
-			Assert.Equal (expectedText, TextFormatter.ClipOrPad (text, fillPad));
-		}
+	[Theory]
+	[InlineData (" A sentence has words. \n This is the second Line - 2. ", 4, -50, TextAlignment.Left, true, false,
+		new [] { " A", "sent", "ence", "has", "word", "s. ", " Thi", "s is", "the", "seco", "nd", "Line", "- 2." }, " Asentencehaswords.  This isthesecondLine- 2.")]
+	[InlineData (" A sentence has words. \n This is the second Line - 2. ", 4, -50, TextAlignment.Left, true, true,
+		new [] { " A ", "sent", "ence", " ", "has ", "word", "s. ", " ", "This", " is ", "the ", "seco", "nd ", "Line", " - ", "2. " },
+		" A sentence has words.  This is the second Line - 2. ")]
+	public void Format_WordWrap_PreserveTrailingSpaces (string text,
+							    int maxWidth,
+							    int widthOffset,
+							    TextAlignment textAlignment,
+							    bool wrap,
+							    bool preserveTrailingSpaces,
+							    IEnumerable<string> resultLines,
+							    string expectedWrappedText)
+	{
+		Assert.Equal (maxWidth, text.GetRuneCount () + widthOffset);
+		var list = TextFormatter.Format (text, maxWidth, textAlignment, wrap, preserveTrailingSpaces);
+		Assert.Equal (list.Count, resultLines.Count ());
+		Assert.Equal (resultLines, list);
+		var wrappedText = string.Empty;
+		foreach (var txt in list) {
+			wrappedText += txt;
+		}
+		Assert.Equal (expectedWrappedText, wrappedText);
+	}
 
-		[Fact]
-		public void Internal_Tests ()
-		{
-			var tf = new TextFormatter ();
-			Assert.Equal (KeyCode.Null, tf.HotKey);
-			tf.HotKey = KeyCode.CtrlMask | KeyCode.Q;
-			Assert.Equal (KeyCode.CtrlMask | KeyCode.Q, tf.HotKey);
-		}
+	[Fact]
+	public void Format_Dont_Throw_ArgumentException_With_WordWrap_As_False_And_Keep_End_Spaces_As_True ()
+	{
+		var exception = Record.Exception (() => TextFormatter.Format ("Some text", 4, TextAlignment.Left, false, true));
+		Assert.Null (exception);
+	}
 
-		[Theory]
-		[InlineData ("Hello World", 11)]
-		[InlineData ("こんにちは世界", 14)]
-		public void GetColumns_Simple_And_Wide_Runes (string text, int width)
-		{
-			Assert.Equal (width, text.GetColumns ());
-		}
+	[Theory]
+	[InlineData ("Hello world, how are you today? Pretty neat!", 44, 80, "Hello      world,      how      are      you      today?      Pretty      neat!")]
+	public void Format_Justified_Always_Returns_Text_Width_Equal_To_Passed_Width_Horizontal (string text, int runeCount, int maxWidth, string justifiedText)
+	{
+		Assert.Equal (runeCount, text.GetRuneCount ());
 
-		[Theory]
-		[InlineData ("Hello World", 11, 6, 1, 1)]
-		[InlineData ("こんにちは 世界", 15, 6, 1, 2)]
-		public void GetSumMaxCharWidth_Simple_And_Wide_Runes (string text, int width, int index, int length, int indexWidth)
-		{
-			Assert.Equal (width, TextFormatter.GetSumMaxCharWidth (text));
-			Assert.Equal (indexWidth, TextFormatter.GetSumMaxCharWidth (text, index, length));
-		}
-
-		[Theory]
-		[InlineData (new string [] { "Hello", "World" }, 2, 1, 1, 1)]
-		[InlineData (new string [] { "こんにちは", "世界" }, 4, 1, 1, 2)]
-		public void GetSumMaxCharWidth_List_Simple_And_Wide_Runes (IEnumerable<string> text, int width, int index, int length, int indexWidth)
-		{
-			Assert.Equal (width, TextFormatter.GetSumMaxCharWidth (text.ToList ()));
-			Assert.Equal (indexWidth, TextFormatter.GetSumMaxCharWidth (text.ToList (), index, length));
+		var fmtText = string.Empty;
+		for (var i = text.GetRuneCount (); i < maxWidth; i++) {
+			fmtText = TextFormatter.Format (text, i, TextAlignment.Justified, false, true) [0];
+			Assert.Equal (i, fmtText.GetRuneCount ());
+			var c = fmtText [^1];
+			Assert.True (text.EndsWith (c));
 		}
+		Assert.Equal (justifiedText, fmtText);
+	}
 
-		[Theory]
-		[InlineData ("test", 3, 3)]
-		[InlineData ("test", 4, 4)]
-		[InlineData ("test", 10, 4)]
-		public void GetLengthThatFits_Runelist (string text, int columns, int expectedLength)
-		{
-			var runes = text.ToRuneList ();
+	[Theory]
+	[InlineData ("Hello world, how are you today? Pretty neat!", 44, 80, "Hello      world,      how      are      you      today?      Pretty      neat!")]
+	public void Format_Justified_Always_Returns_Text_Width_Equal_To_Passed_Width_Vertical (string text, int runeCount, int maxWidth, string justifiedText)
+	{
+		Assert.Equal (runeCount, text.GetRuneCount ());
 
-			Assert.Equal (expectedLength, TextFormatter.GetLengthThatFits (runes, columns));
+		var fmtText = string.Empty;
+		for (var i = text.GetRuneCount (); i < maxWidth; i++) {
+			fmtText = TextFormatter.Format (text, i, TextAlignment.Justified, false, true, 0, TextDirection.TopBottom_LeftRight) [0];
+			Assert.Equal (i, fmtText.GetRuneCount ());
+			var c = fmtText [^1];
+			Assert.True (text.EndsWith (c));
 		}
+		Assert.Equal (justifiedText, fmtText);
+	}
 
-		[Theory]
-		[InlineData ("test", 3, 3)]
-		[InlineData ("test", 4, 4)]
-		[InlineData ("test", 10, 4)]
-		[InlineData ("test", 1, 1)]
-		[InlineData ("test", 0, 0)]
-		[InlineData ("test", -1, 0)]
-		[InlineData (null, -1, 0)]
-		[InlineData ("", -1, 0)]
-		public void GetLengthThatFits_String (string text, int columns, int expectedLength)
-		{
-			Assert.Equal (expectedLength, TextFormatter.GetLengthThatFits (text, columns));
-		}
+	[Theory]
+	[InlineData ("fff", 6, "fff   ")]
+	[InlineData ("Hello World", 16, "Hello World     ")]
+	public void TestClipOrPad_ShortWord (string text, int fillPad, string expectedText) =>
+		// word is short but we want it to fill # so it should be padded
+		Assert.Equal (expectedText, TextFormatter.ClipOrPad (text, fillPad));
+
+	[Theory]
+	[InlineData ("123456789", 3, "123")]
+	[InlineData ("Hello World", 8, "Hello Wo")]
+	public void TestClipOrPad_LongWord (string text, int fillPad, string expectedText) =>
+		// word is long but we want it to fill # space only
+		Assert.Equal (expectedText, TextFormatter.ClipOrPad (text, fillPad));
+
+	[Fact]
+	public void Internal_Tests ()
+	{
+		var tf = new TextFormatter ();
+		Assert.Equal (KeyCode.Null, tf.HotKey);
+		tf.HotKey = KeyCode.CtrlMask | KeyCode.Q;
+		Assert.Equal (KeyCode.CtrlMask | KeyCode.Q, tf.HotKey);
+	}
 
-		[Theory]
-		[InlineData ("Hello World", 6, 6)]
-		[InlineData ("こんにちは 世界", 6, 3)]
-		public void GetLengthThatFits_Simple_And_Wide_Runes (string text, int columns, int expectedLength)
-		{
-			Assert.Equal (expectedLength, TextFormatter.GetLengthThatFits (text, columns));
-		}
+	[Theory]
+	[InlineData ("Hello World", 11)]
+	[InlineData ("こんにちは世界", 14)]
+	public void GetColumns_Simple_And_Wide_Runes (string text, int width) => Assert.Equal (width, text.GetColumns ());
+
+	[Theory]
+	[InlineData ("Hello World", 11, 6, 1, 1)]
+	[InlineData ("こんにちは 世界", 15, 6, 1, 2)]
+	public void GetSumMaxCharWidth_Simple_And_Wide_Runes (string text, int width, int index, int length, int indexWidth)
+	{
+		Assert.Equal (width, TextFormatter.GetSumMaxCharWidth (text));
+		Assert.Equal (indexWidth, TextFormatter.GetSumMaxCharWidth (text, index, length));
+	}
 
-		[Theory]
-		[InlineData ("Hello World", 6, 6)]
-		[InlineData ("こんにちは 世界", 6, 3)]
-		[MemberData (nameof (CMGlyphs))]
-		public void GetLengthThatFits_List_Simple_And_Wide_Runes (string text, int columns, int expectedLength)
-		{
-			var runes = text.ToRuneList ();
-			Assert.Equal (expectedLength, TextFormatter.GetLengthThatFits (runes, columns));
-		}
+	[Theory]
+	[InlineData (new [] { "Hello", "World" }, 2, 1, 1, 1)]
+	[InlineData (new [] { "こんにちは", "世界" }, 4, 1, 1, 2)]
+	public void GetSumMaxCharWidth_List_Simple_And_Wide_Runes (IEnumerable<string> text, int width, int index, int length, int indexWidth)
+	{
+		Assert.Equal (width, TextFormatter.GetSumMaxCharWidth (text.ToList ()));
+		Assert.Equal (indexWidth, TextFormatter.GetSumMaxCharWidth (text.ToList (), index, length));
+	}
 
-		public static IEnumerable<object []> CMGlyphs =>
-			new List<object []>
-			{
-			    new object[] { $"{CM.Glyphs.LeftBracket} Say Hello 你 {CM.Glyphs.RightBracket}", 16, 15 }
-			};
-
-		[Theory]
-		[InlineData ("Truncate", 3, "Tru")]
-		[InlineData ("デモエムポンズ", 3, "デ")]
-		public void Format_Truncate_Simple_And_Wide_Runes (string text, int width, string expected)
-		{
-			var list = TextFormatter.Format (text, width, false, false);
-			Assert.Equal (expected, list [^1]);
-		}
+	[Theory]
+	[InlineData ("test", 3, 3)]
+	[InlineData ("test", 4, 4)]
+	[InlineData ("test", 10, 4)]
+	public void GetLengthThatFits_Runelist (string text, int columns, int expectedLength)
+	{
+		var runes = text.ToRuneList ();
 
-		[Theory]
-		[MemberData (nameof (FormatEnvironmentNewLine))]
-		public void Format_With_PreserveTrailingSpaces_And_Without_PreserveTrailingSpaces (string text, int width, IEnumerable<string> expected)
-		{
-			var preserveTrailingSpaces = false;
-			var formated = TextFormatter.Format (text, width, false, true, preserveTrailingSpaces);
-			Assert.Equal (expected, formated);
-
-			preserveTrailingSpaces = true;
-			formated = TextFormatter.Format (text, width, false, true, preserveTrailingSpaces);
-			Assert.Equal (expected, formated);
-		}
+		Assert.Equal (expectedLength, TextFormatter.GetLengthThatFits (runes, columns));
+	}
 
-		public static IEnumerable<object []> FormatEnvironmentNewLine =>
-			new List<object []>
-			{
-				new object[] { $"Line1{Environment.NewLine}Line2{Environment.NewLine}Line3{Environment.NewLine}", 60, new string [] { "Line1", "Line2", "Line3" } }
-			};
-
-		[Theory]
-		[MemberData (nameof (SplitEnvironmentNewLine))]
-		public void SplitNewLine_Ending__With_Or_Without_NewLine_Probably_CRLF (string text, IEnumerable<string> expected)
-		{
-			var splited = TextFormatter.SplitNewLine (text);
-			Assert.Equal (expected, splited);
-		}
+	[Theory]
+	[InlineData ("test", 3, 3)]
+	[InlineData ("test", 4, 4)]
+	[InlineData ("test", 10, 4)]
+	[InlineData ("test", 1, 1)]
+	[InlineData ("test", 0, 0)]
+	[InlineData ("test", -1, 0)]
+	[InlineData (null, -1, 0)]
+	[InlineData ("", -1, 0)]
+	public void GetLengthThatFits_String (string text, int columns, int expectedLength) => Assert.Equal (expectedLength, TextFormatter.GetLengthThatFits (text, columns));
+
+	[Theory]
+	[InlineData ("Hello World", 6, 6)]
+	[InlineData ("こんにちは 世界", 6, 3)]
+	public void GetLengthThatFits_Simple_And_Wide_Runes (string text, int columns, int expectedLength) => Assert.Equal (expectedLength, TextFormatter.GetLengthThatFits (text, columns));
+
+	[Theory]
+	[InlineData ("Hello World", 6, 6)]
+	[InlineData ("こんにちは 世界", 6, 3)]
+	[MemberData (nameof (CMGlyphs))]
+	public void GetLengthThatFits_List_Simple_And_Wide_Runes (string text, int columns, int expectedLength)
+	{
+		var runes = text.ToRuneList ();
+		Assert.Equal (expectedLength, TextFormatter.GetLengthThatFits (runes, columns));
+	}
 
-		public static IEnumerable<object []> SplitEnvironmentNewLine =>
-		new List<object []>
-		{
-			new object[] { $"First Line 界{Environment.NewLine}Second Line 界{Environment.NewLine}Third Line 界", new string [] { "First Line 界", "Second Line 界", "Third Line 界" } },
-			new object[] { $"First Line 界{Environment.NewLine}Second Line 界{Environment.NewLine}Third Line 界{Environment.NewLine}", new string [] { "First Line 界", "Second Line 界", "Third Line 界", "" } }
-		};
+	[Theory]
+	[InlineData ("Truncate", 3, "Tru")]
+	[InlineData ("デモエムポンズ", 3, "デ")]
+	public void Format_Truncate_Simple_And_Wide_Runes (string text, int width, string expected)
+	{
+		var list = TextFormatter.Format (text, width, false, false);
+		Assert.Equal (expected, list [^1]);
+	}
 
-		[Theory]
-		[InlineData ($"First Line 界\nSecond Line 界\nThird Line 界", new string [] { "First Line 界", "Second Line 界", "Third Line 界" })]
-		public void SplitNewLine_Ending_Without_NewLine_Only_LF (string text, IEnumerable<string> expected)
-		{
-			var splited = TextFormatter.SplitNewLine (text);
-			Assert.Equal (expected, splited);
-		}
+	[Theory]
+	[MemberData (nameof (FormatEnvironmentNewLine))]
+	public void Format_With_PreserveTrailingSpaces_And_Without_PreserveTrailingSpaces (string text, int width, IEnumerable<string> expected)
+	{
+		var preserveTrailingSpaces = false;
+		var formated = TextFormatter.Format (text, width, false, true, preserveTrailingSpaces);
+		Assert.Equal (expected, formated);
+
+		preserveTrailingSpaces = true;
+		formated = TextFormatter.Format (text, width, false, true, preserveTrailingSpaces);
+		Assert.Equal (expected, formated);
+	}
 
-		[Theory]
-		[InlineData ($"First Line 界\nSecond Line 界\nThird Line 界\n", new string [] { "First Line 界", "Second Line 界", "Third Line 界", "" })]
-		public void SplitNewLine_Ending_With_NewLine_Only_LF (string text, IEnumerable<string> expected)
-		{
-			var splited = TextFormatter.SplitNewLine (text);
-			Assert.Equal (expected, splited);
-		}
+	[Theory]
+	[MemberData (nameof (SplitEnvironmentNewLine))]
+	public void SplitNewLine_Ending__With_Or_Without_NewLine_Probably_CRLF (string text, IEnumerable<string> expected)
+	{
+		var splited = TextFormatter.SplitNewLine (text);
+		Assert.Equal (expected, splited);
+	}
 
-		[Theory]
-		[InlineData ("Single Line 界", 14)]
-		[InlineData ($"First Line 界\nSecond Line 界\nThird Line 界\n", 14)]
-		public void MaxWidthLine_With_And_Without_Newlines (string text, int expected)
-		{
-			Assert.Equal (expected, TextFormatter.MaxWidthLine (text));
-		}
+	[Theory]
+	[InlineData ("First Line 界\nSecond Line 界\nThird Line 界", new [] { "First Line 界", "Second Line 界", "Third Line 界" })]
+	public void SplitNewLine_Ending_Without_NewLine_Only_LF (string text, IEnumerable<string> expected)
+	{
+		var splited = TextFormatter.SplitNewLine (text);
+		Assert.Equal (expected, splited);
+	}
 
-		[Theory]
-		[InlineData ("New Test 你", 10, 10, 20320, 20320, 9, "你")]
-		[InlineData ("New Test \U0001d539", 10, 11, 120121, 55349, 9, "𝔹")]
-		public void String_Array_Is_Not_Always_Equal_ToRunes_Array (string text, int runesLength, int stringLength, int runeValue, int stringValue, int index, string expected)
-		{
-			var usToRunes = text.ToRunes ();
-			Assert.Equal (runesLength, usToRunes.Length);
-			Assert.Equal (stringLength, text.Length);
-			Assert.Equal (runeValue, usToRunes [index].Value);
-			Assert.Equal (stringValue, text [index]);
-			Assert.Equal (expected, usToRunes [index].ToString ());
-			if (char.IsHighSurrogate (text [index])) {
-				// Rune array length isn't equal to string array
-				Assert.Equal (expected, new string (new char [] { text [index], text [index + 1] }));
-			} else {
-				// Rune array length is equal to string array
-				Assert.Equal (expected, text [index].ToString ());
-			}
-		}
+	[Theory]
+	[InlineData ("First Line 界\nSecond Line 界\nThird Line 界\n", new [] { "First Line 界", "Second Line 界", "Third Line 界", "" })]
+	public void SplitNewLine_Ending_With_NewLine_Only_LF (string text, IEnumerable<string> expected)
+	{
+		var splited = TextFormatter.SplitNewLine (text);
+		Assert.Equal (expected, splited);
+	}
 
-		[Fact]
-		public void GetLengthThatFits_With_Combining_Runes ()
-		{
-			var text = "Les Mise\u0328\u0301rables";
-			Assert.Equal (16, TextFormatter.GetLengthThatFits (text, 14));
+	[Theory]
+	[InlineData ("Single Line 界", 14)]
+	[InlineData ("First Line 界\nSecond Line 界\nThird Line 界\n", 14)]
+	public void MaxWidthLine_With_And_Without_Newlines (string text, int expected) => Assert.Equal (expected, TextFormatter.MaxWidthLine (text));
+
+	[Theory]
+	[InlineData ("New Test 你", 10, 10, 20320, 20320, 9, "你")]
+	[InlineData ("New Test \U0001d539", 10, 11, 120121, 55349, 9, "𝔹")]
+	public void String_Array_Is_Not_Always_Equal_ToRunes_Array (string text, int runesLength, int stringLength, int runeValue, int stringValue, int index, string expected)
+	{
+		var usToRunes = text.ToRunes ();
+		Assert.Equal (runesLength, usToRunes.Length);
+		Assert.Equal (stringLength, text.Length);
+		Assert.Equal (runeValue, usToRunes [index].Value);
+		Assert.Equal (stringValue, text [index]);
+		Assert.Equal (expected, usToRunes [index].ToString ());
+		if (char.IsHighSurrogate (text [index])) {
+			// Rune array length isn't equal to string array
+			Assert.Equal (expected, new string (new [] { text [index], text [index + 1] }));
+		} else {
+			// Rune array length is equal to string array
+			Assert.Equal (expected, text [index].ToString ());
 		}
+	}
 
-		[Fact]
-		public void GetMaxColsForWidth_With_Combining_Runes ()
-		{
-			var text = new List<string> () { "Les Mis", "e\u0328\u0301", "rables" };
-			Assert.Equal (1, TextFormatter.GetMaxColsForWidth (text, 1));
-		}
+	[Fact]
+	public void GetLengthThatFits_With_Combining_Runes ()
+	{
+		var text = "Les Mise\u0328\u0301rables";
+		Assert.Equal (16, TextFormatter.GetLengthThatFits (text, 14));
+	}
 
-		[Fact]
-		public void GetSumMaxCharWidth_With_Combining_Runes ()
-		{
-			var text = "Les Mise\u0328\u0301rables";
-			Assert.Equal (1, TextFormatter.GetSumMaxCharWidth (text, 1, 1));
-		}
+	[Fact]
+	public void GetMaxColsForWidth_With_Combining_Runes ()
+	{
+		var text = new List<string> { "Les Mis", "e\u0328\u0301", "rables" };
+		Assert.Equal (1, TextFormatter.GetMaxColsForWidth (text, 1));
+	}
 
-		[Fact]
-		public void GetSumMaxCharWidth_List_With_Combining_Runes ()
-		{
-			var text = new List<string> () { "Les Mis", "e\u0328\u0301", "rables" };
-			Assert.Equal (1, TextFormatter.GetSumMaxCharWidth (text, 1, 1));
-		}
+	[Fact]
+	public void GetSumMaxCharWidth_With_Combining_Runes ()
+	{
+		var text = "Les Mise\u0328\u0301rables";
+		Assert.Equal (1, TextFormatter.GetSumMaxCharWidth (text, 1, 1));
+	}
 
-		[Theory]
-		[InlineData (14, 1, TextDirection.LeftRight_TopBottom)]
-		[InlineData (1, 14, TextDirection.TopBottom_LeftRight)]
-		public void CalcRect_With_Combining_Runes (int width, int height, TextDirection textDirection)
-		{
-			var text = "Les Mise\u0328\u0301rables";
-			Assert.Equal (new Rect (0, 0, width, height), TextFormatter.CalcRect (0, 0, text, textDirection));
-		}
+	[Fact]
+	public void GetSumMaxCharWidth_List_With_Combining_Runes ()
+	{
+		var text = new List<string> { "Les Mis", "e\u0328\u0301", "rables" };
+		Assert.Equal (1, TextFormatter.GetSumMaxCharWidth (text, 1, 1));
+	}
+
+	[Theory]
+	[InlineData (14, 1, TextDirection.LeftRight_TopBottom)]
+	[InlineData (1, 14, TextDirection.TopBottom_LeftRight)]
+	public void CalcRect_With_Combining_Runes (int width, int height, TextDirection textDirection)
+	{
+		var text = "Les Mise\u0328\u0301rables";
+		Assert.Equal (new Rect (0, 0, width, height), TextFormatter.CalcRect (0, 0, text, textDirection));
+	}
 
-		[Theory]
-		[InlineData (14, 1, TextDirection.LeftRight_TopBottom, "Les Misęrables")]
-		[InlineData (1, 14, TextDirection.TopBottom_LeftRight, "L\ne\ns\n \nM\ni\ns\nę\nr\na\nb\nl\ne\ns")]
-		[InlineData (4, 4, TextDirection.TopBottom_LeftRight, @"
+	[Theory]
+	[InlineData (14, 1, TextDirection.LeftRight_TopBottom, "Les Misęrables")]
+	[InlineData (1, 14, TextDirection.TopBottom_LeftRight, "L\ne\ns\n \nM\ni\ns\nę\nr\na\nb\nl\ne\ns")]
+	[InlineData (4, 4, TextDirection.TopBottom_LeftRight, @"
 LMre
 eias
 ssb 
  ęl ")]
-		public void Draw_With_Combining_Runes (int width, int height, TextDirection textDirection, string expected)
-		{
-			var driver = new FakeDriver ();
-			driver.Init ();
+	public void Draw_With_Combining_Runes (int width, int height, TextDirection textDirection, string expected)
+	{
+		var driver = new FakeDriver ();
+		driver.Init ();
 
-			var text = "Les Mise\u0328\u0301rables";
+		var text = "Les Mise\u0328\u0301rables";
 
-			var tf = new TextFormatter ();
-			tf.Direction = textDirection;
-			tf.Text = text;
-
-			Assert.True (tf.WordWrap);
-			if (textDirection == TextDirection.LeftRight_TopBottom) {
-				Assert.Equal (new Size (width, height), tf.Size);
-			} else {
-				Assert.Equal (new Size (1, text.GetColumns ()), tf.Size);
-				tf.Size = new Size (width, height);
-			}
-			tf.Draw (new Rect (0, 0, width, height), new Attribute (ColorName.White, ColorName.Black), new Attribute (ColorName.Blue, ColorName.Black), default, true, driver);
-			TestHelpers.AssertDriverContentsWithFrameAre (expected, output, driver);
-
-			driver.End ();
-		}
+		var tf = new TextFormatter ();
+		tf.Direction = textDirection;
+		tf.Text = text;
 
-		[Theory]
-		[InlineData (17, 1, TextDirection.LeftRight_TopBottom, 4, "This is a     Tab")]
-		[InlineData (1, 17, TextDirection.TopBottom_LeftRight, 4, "T\nh\ni\ns\n \ni\ns\n \na\n \n \n \n \n \nT\na\nb")]
-		[InlineData (13, 1, TextDirection.LeftRight_TopBottom, 0, "This is a Tab")]
-		[InlineData (1, 13, TextDirection.TopBottom_LeftRight, 0, "T\nh\ni\ns\n \ni\ns\n \na\n \nT\na\nb")]
-		public void TabWith_PreserveTrailingSpaces_False (int width, int height, TextDirection textDirection, int tabWidth, string expected)
-		{
-			var driver = new FakeDriver ();
-			driver.Init ();
-
-			var text = "This is a \tTab";
-			var tf = new TextFormatter ();
-			tf.Direction = textDirection;
-			tf.TabWidth = tabWidth;
-			tf.Text = text;
-
-			Assert.True (tf.WordWrap);
-			Assert.False (tf.PreserveTrailingSpaces);
+		Assert.True (tf.WordWrap);
+		if (textDirection == TextDirection.LeftRight_TopBottom) {
 			Assert.Equal (new Size (width, height), tf.Size);
-			tf.Draw (new Rect (0, 0, width, height), new Attribute (ColorName.White, ColorName.Black), new Attribute (ColorName.Blue, ColorName.Black), default, true, driver);
-			TestHelpers.AssertDriverContentsWithFrameAre (expected, output, driver);
-
-			driver.End ();
+		} else {
+			Assert.Equal (new Size (1, text.GetColumns ()), tf.Size);
+			tf.Size = new Size (width, height);
 		}
+		tf.Draw (new Rect (0, 0, width, height), new Attribute (ColorName.White, ColorName.Black), new Attribute (ColorName.Blue, ColorName.Black), default, true, driver);
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output, driver);
 
-		[Theory]
-		[InlineData (17, 1, TextDirection.LeftRight_TopBottom, 4, "This is a     Tab")]
-		[InlineData (1, 17, TextDirection.TopBottom_LeftRight, 4, "T\nh\ni\ns\n \ni\ns\n \na\n \n \n \n \n \nT\na\nb")]
-		[InlineData (13, 1, TextDirection.LeftRight_TopBottom, 0, "This is a Tab")]
-		[InlineData (1, 13, TextDirection.TopBottom_LeftRight, 0, "T\nh\ni\ns\n \ni\ns\n \na\n \nT\na\nb")]
-		public void TabWith_PreserveTrailingSpaces_True (int width, int height, TextDirection textDirection, int tabWidth, string expected)
-		{
-			var driver = new FakeDriver ();
-			driver.Init ();
-
-			var text = "This is a \tTab";
-			var tf = new TextFormatter ();
-			tf.Direction = textDirection;
-			tf.TabWidth = tabWidth;
-			tf.PreserveTrailingSpaces = true;
-			tf.Text = text;
-
-			Assert.True (tf.WordWrap);
-			Assert.Equal (new Size (width, height), tf.Size);
-			tf.Draw (new Rect (0, 0, width, height), new Attribute (ColorName.White, ColorName.Black), new Attribute (ColorName.Blue, ColorName.Black), default, true, driver);
-			TestHelpers.AssertDriverContentsWithFrameAre (expected, output, driver);
+		driver.End ();
+	}
 
-			driver.End ();
-		}
+	[Theory]
+	[InlineData (17, 1, TextDirection.LeftRight_TopBottom, 4, "This is a     Tab")]
+	[InlineData (1, 17, TextDirection.TopBottom_LeftRight, 4, "T\nh\ni\ns\n \ni\ns\n \na\n \n \n \n \n \nT\na\nb")]
+	[InlineData (13, 1, TextDirection.LeftRight_TopBottom, 0, "This is a Tab")]
+	[InlineData (1, 13, TextDirection.TopBottom_LeftRight, 0, "T\nh\ni\ns\n \ni\ns\n \na\n \nT\na\nb")]
+	public void TabWith_PreserveTrailingSpaces_False (int width, int height, TextDirection textDirection, int tabWidth, string expected)
+	{
+		var driver = new FakeDriver ();
+		driver.Init ();
+
+		var text = "This is a \tTab";
+		var tf = new TextFormatter ();
+		tf.Direction = textDirection;
+		tf.TabWidth = tabWidth;
+		tf.Text = text;
+
+		Assert.True (tf.WordWrap);
+		Assert.False (tf.PreserveTrailingSpaces);
+		Assert.Equal (new Size (width, height), tf.Size);
+		tf.Draw (new Rect (0, 0, width, height), new Attribute (ColorName.White, ColorName.Black), new Attribute (ColorName.Blue, ColorName.Black), default, true, driver);
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output, driver);
+
+		driver.End ();
+	}
 
-		[Theory]
-		[InlineData (17, 1, TextDirection.LeftRight_TopBottom, 4, "This is a     Tab")]
-		[InlineData (1, 17, TextDirection.TopBottom_LeftRight, 4, "T\nh\ni\ns\n \ni\ns\n \na\n \n \n \n \n \nT\na\nb")]
-		[InlineData (13, 1, TextDirection.LeftRight_TopBottom, 0, "This is a Tab")]
-		[InlineData (1, 13, TextDirection.TopBottom_LeftRight, 0, "T\nh\ni\ns\n \ni\ns\n \na\n \nT\na\nb")]
-		public void TabWith_WordWrap_True (int width, int height, TextDirection textDirection, int tabWidth, string expected)
-		{
-			var driver = new FakeDriver ();
-			driver.Init ();
-
-			var text = "This is a \tTab";
-			var tf = new TextFormatter ();
-			tf.Direction = textDirection;
-			tf.TabWidth = tabWidth;
-			tf.WordWrap = true;
-			tf.Text = text;
-
-			Assert.False (tf.PreserveTrailingSpaces);
-			Assert.Equal (new Size (width, height), tf.Size);
-			tf.Draw (new Rect (0, 0, width, height), new Attribute (ColorName.White, ColorName.Black), new Attribute (ColorName.Blue, ColorName.Black), default, true, driver);
-			TestHelpers.AssertDriverContentsWithFrameAre (expected, output, driver);
+	[Theory]
+	[InlineData (17, 1, TextDirection.LeftRight_TopBottom, 4, "This is a     Tab")]
+	[InlineData (1, 17, TextDirection.TopBottom_LeftRight, 4, "T\nh\ni\ns\n \ni\ns\n \na\n \n \n \n \n \nT\na\nb")]
+	[InlineData (13, 1, TextDirection.LeftRight_TopBottom, 0, "This is a Tab")]
+	[InlineData (1, 13, TextDirection.TopBottom_LeftRight, 0, "T\nh\ni\ns\n \ni\ns\n \na\n \nT\na\nb")]
+	public void TabWith_PreserveTrailingSpaces_True (int width, int height, TextDirection textDirection, int tabWidth, string expected)
+	{
+		var driver = new FakeDriver ();
+		driver.Init ();
+
+		var text = "This is a \tTab";
+		var tf = new TextFormatter ();
+		tf.Direction = textDirection;
+		tf.TabWidth = tabWidth;
+		tf.PreserveTrailingSpaces = true;
+		tf.Text = text;
+
+		Assert.True (tf.WordWrap);
+		Assert.Equal (new Size (width, height), tf.Size);
+		tf.Draw (new Rect (0, 0, width, height), new Attribute (ColorName.White, ColorName.Black), new Attribute (ColorName.Blue, ColorName.Black), default, true, driver);
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output, driver);
+
+		driver.End ();
+	}
 
-			driver.End ();
-		}
+	[Theory]
+	[InlineData (17, 1, TextDirection.LeftRight_TopBottom, 4, "This is a     Tab")]
+	[InlineData (1, 17, TextDirection.TopBottom_LeftRight, 4, "T\nh\ni\ns\n \ni\ns\n \na\n \n \n \n \n \nT\na\nb")]
+	[InlineData (13, 1, TextDirection.LeftRight_TopBottom, 0, "This is a Tab")]
+	[InlineData (1, 13, TextDirection.TopBottom_LeftRight, 0, "T\nh\ni\ns\n \ni\ns\n \na\n \nT\na\nb")]
+	public void TabWith_WordWrap_True (int width, int height, TextDirection textDirection, int tabWidth, string expected)
+	{
+		var driver = new FakeDriver ();
+		driver.Init ();
+
+		var text = "This is a \tTab";
+		var tf = new TextFormatter ();
+		tf.Direction = textDirection;
+		tf.TabWidth = tabWidth;
+		tf.WordWrap = true;
+		tf.Text = text;
+
+		Assert.False (tf.PreserveTrailingSpaces);
+		Assert.Equal (new Size (width, height), tf.Size);
+		tf.Draw (new Rect (0, 0, width, height), new Attribute (ColorName.White, ColorName.Black), new Attribute (ColorName.Blue, ColorName.Black), default, true, driver);
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output, driver);
+
+		driver.End ();
 	}
 }

UnitTests/UICatalog/ScenarioTests.cs

@@ -1,594 +1,577 @@
-using System.Text;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using Terminal.Gui;
-using UICatalog;
-using UICatalog.Scenarios;
 using Xunit;
 using Xunit.Abstractions;
 
-// Alias Console to MockConsole so we don't accidentally use Console
-using Console = Terminal.Gui.FakeConsole;
+namespace UICatalog.Tests; 
 
-namespace UICatalog.Tests {
-	public class ScenarioTests {
-		readonly ITestOutputHelper output;
+public class ScenarioTests {
+	readonly ITestOutputHelper _output;
 
-		public ScenarioTests (ITestOutputHelper output)
-		{
+	public ScenarioTests (ITestOutputHelper output)
+	{
 #if DEBUG_IDISPOSABLE
-			Responder.Instances.Clear ();
+		Responder.Instances.Clear ();
 #endif
-			this.output = output;
-		}
-
-		int CreateInput (string input)
-		{
-			FakeConsole.MockKeyPresses.Clear ();
-			// Put a QuitKey in at the end
-			FakeConsole.PushMockKeyPress ((KeyCode)Application.QuitKey);
-			foreach (var c in input.Reverse ()) {
-				KeyCode key = KeyCode.Null;
-				if (char.IsLetter (c)) {
-					key = (KeyCode)char.ToUpper (c) | (char.IsUpper (c) ? KeyCode.ShiftMask : (KeyCode)0);
-				} else {
-					key = (KeyCode)c;
-				}
-				FakeConsole.PushMockKeyPress (key);
-			}
-			return FakeConsole.MockKeyPresses.Count;
-		}
-
-		/// <summary>
-		/// <para>
-		/// This runs through all Scenarios defined in UI Catalog, calling Init, Setup, and Run.
-		/// </para>
-		/// <para>
-		/// Should find any Scenarios which crash on load or do not respond to <see cref="Application.RequestStop()"/>.
-		/// </para>
-		/// </summary>
-		[Fact]
-		public void Run_All_Scenarios ()
-		{
-			List<Scenario> scenarios = Scenario.GetScenarios ();
-			Assert.NotEmpty (scenarios);
-
-			foreach (var scenario in scenarios) {
-				output.WriteLine ($"Running Scenario '{scenario.GetName ()}'");
-
-				Application.Init (new FakeDriver ());
+		_output = output;
+	}
 
-				// Press QuitKey 
-				Assert.Empty (FakeConsole.MockKeyPresses);
-				// BUGBUG: (#2474) For some reason ReadKey is not returning the QuitKey for some Scenarios
-				// by adding this Space it seems to work.
-				//FakeConsole.PushMockKeyPress (Key.Space);
-				FakeConsole.PushMockKeyPress ((KeyCode)Application.QuitKey);
-
-				// The only key we care about is the QuitKey
-				Application.Top.KeyDown += (object sender, Key args) => {
-					output.WriteLine ($"  Keypress: {args.KeyCode}");
-					// BUGBUG: (#2474) For some reason ReadKey is not returning the QuitKey for some Scenarios
-					// by adding this Space it seems to work.
-					// See #2474 for why this is commented out
-					Assert.Equal (Application.QuitKey.KeyCode, args.KeyCode);
-				};
-
-				uint abortTime = 500;
-				// If the scenario doesn't close within 500ms, this will force it to quit
-				Func<bool> forceCloseCallback = () => {
-					if (Application.Top.Running && FakeConsole.MockKeyPresses.Count == 0) {
-						Application.RequestStop ();
-						// See #2474 for why this is commented out
-						Assert.Fail ($"'{scenario.GetName ()}' failed to Quit with {Application.QuitKey} after {abortTime}ms. Force quit.");
-					}
-					return false;
-				};
-				//output.WriteLine ($"  Add timeout to force quit after {abortTime}ms");
-				_ = Application.AddTimeout (TimeSpan.FromMilliseconds (abortTime), forceCloseCallback);
-
-				Application.Iteration += (s, a) => {
-					//output.WriteLine ($"  iteration {++iterations}");
-					if (Application.Top.Running && FakeConsole.MockKeyPresses.Count == 0) {
-						Application.RequestStop ();
-						Assert.Fail ($"'{scenario.GetName ()}' failed to Quit with {Application.QuitKey}. Force quit.");
-					}
-				};
-
-				scenario.Init ();
-				scenario.Setup ();
-				scenario.Run ();
-				scenario.Dispose ();
-
-				Application.Shutdown ();
-#if DEBUG_IDISPOSABLE
-				Assert.Empty (Responder.Instances);
-#endif
+	int CreateInput (string input)
+	{
+		FakeConsole.MockKeyPresses.Clear ();
+		// Put a QuitKey in at the end
+		FakeConsole.PushMockKeyPress ((KeyCode)Application.QuitKey);
+		foreach (var c in input.Reverse ()) {
+			var key = KeyCode.Null;
+			if (char.IsLetter (c)) {
+				key = (KeyCode)char.ToUpper (c) | (char.IsUpper (c) ? KeyCode.ShiftMask : 0);
+			} else {
+				key = (KeyCode)c;
 			}
-#if DEBUG_IDISPOSABLE
-				Assert.Empty (Responder.Instances);
-#endif
+			FakeConsole.PushMockKeyPress (key);
 		}
+		return FakeConsole.MockKeyPresses.Count;
+	}
 
-		[Fact]
-		public void Run_Generic ()
-		{
-			List<Scenario> scenarios = Scenario.GetScenarios ();
-			Assert.NotEmpty (scenarios);
-
-			var item = scenarios.FindIndex (s => s.GetName ().Equals ("Generic", StringComparison.OrdinalIgnoreCase));
-			var generic = scenarios [item];
+	/// <summary>
+	///         <para>
+	///         This runs through all Scenarios defined in UI Catalog, calling Init, Setup, and Run.
+	///         </para>
+	///         <para>
+	///         Should find any Scenarios which crash on load or do not respond to <see cref="Application.RequestStop()"/>.
+	///         </para>
+	/// </summary>
+	[Fact]
+	public void Run_All_Scenarios ()
+	{
+		var scenarios = Scenario.GetScenarios ();
+		Assert.NotEmpty (scenarios);
+
+		foreach (var scenario in scenarios) {
+			_output.WriteLine ($"Running Scenario '{scenario.GetName ()}'");
 
 			Application.Init (new FakeDriver ());
+
+			// Press QuitKey 
+			Assert.Empty (FakeConsole.MockKeyPresses);
 			// BUGBUG: (#2474) For some reason ReadKey is not returning the QuitKey for some Scenarios
 			// by adding this Space it seems to work.
-
+			//FakeConsole.PushMockKeyPress (Key.Space);
 			FakeConsole.PushMockKeyPress ((KeyCode)Application.QuitKey);
 
-			var ms = 100;
-			var abortCount = 0;
-			Func<bool> abortCallback = () => {
-				abortCount++;
-				output.WriteLine ($"'Generic' abortCount {abortCount}");
-				Application.RequestStop ();
-				return false;
+			// The only key we care about is the QuitKey
+			Application.Top.KeyDown += (sender, args) => {
+				_output.WriteLine ($"  Keypress: {args.KeyCode}");
+				// BUGBUG: (#2474) For some reason ReadKey is not returning the QuitKey for some Scenarios
+				// by adding this Space it seems to work.
+				// See #2474 for why this is commented out
+				Assert.Equal (Application.QuitKey.KeyCode, args.KeyCode);
 			};
 
-			int iterations = 0;
-			object token = null;
-			Application.Iteration += (s, a) => {
-				if (token == null) {
-					// Timeout only must start at first iteration
-					token = Application.MainLoop.AddTimeout (TimeSpan.FromMilliseconds (ms), abortCallback);
-				}
-				iterations++;
-				output.WriteLine ($"'Generic' iteration {iterations}");
-				// Stop if we run out of control...
-				if (iterations == 10) {
-					output.WriteLine ($"'Generic' had to be force quit!");
+			uint abortTime = 500;
+			// If the scenario doesn't close within 500ms, this will force it to quit
+			var forceCloseCallback = () => {
+				if (Application.Top.Running && FakeConsole.MockKeyPresses.Count == 0) {
 					Application.RequestStop ();
+					// See #2474 for why this is commented out
+					Assert.Fail ($"'{scenario.GetName ()}' failed to Quit with {Application.QuitKey} after {abortTime}ms. Force quit.");
 				}
+				return false;
 			};
+			//output.WriteLine ($"  Add timeout to force quit after {abortTime}ms");
+			_ = Application.AddTimeout (TimeSpan.FromMilliseconds (abortTime), forceCloseCallback);
 
-			Application.Top.KeyDown += (object sender, Key args) => {
-				// See #2474 for why this is commented out
-				Assert.Equal (KeyCode.CtrlMask | KeyCode.Q, args.KeyCode);
+			Application.Iteration += (s, a) => {
+				//output.WriteLine ($"  iteration {++iterations}");
+				if (Application.Top.Running && FakeConsole.MockKeyPresses.Count == 0) {
+					Application.RequestStop ();
+					Assert.Fail ($"'{scenario.GetName ()}' failed to Quit with {Application.QuitKey}. Force quit.");
+				}
 			};
 
-			generic.Init ();
-			generic.Setup ();
-			generic.Run ();
-
-			Assert.Equal (0, abortCount);
-			// # of key up events should match # of iterations
-			Assert.Equal (1, iterations);
+			scenario.Init ();
+			scenario.Setup ();
+			scenario.Run ();
+			scenario.Dispose ();
 
-			generic.Dispose ();
-
-			// Shutdown must be called to safely clean up Application if Init has been called
 			Application.Shutdown ();
-
 #if DEBUG_IDISPOSABLE
 			Assert.Empty (Responder.Instances);
 #endif
 		}
+#if DEBUG_IDISPOSABLE
+		Assert.Empty (Responder.Instances);
+#endif
+	}
 
-		[Fact]
-		public void Run_All_Views_Tester_Scenario ()
-		{
-			Window _leftPane;
-			ListView _classListView;
-			FrameView _hostPane;
-
-			Dictionary<string, Type> _viewClasses;
-			View _curView = null;
-
-			// Settings
-			FrameView _settingsPane;
-			CheckBox _computedCheckBox;
-			FrameView _locationFrame;
-			RadioGroup _xRadioGroup;
-			TextField _xText;
-			int _xVal = 0;
-			RadioGroup _yRadioGroup;
-			TextField _yText;
-			int _yVal = 0;
-
-			FrameView _sizeFrame;
-			RadioGroup _wRadioGroup;
-			TextField _wText;
-			int _wVal = 0;
-			RadioGroup _hRadioGroup;
-			TextField _hText;
-			int _hVal = 0;
-			List<string> posNames = new List<String> { "Factor", "AnchorEnd", "Center", "Absolute" };
-			List<string> dimNames = new List<String> { "Factor", "Fill", "Absolute" };
-
-			Application.Init (new FakeDriver ());
+	[Fact]
+	public void Run_Generic ()
+	{
+		var scenarios = Scenario.GetScenarios ();
+		Assert.NotEmpty (scenarios);
+
+		var item = scenarios.FindIndex (s => s.GetName ().Equals ("Generic", StringComparison.OrdinalIgnoreCase));
+		var generic = scenarios [item];
+
+		Application.Init (new FakeDriver ());
+		// BUGBUG: (#2474) For some reason ReadKey is not returning the QuitKey for some Scenarios
+		// by adding this Space it seems to work.
+
+		FakeConsole.PushMockKeyPress ((KeyCode)Application.QuitKey);
+
+		var ms = 100;
+		var abortCount = 0;
+		var abortCallback = () => {
+			abortCount++;
+			_output.WriteLine ($"'Generic' abortCount {abortCount}");
+			Application.RequestStop ();
+			return false;
+		};
+
+		var iterations = 0;
+		object token = null;
+		Application.Iteration += (s, a) => {
+			if (token == null) {
+				// Timeout only must start at first iteration
+				token = Application.MainLoop.AddTimeout (TimeSpan.FromMilliseconds (ms), abortCallback);
+			}
+			iterations++;
+			_output.WriteLine ($"'Generic' iteration {iterations}");
+			// Stop if we run out of control...
+			if (iterations == 10) {
+				_output.WriteLine ("'Generic' had to be force quit!");
+				Application.RequestStop ();
+			}
+		};
 
-			var Top = Application.Top;
-
-			_viewClasses = GetAllViewClassesCollection ()
-				.OrderBy (t => t.Name)
-				.Select (t => new KeyValuePair<string, Type> (t.Name, t))
-				.ToDictionary (t => t.Key, t => t.Value);
-
-			_leftPane = new Window () {
-				Title = "Classes",
-				X = 0,
-				Y = 0,
-				Width = 15,
-				Height = Dim.Fill (1), // for status bar
-				CanFocus = false,
-				ColorScheme = Colors.TopLevel,
-			};
+		Application.Top.KeyDown += (sender, args) => {
+			// See #2474 for why this is commented out
+			Assert.Equal (KeyCode.CtrlMask | KeyCode.Q, args.KeyCode);
+		};
 
-			_classListView = new ListView (_viewClasses.Keys.ToList ()) {
-				X = 0,
-				Y = 0,
-				Width = Dim.Fill (0),
-				Height = Dim.Fill (0),
-				AllowsMarking = false,
-				ColorScheme = Colors.TopLevel,
-			};
-			_leftPane.Add (_classListView);
-
-			_settingsPane = new FrameView ("Settings") {
-				X = Pos.Right (_leftPane),
-				Y = 0, // for menu
-				Width = Dim.Fill (),
-				Height = 10,
-				CanFocus = false,
-				ColorScheme = Colors.TopLevel,
-			};
-			_computedCheckBox = new CheckBox ("Computed Layout", true) { X = 0, Y = 0 };
-			_settingsPane.Add (_computedCheckBox);
-
-			var radioItems = new string [] { "Percent(x)", "AnchorEnd(x)", "Center", "At(x)" };
-			_locationFrame = new FrameView ("Location (Pos)") {
-				X = Pos.Left (_computedCheckBox),
-				Y = Pos.Bottom (_computedCheckBox),
-				Height = 3 + radioItems.Length,
-				Width = 36,
-			};
-			_settingsPane.Add (_locationFrame);
+		generic.Init ();
+		generic.Setup ();
+		generic.Run ();
 
-			var label = new Label ("x:") { X = 0, Y = 0 };
-			_locationFrame.Add (label);
-			_xRadioGroup = new RadioGroup (radioItems) {
-				X = 0,
-				Y = Pos.Bottom (label),
-			};
-			_xText = new TextField ($"{_xVal}") { X = Pos.Right (label) + 1, Y = 0, Width = 4 };
-			_locationFrame.Add (_xText);
-
-			_locationFrame.Add (_xRadioGroup);
-
-			radioItems = new string [] { "Percent(y)", "AnchorEnd(y)", "Center", "At(y)" };
-			label = new Label ("y:") { X = Pos.Right (_xRadioGroup) + 1, Y = 0 };
-			_locationFrame.Add (label);
-			_yText = new TextField ($"{_yVal}") { X = Pos.Right (label) + 1, Y = 0, Width = 4 };
-			_locationFrame.Add (_yText);
-			_yRadioGroup = new RadioGroup (radioItems) {
-				X = Pos.X (label),
-				Y = Pos.Bottom (label),
-			};
-			_locationFrame.Add (_yRadioGroup);
+		Assert.Equal (0, abortCount);
+		// # of key up events should match # of iterations
+		Assert.Equal (1, iterations);
 
-			_sizeFrame = new FrameView ("Size (Dim)") {
-				X = Pos.Right (_locationFrame),
-				Y = Pos.Y (_locationFrame),
-				Height = 3 + radioItems.Length,
-				Width = 40,
-			};
+		generic.Dispose ();
 
-			radioItems = new string [] { "Percent(width)", "Fill(width)", "Sized(width)" };
-			label = new Label ("width:") { X = 0, Y = 0 };
-			_sizeFrame.Add (label);
-			_wRadioGroup = new RadioGroup (radioItems) {
-				X = 0,
-				Y = Pos.Bottom (label),
-			};
-			_wText = new TextField ($"{_wVal}") { X = Pos.Right (label) + 1, Y = 0, Width = 4 };
-			_sizeFrame.Add (_wText);
-			_sizeFrame.Add (_wRadioGroup);
-
-			radioItems = new string [] { "Percent(height)", "Fill(height)", "Sized(height)" };
-			label = new Label ("height:") { X = Pos.Right (_wRadioGroup) + 1, Y = 0 };
-			_sizeFrame.Add (label);
-			_hText = new TextField ($"{_hVal}") { X = Pos.Right (label) + 1, Y = 0, Width = 4 };
-			_sizeFrame.Add (_hText);
-
-			_hRadioGroup = new RadioGroup (radioItems) {
-				X = Pos.X (label),
-				Y = Pos.Bottom (label),
-			};
-			_sizeFrame.Add (_hRadioGroup);
+		// Shutdown must be called to safely clean up Application if Init has been called
+		Application.Shutdown ();
 
-			_settingsPane.Add (_sizeFrame);
+#if DEBUG_IDISPOSABLE
+		Assert.Empty (Responder.Instances);
+#endif
+	}
 
-			_hostPane = new FrameView ("") {
-				X = Pos.Right (_leftPane),
-				Y = Pos.Bottom (_settingsPane),
-				Width = Dim.Fill (),
-				Height = Dim.Fill (1), // + 1 for status bar
-				ColorScheme = Colors.Dialog,
-			};
+	[Fact]
+	public void Run_All_Views_Tester_Scenario ()
+	{
+		Window _leftPane;
+		ListView _classListView;
+		FrameView _hostPane;
+
+		Dictionary<string, Type> _viewClasses;
+		View _curView = null;
+
+		// Settings
+		FrameView _settingsPane;
+		CheckBox _computedCheckBox;
+		FrameView _locationFrame;
+		RadioGroup _xRadioGroup;
+		TextField _xText;
+		var _xVal = 0;
+		RadioGroup _yRadioGroup;
+		TextField _yText;
+		var _yVal = 0;
+
+		FrameView _sizeFrame;
+		RadioGroup _wRadioGroup;
+		TextField _wText;
+		var _wVal = 0;
+		RadioGroup _hRadioGroup;
+		TextField _hText;
+		var _hVal = 0;
+		var posNames = new List<String> { "Factor", "AnchorEnd", "Center", "Absolute" };
+		var dimNames = new List<String> { "Factor", "Fill", "Absolute" };
+
+		Application.Init (new FakeDriver ());
+
+		var Top = Application.Top;
+
+		_viewClasses = GetAllViewClassesCollection ()
+			.OrderBy (t => t.Name)
+			.Select (t => new KeyValuePair<string, Type> (t.Name, t))
+			.ToDictionary (t => t.Key, t => t.Value);
+
+		_leftPane = new Window {
+			Title = "Classes",
+			X = 0,
+			Y = 0,
+			Width = 15,
+			Height = Dim.Fill (1), // for status bar
+			CanFocus = false,
+			ColorScheme = Colors.TopLevel
+		};
+
+		_classListView = new ListView (_viewClasses.Keys.ToList ()) {
+			X = 0,
+			Y = 0,
+			Width = Dim.Fill (),
+			Height = Dim.Fill (),
+			AllowsMarking = false,
+			ColorScheme = Colors.TopLevel
+		};
+		_leftPane.Add (_classListView);
+
+		_settingsPane = new FrameView ("Settings") {
+			X = Pos.Right (_leftPane),
+			Y = 0, // for menu
+			Width = Dim.Fill (),
+			Height = 10,
+			CanFocus = false,
+			ColorScheme = Colors.TopLevel
+		};
+		_computedCheckBox = new CheckBox ("Computed Layout", true) { X = 0, Y = 0 };
+		_settingsPane.Add (_computedCheckBox);
+
+		var radioItems = new [] { "Percent(x)", "AnchorEnd(x)", "Center", "At(x)" };
+		_locationFrame = new FrameView ("Location (Pos)") {
+			X = Pos.Left (_computedCheckBox),
+			Y = Pos.Bottom (_computedCheckBox),
+			Height = 3 + radioItems.Length,
+			Width = 36
+		};
+		_settingsPane.Add (_locationFrame);
+
+		var label = new Label ("x:") { X = 0, Y = 0 };
+		_locationFrame.Add (label);
+		_xRadioGroup = new RadioGroup (radioItems) {
+			X = 0,
+			Y = Pos.Bottom (label)
+		};
+		_xText = new TextField ($"{_xVal}") { X = Pos.Right (label) + 1, Y = 0, Width = 4 };
+		_locationFrame.Add (_xText);
+
+		_locationFrame.Add (_xRadioGroup);
+
+		radioItems = new [] { "Percent(y)", "AnchorEnd(y)", "Center", "At(y)" };
+		label = new Label ("y:") { X = Pos.Right (_xRadioGroup) + 1, Y = 0 };
+		_locationFrame.Add (label);
+		_yText = new TextField ($"{_yVal}") { X = Pos.Right (label) + 1, Y = 0, Width = 4 };
+		_locationFrame.Add (_yText);
+		_yRadioGroup = new RadioGroup (radioItems) {
+			X = Pos.X (label),
+			Y = Pos.Bottom (label)
+		};
+		_locationFrame.Add (_yRadioGroup);
+
+		_sizeFrame = new FrameView ("Size (Dim)") {
+			X = Pos.Right (_locationFrame),
+			Y = Pos.Y (_locationFrame),
+			Height = 3 + radioItems.Length,
+			Width = 40
+		};
+
+		radioItems = new [] { "Percent(width)", "Fill(width)", "Sized(width)" };
+		label = new Label ("width:") { X = 0, Y = 0 };
+		_sizeFrame.Add (label);
+		_wRadioGroup = new RadioGroup (radioItems) {
+			X = 0,
+			Y = Pos.Bottom (label)
+		};
+		_wText = new TextField ($"{_wVal}") { X = Pos.Right (label) + 1, Y = 0, Width = 4 };
+		_sizeFrame.Add (_wText);
+		_sizeFrame.Add (_wRadioGroup);
+
+		radioItems = new [] { "Percent(height)", "Fill(height)", "Sized(height)" };
+		label = new Label ("height:") { X = Pos.Right (_wRadioGroup) + 1, Y = 0 };
+		_sizeFrame.Add (label);
+		_hText = new TextField ($"{_hVal}") { X = Pos.Right (label) + 1, Y = 0, Width = 4 };
+		_sizeFrame.Add (_hText);
+
+		_hRadioGroup = new RadioGroup (radioItems) {
+			X = Pos.X (label),
+			Y = Pos.Bottom (label)
+		};
+		_sizeFrame.Add (_hRadioGroup);
+
+		_settingsPane.Add (_sizeFrame);
+
+		_hostPane = new FrameView ("") {
+			X = Pos.Right (_leftPane),
+			Y = Pos.Bottom (_settingsPane),
+			Width = Dim.Fill (),
+			Height = Dim.Fill (1), // + 1 for status bar
+			ColorScheme = Colors.Dialog
+		};
+
+		_classListView.OpenSelectedItem += (s, a) => {
+			_settingsPane.SetFocus ();
+		};
+		_classListView.SelectedItemChanged += (s, args) => {
+			// Remove existing class, if any
+			if (_curView != null) {
+				_curView.LayoutComplete -= LayoutCompleteHandler;
+				_hostPane.Remove (_curView);
+				_curView.Dispose ();
+				_curView = null;
+				_hostPane.Clear ();
+			}
+			_curView = CreateClass (_viewClasses.Values.ToArray () [_classListView.SelectedItem]);
+		};
 
-			_classListView.OpenSelectedItem += (s, a) => {
-				_settingsPane.SetFocus ();
-			};
-			_classListView.SelectedItemChanged += (s, args) => {
-				// Remove existing class, if any
-				if (_curView != null) {
-					_curView.LayoutComplete -= LayoutCompleteHandler;
-					_hostPane.Remove (_curView);
-					_curView.Dispose ();
-					_curView = null;
-					_hostPane.Clear ();
-				}
-				_curView = CreateClass (_viewClasses.Values.ToArray () [_classListView.SelectedItem]);
-			};
+		_computedCheckBox.Toggled += (s, e) => {
+			if (_curView != null) {
+				//_curView.LayoutStyle = e.OldValue == true ? LayoutStyle.Absolute : LayoutStyle.Computed;
+				_hostPane.LayoutSubviews ();
+			}
+		};
 
-			_computedCheckBox.Toggled += (s, e) => {
-				if (_curView != null) {
-					_curView.LayoutStyle = e.OldValue == true ? LayoutStyle.Absolute : LayoutStyle.Computed;
-					_hostPane.LayoutSubviews ();
-				}
-			};
+		_xRadioGroup.SelectedItemChanged += (s, selected) => DimPosChanged (_curView);
 
-			_xRadioGroup.SelectedItemChanged += (s, selected) => DimPosChanged (_curView);
+		_xText.TextChanged += (s, args) => {
+			try {
+				_xVal = int.Parse (_xText.Text);
+				DimPosChanged (_curView);
+			} catch { }
+		};
 
-			_xText.TextChanged += (s, args) => {
-				try {
-					_xVal = int.Parse (_xText.Text);
-					DimPosChanged (_curView);
-				} catch {
+		_yText.TextChanged += (s, e) => {
+			try {
+				_yVal = int.Parse (_yText.Text);
+				DimPosChanged (_curView);
+			} catch { }
+		};
 
-				}
-			};
+		_yRadioGroup.SelectedItemChanged += (s, selected) => DimPosChanged (_curView);
 
-			_yText.TextChanged += (s, e) => {
-				try {
-					_yVal = int.Parse (_yText.Text);
-					DimPosChanged (_curView);
-				} catch {
+		_wRadioGroup.SelectedItemChanged += (s, selected) => DimPosChanged (_curView);
 
-				}
-			};
+		_wText.TextChanged += (s, args) => {
+			try {
+				_wVal = int.Parse (_wText.Text);
+				DimPosChanged (_curView);
+			} catch { }
+		};
 
-			_yRadioGroup.SelectedItemChanged += (s, selected) => DimPosChanged (_curView);
+		_hText.TextChanged += (s, args) => {
+			try {
+				_hVal = int.Parse (_hText.Text);
+				DimPosChanged (_curView);
+			} catch { }
+		};
 
-			_wRadioGroup.SelectedItemChanged += (s, selected) => DimPosChanged (_curView);
+		_hRadioGroup.SelectedItemChanged += (s, selected) => DimPosChanged (_curView);
 
-			_wText.TextChanged += (s, args) => {
-				try {
-					_wVal = int.Parse (_wText.Text);
-					DimPosChanged (_curView);
-				} catch {
+		Top.Add (_leftPane, _settingsPane, _hostPane);
 
-				}
-			};
+		Top.LayoutSubviews ();
 
-			_hText.TextChanged += (s, args) => {
-				try {
-					_hVal = int.Parse (_hText.Text);
-					DimPosChanged (_curView);
-				} catch {
+		_curView = CreateClass (_viewClasses.First ().Value);
 
-				}
-			};
+		var iterations = 0;
 
-			_hRadioGroup.SelectedItemChanged += (s, selected) => DimPosChanged (_curView);
+		Application.Iteration += (s, a) => {
+			iterations++;
 
-			Top.Add (_leftPane, _settingsPane, _hostPane);
+			if (iterations < _viewClasses.Count) {
+				_classListView.MoveDown ();
+				Assert.Equal (_curView.GetType ().Name,
+					_viewClasses.Values.ToArray () [_classListView.SelectedItem].Name);
+			} else {
+				Application.RequestStop ();
+			}
+		};
 
-			Top.LayoutSubviews ();
+		Application.Run ();
 
-			_curView = CreateClass (_viewClasses.First ().Value);
+		Assert.Equal (_viewClasses.Count, iterations);
 
-			int iterations = 0;
+		Application.Shutdown ();
 
-			Application.Iteration += (s, a) => {
-				iterations++;
+		void DimPosChanged (View view)
+		{
+			if (view == null) {
+				return;
+			}
 
-				if (iterations < _viewClasses.Count) {
-					_classListView.MoveDown ();
-					Assert.Equal (_curView.GetType ().Name,
-						_viewClasses.Values.ToArray () [_classListView.SelectedItem].Name);
-				} else {
-					Application.RequestStop ();
+			var layout = view.LayoutStyle;
+
+			try {
+				//view.LayoutStyle = LayoutStyle.Absolute;
+
+				switch (_xRadioGroup.SelectedItem) {
+				case 0:
+					view.X = Pos.Percent (_xVal);
+					break;
+				case 1:
+					view.X = Pos.AnchorEnd (_xVal);
+					break;
+				case 2:
+					view.X = Pos.Center ();
+					break;
+				case 3:
+					view.X = Pos.At (_xVal);
+					break;
 				}
-			};
-
-			Application.Run ();
 
-			Assert.Equal (_viewClasses.Count, iterations);
-
-			Application.Shutdown ();
-
-			void DimPosChanged (View view)
-			{
-				if (view == null) {
-					return;
+				switch (_yRadioGroup.SelectedItem) {
+				case 0:
+					view.Y = Pos.Percent (_yVal);
+					break;
+				case 1:
+					view.Y = Pos.AnchorEnd (_yVal);
+					break;
+				case 2:
+					view.Y = Pos.Center ();
+					break;
+				case 3:
+					view.Y = Pos.At (_yVal);
+					break;
 				}
 
-				var layout = view.LayoutStyle;
+				switch (_wRadioGroup.SelectedItem) {
+				case 0:
+					view.Width = Dim.Percent (_wVal);
+					break;
+				case 1:
+					view.Width = Dim.Fill (_wVal);
+					break;
+				case 2:
+					view.Width = Dim.Sized (_wVal);
+					break;
+				}
 
-				try {
-					view.LayoutStyle = LayoutStyle.Absolute;
-
-					switch (_xRadioGroup.SelectedItem) {
-					case 0:
-						view.X = Pos.Percent (_xVal);
-						break;
-					case 1:
-						view.X = Pos.AnchorEnd (_xVal);
-						break;
-					case 2:
-						view.X = Pos.Center ();
-						break;
-					case 3:
-						view.X = Pos.At (_xVal);
-						break;
-					}
-
-					switch (_yRadioGroup.SelectedItem) {
-					case 0:
-						view.Y = Pos.Percent (_yVal);
-						break;
-					case 1:
-						view.Y = Pos.AnchorEnd (_yVal);
-						break;
-					case 2:
-						view.Y = Pos.Center ();
-						break;
-					case 3:
-						view.Y = Pos.At (_yVal);
-						break;
-					}
-
-					switch (_wRadioGroup.SelectedItem) {
-					case 0:
-						view.Width = Dim.Percent (_wVal);
-						break;
-					case 1:
-						view.Width = Dim.Fill (_wVal);
-						break;
-					case 2:
-						view.Width = Dim.Sized (_wVal);
-						break;
-					}
-
-					switch (_hRadioGroup.SelectedItem) {
-					case 0:
-						view.Height = Dim.Percent (_hVal);
-						break;
-					case 1:
-						view.Height = Dim.Fill (_hVal);
-						break;
-					case 2:
-						view.Height = Dim.Sized (_hVal);
-						break;
-					}
-				} catch (Exception e) {
-					MessageBox.ErrorQuery ("Exception", e.Message, "Ok");
-				} finally {
-					view.LayoutStyle = layout;
+				switch (_hRadioGroup.SelectedItem) {
+				case 0:
+					view.Height = Dim.Percent (_hVal);
+					break;
+				case 1:
+					view.Height = Dim.Fill (_hVal);
+					break;
+				case 2:
+					view.Height = Dim.Sized (_hVal);
+					break;
 				}
-				UpdateTitle (view);
+			} catch (Exception e) {
+				MessageBox.ErrorQuery ("Exception", e.Message, "Ok");
 			}
+			UpdateTitle (view);
+		}
 
-			void UpdateSettings (View view)
-			{
-				var x = view.X.ToString ();
-				var y = view.Y.ToString ();
-				_xRadioGroup.SelectedItem = posNames.IndexOf (posNames.Where (s => x.Contains (s)).First ());
-				_yRadioGroup.SelectedItem = posNames.IndexOf (posNames.Where (s => y.Contains (s)).First ());
-				_xText.Text = $"{view.Frame.X}";
-				_yText.Text = $"{view.Frame.Y}";
-
-				var w = view.Width.ToString ();
-				var h = view.Height.ToString ();
-				_wRadioGroup.SelectedItem = dimNames.IndexOf (dimNames.Where (s => w.Contains (s)).First ());
-				_hRadioGroup.SelectedItem = dimNames.IndexOf (dimNames.Where (s => h.Contains (s)).First ());
-				_wText.Text = $"{view.Frame.Width}";
-				_hText.Text = $"{view.Frame.Height}";
-			}
+		void UpdateSettings (View view)
+		{
+			var x = view.X.ToString ();
+			var y = view.Y.ToString ();
+			_xRadioGroup.SelectedItem = posNames.IndexOf (posNames.Where (s => x.Contains (s)).First ());
+			_yRadioGroup.SelectedItem = posNames.IndexOf (posNames.Where (s => y.Contains (s)).First ());
+			_xText.Text = $"{view.Frame.X}";
+			_yText.Text = $"{view.Frame.Y}";
+
+			var w = view.Width.ToString ();
+			var h = view.Height.ToString ();
+			_wRadioGroup.SelectedItem = dimNames.IndexOf (dimNames.Where (s => w.Contains (s)).First ());
+			_hRadioGroup.SelectedItem = dimNames.IndexOf (dimNames.Where (s => h.Contains (s)).First ());
+			_wText.Text = $"{view.Frame.Width}";
+			_hText.Text = $"{view.Frame.Height}";
+		}
 
-			void UpdateTitle (View view)
-			{
-				_hostPane.Title = $"{view.GetType ().Name} - {view.X.ToString ()}, {view.Y.ToString ()}, {view.Width.ToString ()}, {view.Height.ToString ()}";
-			}
+		void UpdateTitle (View view)
+		{
+			_hostPane.Title = $"{view.GetType ().Name} - {view.X}, {view.Y}, {view.Width}, {view.Height}";
+		}
 
-			List<Type> GetAllViewClassesCollection ()
-			{
-				List<Type> types = new List<Type> ();
-				foreach (Type type in typeof (View).Assembly.GetTypes ()
-				 .Where (myType => myType.IsClass && !myType.IsAbstract && myType.IsPublic && myType.IsSubclassOf (typeof (View)))) {
-					types.Add (type);
-				}
-				return types;
+		List<Type> GetAllViewClassesCollection ()
+		{
+			var types = new List<Type> ();
+			foreach (var type in typeof (View).Assembly.GetTypes ()
+				.Where (myType => myType.IsClass && !myType.IsAbstract && myType.IsPublic && myType.IsSubclassOf (typeof (View)))) {
+				types.Add (type);
 			}
+			return types;
+		}
 
-			View CreateClass (Type type)
-			{
-				// If we are to create a generic Type
-				if (type.IsGenericType) {
-
-					// For each of the <T> arguments
-					List<Type> typeArguments = new List<Type> ();
+		View CreateClass (Type type)
+		{
+			// If we are to create a generic Type
+			if (type.IsGenericType) {
 
-					// use <object>
-					foreach (var arg in type.GetGenericArguments ()) {
-						typeArguments.Add (typeof (object));
-					}
+				// For each of the <T> arguments
+				var typeArguments = new List<Type> ();
 
-					// And change what type we are instantiating from MyClass<T> to MyClass<object>
-					type = type.MakeGenericType (typeArguments.ToArray ());
+				// use <object>
+				foreach (var arg in type.GetGenericArguments ()) {
+					typeArguments.Add (typeof (object));
 				}
-				// Instantiate view
-				var view = (View)Activator.CreateInstance (type);
 
-				//_curView.X = Pos.Center ();
-				//_curView.Y = Pos.Center ();
-				view.Width = Dim.Percent (75);
-				view.Height = Dim.Percent (75);
+				// And change what type we are instantiating from MyClass<T> to MyClass<object>
+				type = type.MakeGenericType (typeArguments.ToArray ());
+			}
+			// Instantiate view
+			var view = (View)Activator.CreateInstance (type);
 
-				// Set the colorscheme to make it stand out if is null by default
-				if (view.ColorScheme == null) {
-					view.ColorScheme = Colors.Base;
-				}
+			//_curView.X = Pos.Center ();
+			//_curView.Y = Pos.Center ();
+			view.Width = Dim.Percent (75);
+			view.Height = Dim.Percent (75);
+
+			// Set the colorscheme to make it stand out if is null by default
+			if (view.ColorScheme == null) {
+				view.ColorScheme = Colors.Base;
+			}
 
-				// If the view supports a Text property, set it so we have something to look at
-				if (view.GetType ().GetProperty ("Text") != null) {
-					try {
-						view.GetType ().GetProperty ("Text")?.GetSetMethod ()?.Invoke (view, new [] { "Test Text" });
-					} catch (TargetInvocationException e) {
-						MessageBox.ErrorQuery ("Exception", e.InnerException.Message, "Ok");
-						view = null;
-					}
+			// If the view supports a Text property, set it so we have something to look at
+			if (view.GetType ().GetProperty ("Text") != null) {
+				try {
+					view.GetType ().GetProperty ("Text")?.GetSetMethod ()?.Invoke (view, new [] { "Test Text" });
+				} catch (TargetInvocationException e) {
+					MessageBox.ErrorQuery ("Exception", e.InnerException.Message, "Ok");
+					view = null;
 				}
+			}
 
-				// If the view supports a Title property, set it so we have something to look at
-				if (view != null && view.GetType ().GetProperty ("Title") != null) {
-					if (view.GetType ().GetProperty ("Title").PropertyType == typeof (string)) {
-						view?.GetType ().GetProperty ("Title")?.GetSetMethod ()?.Invoke (view, new [] { "Test Title" });
-					} else {
-						view?.GetType ().GetProperty ("Title")?.GetSetMethod ()?.Invoke (view, new [] { "Test Title" });
-					}
-				}                               
-				
-				// If the view supports a Source property, set it so we have something to look at
-				if (view != null && view.GetType ().GetProperty ("Source") != null && view.GetType ().GetProperty ("Source").PropertyType == typeof (Terminal.Gui.IListDataSource)) {
-					var source = new ListWrapper (new List<string> () { "Test Text #1", "Test Text #2", "Test Text #3" });
-					view?.GetType ().GetProperty ("Source")?.GetSetMethod ()?.Invoke (view, new [] { source });
+			// If the view supports a Title property, set it so we have something to look at
+			if (view != null && view.GetType ().GetProperty ("Title") != null) {
+				if (view.GetType ().GetProperty ("Title").PropertyType == typeof (string)) {
+					view?.GetType ().GetProperty ("Title")?.GetSetMethod ()?.Invoke (view, new [] { "Test Title" });
+				} else {
+					view?.GetType ().GetProperty ("Title")?.GetSetMethod ()?.Invoke (view, new [] { "Test Title" });
 				}
+			}
 
-				// Set Settings
-				_computedCheckBox.Checked = view.LayoutStyle == LayoutStyle.Computed;
+			// If the view supports a Source property, set it so we have something to look at
+			if (view != null && view.GetType ().GetProperty ("Source") != null && view.GetType ().GetProperty ("Source").PropertyType == typeof (IListDataSource)) {
+				var source = new ListWrapper (new List<string> { "Test Text #1", "Test Text #2", "Test Text #3" });
+				view?.GetType ().GetProperty ("Source")?.GetSetMethod ()?.Invoke (view, new [] { source });
+			}
 
-				// Add
-				_hostPane.Add (view);
-				//DimPosChanged ();
-				_hostPane.LayoutSubviews ();
-				_hostPane.Clear ();
-				_hostPane.SetNeedsDisplay ();
-				UpdateSettings (view);
-				UpdateTitle (view);
+			// Set Settings
+			_computedCheckBox.Checked = view.LayoutStyle == LayoutStyle.Computed;
 
-				view.LayoutComplete += LayoutCompleteHandler;
+			// Add
+			_hostPane.Add (view);
+			//DimPosChanged ();
+			_hostPane.LayoutSubviews ();
+			_hostPane.Clear ();
+			_hostPane.SetNeedsDisplay ();
+			UpdateSettings (view);
+			UpdateTitle (view);
 
-				return view;
-			}
+			view.LayoutComplete += LayoutCompleteHandler;
 
-			void LayoutCompleteHandler (object sender, LayoutEventArgs args)
-			{
-				UpdateTitle (_curView);
-			}
+			return view;
+		}
+
+		void LayoutCompleteHandler (object sender, LayoutEventArgs args)
+		{
+			UpdateTitle (_curView);
 		}
 	}
-}
+}

UnitTests/View/DrawTests.cs

@@ -4,14 +4,16 @@ using Xunit;
 using Xunit.Abstractions;
 using Microsoft.VisualStudio.TestPlatform.Utilities;
 
-namespace Terminal.Gui.ViewsTests; 
+namespace Terminal.Gui.ViewsTests;
 
 public class DrawTests {
 	readonly ITestOutputHelper _output;
 
 	public DrawTests (ITestOutputHelper output) => _output = output;
 
-	[Fact] [AutoInitShutdown]
+	// TODO: Refactor this test to not depend on TextView etc... Make it as primitive as possible
+	[Fact]
+	[AutoInitShutdown]
 	public void Clipping_AddRune_Left_Or_Right_Replace_Previous_Or_Next_Wide_Rune_With_Space ()
 	{
 		var tv = new TextView () {
@@ -29,7 +31,8 @@ public class DrawTests {
 		var win = new Window () { Width = Dim.Fill (), Height = Dim.Fill () };
 		win.Add (tv);
 		Application.Top.Add (win);
-		var lbl = new Label ("ワイドルーン。");
+		// Don't use Label. It sets AutoSize = true which is not what we're testing here.
+		var lbl = new View ("ワイドルーン。");
 		// Don't have unit tests use things that aren't absolutely critical for the test, like Dialog
 		var dg = new Window () { X = 2, Y = 2, Width = 14, Height = 3 };
 		dg.Add (lbl);
@@ -54,7 +57,8 @@ public class DrawTests {
 	}
 
 	// TODO: The tests below that use Label should use View instead.
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void Non_Bmp_ConsoleWidth_ColumnWidth_Equal_Two ()
 	{
 		string us = "\U0001d539";
@@ -102,7 +106,8 @@ public class DrawTests {
 0000000000", Application.Driver, expectedColors);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void CJK_Compatibility_Ideographs_ConsoleWidth_ColumnWidth_Equal_Two ()
 	{
 		string us = "\U0000f900";
@@ -150,7 +155,8 @@ public class DrawTests {
 0000000000", Application.Driver, expectedColors);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void Colors_On_TextAlignment_Right_And_Bottom ()
 	{
 		var labelRight = new Label ("Test") {
@@ -191,7 +197,8 @@ t     ", _output);
 0", Application.Driver, new Attribute [] { Colors.Base.Normal });
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void Draw_Negative_Bounds_Horizontal_Without_New_Lines ()
 	{
 		// BUGBUG: This previously assumed the default height of a View was 1. 
@@ -235,7 +242,8 @@ t     ", _output);
 		TestHelpers.AssertDriverContentsWithFrameAre ("", _output);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void Draw_Negative_Bounds_Horizontal_With_New_Lines ()
 	{
 		var subView = new View () { Id = "subView", X = 1, Width = 1, Height = 7, Text = "s\nu\nb\nV\ni\ne\nw" };
@@ -304,7 +312,8 @@ t     ", _output);
 		TestHelpers.AssertDriverContentsWithFrameAre ("", _output);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void Draw_Negative_Bounds_Vertical ()
 	{
 		var subView = new View () { Id = "subView", X = 1, Width = 1, Height = 7, Text = "subView", TextDirection = TextDirection.TopBottom_LeftRight };

UnitTests/View/Layout/AbsoluteLayoutTests.cs

@@ -1,5 +1,6 @@
 using Xunit;
 using Xunit.Abstractions;
+
 //using GraphViewTests = Terminal.Gui.Views.GraphViewTests;
 
 // Alias Console to MockConsole so we don't accidentally use Console
@@ -9,95 +10,146 @@ namespace Terminal.Gui.ViewTests;
 public class AbsoluteLayoutTests {
 	readonly ITestOutputHelper _output;
 
-	public AbsoluteLayoutTests (ITestOutputHelper output) => this._output = output;
+	public AbsoluteLayoutTests (ITestOutputHelper output) => _output = output;
 
-	[Fact] [TestRespondersDisposed]
+	[Fact]
+	[TestRespondersDisposed]
 	public void AbsoluteLayout_Constructor ()
 	{
-		var frame = new Rect (1, 2, 3, 4);
-		var v = new View (frame);
+		var v = new View ();
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
+		v.Dispose ();
+
+		var frame = Rect.Empty;
+		v = new View (frame);
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
+		Assert.Equal (frame, v.Frame);
+		Assert.Equal (new Rect (0, 0, frame.Width, frame.Height), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
+		Assert.Equal (Pos.At (0), v.X);
+		Assert.Equal (Pos.At (0), v.Y);
+		Assert.Equal (Dim.Sized (0), v.Width);
+		Assert.Equal (Dim.Sized (0), v.Height);
+		v.Dispose ();
+
+		frame = new Rect (1, 2, 3, 4);
+		v = new View (frame);
 		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
 		Assert.Equal (frame, v.Frame);
 		Assert.Equal (new Rect (0, 0, frame.Width, frame.Height), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
-		Assert.Null (v.X);
-		Assert.Null (v.Y);
-		Assert.Null (v.Height);
-		Assert.Null (v.Width);
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
+		Assert.Equal (Dim.Sized (3), v.Width);
+		Assert.Equal (Dim.Sized (4), v.Height);
 		v.Dispose ();
 
 		v = new View (frame, "v");
 		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
 		Assert.Equal (frame, v.Frame);
 		Assert.Equal (new Rect (0, 0, frame.Width, frame.Height), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
-		Assert.Null (v.X);
-		Assert.Null (v.Y);
-		Assert.Null (v.Height);
-		Assert.Null (v.Width);
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
+		Assert.Equal (Dim.Sized (3), v.Width);
+		Assert.Equal (Dim.Sized (4), v.Height);
 		v.Dispose ();
 
 		v = new View (frame.X, frame.Y, "v");
 		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
-		// BUGBUG: v2 - I think the default size should be 0,0
+		// BUGBUG: v2 - I think the default size should be 0,0 not 1,1
 		Assert.Equal (new Rect (frame.X, frame.Y, 1, 1), v.Frame);
 		Assert.Equal (new Rect (0, 0, 1, 1), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
-		Assert.Null (v.X);
-		Assert.Null (v.Y);
-		Assert.Null (v.Height);
-		Assert.Null (v.Width);
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
+		Assert.Equal (Dim.Sized (1), v.Width);
+		Assert.Equal (Dim.Sized (1), v.Height);
+		v.Dispose ();
+
+		v = new View ();
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
+		Assert.Equal (new Rect (0, 0, 0, 0), v.Frame);
+		Assert.Equal (new Rect (0, 0, 0, 0), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
+		Assert.Equal (Pos.At (0), v.X);
+		Assert.Equal (Pos.At (0), v.Y);
+		Assert.Equal (Dim.Sized (0), v.Width);
+		Assert.Equal (Dim.Sized (0), v.Height);
 		v.Dispose ();
 
+		v = new View {
+			X = frame.X,
+			Y = frame.Y,
+			Width = frame.Width,
+			Height = frame.Height
+		};
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
+		Assert.Equal (new Rect (frame.X, frame.Y, 3, 4), v.Frame);
+		Assert.Equal (new Rect (0, 0, 3, 4), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
+		Assert.Equal (Dim.Sized (3), v.Width);
+		Assert.Equal (Dim.Sized (4), v.Height);
+		v.Dispose ();
 	}
 
-	[Fact] [TestRespondersDisposed]
+	[Fact]
+	[TestRespondersDisposed]
 	public void AbsoluteLayout_Change_Frame ()
 	{
 		var frame = new Rect (1, 2, 3, 4);
 		var newFrame = new Rect (1, 2, 30, 40);
 
-		var v = new View (frame);
+		var v = new View ();
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
+		v.Dispose ();
+
+		v = new View (frame);
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
+
 		v.Frame = newFrame;
 		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
 		Assert.Equal (newFrame, v.Frame);
 		Assert.Equal (new Rect (0, 0, newFrame.Width, newFrame.Height), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
-		Assert.Null (v.X);
-		Assert.Null (v.Y);
-		Assert.Null (v.Height);
-		Assert.Null (v.Width);
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
+		Assert.Equal (Dim.Sized (30), v.Width);
+		Assert.Equal (Dim.Sized (40), v.Height);
 		v.Dispose ();
 
 		v = new View (frame.X, frame.Y, "v");
 		v.Frame = newFrame;
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
 		Assert.Equal (newFrame, v.Frame);
 		Assert.Equal (new Rect (0, 0, newFrame.Width, newFrame.Height), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
-		Assert.Null (v.X);
-		Assert.Null (v.Y);
-		Assert.Null (v.Height);
-		Assert.Null (v.Width);
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
+		Assert.Equal (Dim.Sized (30), v.Width);
+		Assert.Equal (Dim.Sized (40), v.Height);
 		v.Dispose ();
 
 		newFrame = new Rect (10, 20, 30, 40);
 		v = new View (frame);
 		v.Frame = newFrame;
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
 		Assert.Equal (newFrame, v.Frame);
 		Assert.Equal (new Rect (0, 0, newFrame.Width, newFrame.Height), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
-		Assert.Null (v.X);
-		Assert.Null (v.Y);
-		Assert.Null (v.Height);
-		Assert.Null (v.Width);
+		Assert.Equal (Pos.At (10), v.X);
+		Assert.Equal (Pos.At (20), v.Y);
+		Assert.Equal (Dim.Sized (30), v.Width);
+		Assert.Equal (Dim.Sized (40), v.Height);
 		v.Dispose ();
 
 		v = new View (frame.X, frame.Y, "v");
 		v.Frame = newFrame;
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
 		Assert.Equal (newFrame, v.Frame);
 		Assert.Equal (new Rect (0, 0, newFrame.Width, newFrame.Height), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
-		Assert.Null (v.X);
-		Assert.Null (v.Y);
-		Assert.Null (v.Height);
-		Assert.Null (v.Width);
+		Assert.Equal (Pos.At (10), v.X);
+		Assert.Equal (Pos.At (20), v.Y);
+		Assert.Equal (Dim.Sized (30), v.Width);
+		Assert.Equal (Dim.Sized (40), v.Height);
 		v.Dispose ();
 	}
 
-	[Fact] [TestRespondersDisposed]
+	[Fact]
+	[TestRespondersDisposed]
 	public void AbsoluteLayout_Change_Height_or_Width_Absolute ()
 	{
 		var frame = new Rect (1, 2, 3, 4);
@@ -109,34 +161,26 @@ public class AbsoluteLayoutTests {
 		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
 		Assert.Equal (newFrame, v.Frame);
 		Assert.Equal (new Rect (0, 0, newFrame.Width, newFrame.Height), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
-		Assert.Null (v.X);
-		Assert.Null (v.Y);
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
 		Assert.Equal ($"Absolute({newFrame.Height})", v.Height.ToString ());
 		Assert.Equal ($"Absolute({newFrame.Width})", v.Width.ToString ());
 		v.Dispose ();
 	}
 
-	[Fact] [TestRespondersDisposed]
-	public void AbsoluteLayout_Change_Height_or_Width_NotAbsolute ()
+	[Fact]
+	[TestRespondersDisposed]
+	public void AbsoluteLayout_Change_Height_or_Width_MakesComputed ()
 	{
 		var v = new View (Rect.Empty);
 		v.Height = Dim.Fill ();
 		v.Width = Dim.Fill ();
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // BUGBUG: v2 - Changing the Height or Width should change the LayoutStyle
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 		v.Dispose ();
 	}
 
-	[Fact] [TestRespondersDisposed]
-	public void AbsoluteLayout_Change_Height_or_Width_Null ()
-	{
-		var v = new View (Rect.Empty);
-		v.Height = null;
-		v.Width = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
-		v.Dispose ();
-	}
-
-	[Fact] [TestRespondersDisposed]
+	[Fact]
+	[TestRespondersDisposed]
 	public void AbsoluteLayout_Change_X_or_Y_Absolute ()
 	{
 		var frame = new Rect (1, 2, 3, 4);
@@ -150,52 +194,24 @@ public class AbsoluteLayoutTests {
 		Assert.Equal (new Rect (0, 0, newFrame.Width, newFrame.Height), v.Bounds); // With Absolute Bounds *is* deterministic before Layout
 		Assert.Equal ($"Absolute({newFrame.X})", v.X.ToString ());
 		Assert.Equal ($"Absolute({newFrame.Y})", v.Y.ToString ());
-		Assert.Null (v.Height);
-		Assert.Null (v.Width);
-		v.Dispose ();
-	}
-
-	[Fact] [TestRespondersDisposed]
-	public void AbsoluteLayout_Change_X_or_Y_NotAbsolute ()
-	{
-		var v = new View (Rect.Empty);
-		v.X = Pos.Center ();
-		v.Y = Pos.Center ();
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // BUGBUG: v2 - Changing the Height or Width should change the LayoutStyle
+		Assert.Equal (Dim.Sized (3), v.Width);
+		Assert.Equal (Dim.Sized (4), v.Height);
 		v.Dispose ();
 	}
 
-	[Fact] [TestRespondersDisposed]
-	public void AbsoluteLayout_Change_X_or_Y_Null ()
+	[Fact]
+	[TestRespondersDisposed]
+	public void AbsoluteLayout_Change_X_or_Y_MakesComputed ()
 	{
 		var v = new View (Rect.Empty);
-		v.X = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
-		v.Dispose ();
-
-		v = new View (Rect.Empty);
 		v.X = Pos.Center ();
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // BUGBUG: v2 - Changing the Height or Width should change the LayoutStyle
-
-		v.X = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
-		v.Dispose ();
-
-		v = new View (Rect.Empty);
-		v.Y = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
-		v.Dispose ();
-
-		v = new View (Rect.Empty);
 		v.Y = Pos.Center ();
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // BUGBUG: v2 - Changing the Height or Width should change the LayoutStyle
-
-		v.Y = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 		v.Dispose ();
 	}
 
-	[Fact] [TestRespondersDisposed]
+	[Fact]
+	[TestRespondersDisposed]
 	public void AbsoluteLayout_Change_X_Y_Height_Width_Absolute ()
 	{
 		var v = new View (Rect.Empty);
@@ -211,14 +227,7 @@ public class AbsoluteLayoutTests {
 		v.Y = Pos.Center ();
 		v.Width = Dim.Fill ();
 		v.Height = Dim.Fill ();
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // BUGBUG: v2 - Changing the Height or Width should change the LayoutStyle
-
-		// BUGBUG: v2 - If all of X, Y, Width, and Height are null or Absolute(n), isn't that the same as LayoutStyle.Absoulte?
-		v.X = null;
-		v.Y = null;
-		v.Height = null;
-		v.Width = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // We never automatically change to Absolute from Computed??
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 		v.Dispose ();
 
 		v = new View (Rect.Empty);
@@ -226,14 +235,10 @@ public class AbsoluteLayoutTests {
 		v.Y = Pos.Center ();
 		v.Width = Dim.Fill ();
 		v.Height = Dim.Fill ();
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // BUGBUG: v2 - Changing the Height or Width should change the LayoutStyle
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 
-		// BUGBUG: v2 - If all of X, Y, Width, and Height are null or Absolute(n), isn't that the same as LayoutStyle.Absoulte?
 		v.X = 1;
-		v.Y = null;
-		v.Height = null;
-		v.Width = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // We never automatically change to Absolute from Computed??
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 		v.Dispose ();
 
 		v = new View (Rect.Empty);
@@ -241,14 +246,10 @@ public class AbsoluteLayoutTests {
 		v.Y = Pos.Center ();
 		v.Width = Dim.Fill ();
 		v.Height = Dim.Fill ();
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // BUGBUG: v2 - Changing the Height or Width should change the LayoutStyle
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 
-		// BUGBUG: v2 - If all of X, Y, Width, and Height are null or Absolute(n), isn't that the same as LayoutStyle.Absoulte?
-		v.X = null;
 		v.Y = 2;
-		v.Height = null;
-		v.Width = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // We never automatically change to Absolute from Computed??
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 		v.Dispose ();
 
 		v = new View (Rect.Empty);
@@ -256,14 +257,10 @@ public class AbsoluteLayoutTests {
 		v.Y = Pos.Center ();
 		v.Width = Dim.Fill ();
 		v.Height = Dim.Fill ();
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // BUGBUG: v2 - Changing the Height or Width should change the LayoutStyle
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 
-		// BUGBUG: v2 - If all of X, Y, Width, and Height are null or Absolute(n), isn't that the same as LayoutStyle.Absoulte?
-		v.X = null;
-		v.Y = null;
-		v.Height = 3;
-		v.Width = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // We never automatically change to Absolute from Computed??
+		v.Width = 3;
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 		v.Dispose ();
 
 		v = new View (Rect.Empty);
@@ -271,72 +268,122 @@ public class AbsoluteLayoutTests {
 		v.Y = Pos.Center ();
 		v.Width = Dim.Fill ();
 		v.Height = Dim.Fill ();
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // BUGBUG: v2 - Changing the Height or Width should change the LayoutStyle
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 
-		// BUGBUG: v2 - If all of X, Y, Width, and Height are null or Absolute(n), isn't that the same as LayoutStyle.Absoulte?
-		v.X = null;
-		v.Y = null;
-		v.Height = null;
-		v.Width = 4;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // We never automatically change to Absolute from Computed??
+		v.Height = 3;
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
 		v.Dispose ();
-	}
-
-	[Fact] [TestRespondersDisposed]
-	public void AbsoluteLayout_Change_X_Y_Height_Width_Null ()
-	{
-		var v = new View (Rect.Empty);
-		v.X = null;
-		v.Y = null;
-		v.Height = null;
-		v.Width = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
 
-		v.Dispose ();
 		v = new View (Rect.Empty);
 		v.X = Pos.Center ();
 		v.Y = Pos.Center ();
 		v.Width = Dim.Fill ();
 		v.Height = Dim.Fill ();
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // BUGBUG: v2 - Changing the Height or Width should change the LayoutStyle
-
-		// BUGBUG: v2 - If all of X, Y, Width, and Height are null or Absolute(n), isn't that the same as LayoutStyle.Absoulte?
-		v.X = null;
-		v.Y = null;
-		v.Height = null;
-		v.Width = null;
-		Assert.True (v.LayoutStyle == LayoutStyle.Absolute); // We never automatically change to Absolute from Computed??
+		Assert.True (v.LayoutStyle == LayoutStyle.Computed);
+
+		v.X = 1;
+		v.Y = 2;
+		v.Height = 3;
+		v.Width = 4;
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
 		v.Dispose ();
 	}
 
-	[Fact] [TestRespondersDisposed]
-	public void AbsoluteLayout_Layout ()
+	[Fact]
+	[TestRespondersDisposed]
+	public void AbsoluteLayout_LayoutSubviews ()
 	{
 		var superRect = new Rect (0, 0, 100, 100);
 		var super = new View (superRect, "super");
 		Assert.True (super.LayoutStyle == LayoutStyle.Absolute);
-		var v1 = new View () {
+		var v1 = new View {
 			X = 0,
 			Y = 0,
 			Width = 10,
 			Height = 10
 		};
-		// BUGBUG: v2 - This should be LayoutStyle.Absolute
-		Assert.True (v1.LayoutStyle == LayoutStyle.Computed);
+		Assert.True (v1.LayoutStyle == LayoutStyle.Absolute);
 
-		var v2 = new View () {
+		var v2 = new View {
 			X = 10,
 			Y = 10,
 			Width = 10,
 			Height = 10
 		};
-		// BUGBUG: v2 - This should be LayoutStyle.Absolute
-		Assert.True (v1.LayoutStyle == LayoutStyle.Computed);
+		Assert.True (v2.LayoutStyle == LayoutStyle.Absolute);
 
 		super.Add (v1, v2);
+		Assert.True (v1.LayoutStyle == LayoutStyle.Absolute);
+		Assert.True (v2.LayoutStyle == LayoutStyle.Absolute);
+
 		super.LayoutSubviews ();
 		Assert.Equal (new Rect (0, 0, 10, 10), v1.Frame);
 		Assert.Equal (new Rect (10, 10, 10, 10), v2.Frame);
 		super.Dispose ();
 	}
+
+	[Fact]
+	public void AbsoluteLayout_Setting_Bounds_Location_NotEmpty ()
+	{
+		// TODO: Should we enforce Bounds.X/Y == 0? The code currently ignores value.X/Y which is
+		// TODO: correct behavior, but is silent. Perhaps an exception?
+		var frame = new Rect (1, 2, 3, 4);
+		var newBounds = new Rect (10, 20, 30, 40);
+		var view = new View (frame);
+		view.Bounds = newBounds;
+		Assert.Equal (new Rect (0, 0, 30, 40), view.Bounds);
+		Assert.Equal (new Rect (1, 2, 30, 40), view.Frame);
+	}
+
+	[Fact]
+	public void AbsoluteLayout_Setting_Bounds_Sets_Frame ()
+	{
+		var frame = new Rect (1, 2, 3, 4);
+		var newBounds = new Rect (0, 0, 30, 40);
+
+		var v = new View (frame);
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
+
+		v.Bounds = newBounds;
+		Assert.True (v.LayoutStyle == LayoutStyle.Absolute);
+		Assert.Equal (newBounds, v.Bounds);
+		Assert.Equal (new Rect (1, 2, newBounds.Width, newBounds.Height), v.Frame);
+		Assert.Equal (new Rect (0, 0, newBounds.Width, newBounds.Height), v.Bounds);
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
+		Assert.Equal (Dim.Sized (30), v.Width);
+		Assert.Equal (Dim.Sized (40), v.Height);
+
+		newBounds = new Rect (0, 0, 3, 4);
+		v.Bounds = newBounds;
+		Assert.Equal (newBounds, v.Bounds);
+		Assert.Equal (new Rect (1, 2, newBounds.Width, newBounds.Height), v.Frame);
+		Assert.Equal (new Rect (0, 0, newBounds.Width, newBounds.Height), v.Bounds);
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
+		Assert.Equal (Dim.Sized (3), v.Width);
+		Assert.Equal (Dim.Sized (4), v.Height);
+
+		v.BorderStyle = LineStyle.Single;
+		// Bounds should shrink
+		Assert.Equal (new Rect (0, 0, 1, 2), v.Bounds);
+		// Frame should not change
+		Assert.Equal (new Rect (1, 2, 3, 4), v.Frame);
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
+		Assert.Equal (Dim.Sized (3), v.Width);
+		Assert.Equal (Dim.Sized (4), v.Height);
+
+		// Now set bounds bigger as before
+		newBounds = new Rect (0, 0, 3, 4);
+		v.Bounds = newBounds;
+		Assert.Equal (newBounds, v.Bounds);
+		// Frame grows because there's now a border
+		Assert.Equal (new Rect (1, 2, 5, 6), v.Frame);
+		Assert.Equal (new Rect (0, 0, newBounds.Width, newBounds.Height), v.Bounds);
+		Assert.Equal (Pos.At (1), v.X);
+		Assert.Equal (Pos.At (2), v.Y);
+		Assert.Equal (Dim.Sized (5), v.Width);
+		Assert.Equal (Dim.Sized (6), v.Height);
+	}
 }

UnitTests/View/Layout/AutoSizeTests.cs

@@ -1,838 +0,0 @@
-using System.Text;
-using System;
-using System.Collections.Generic;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Terminal.Gui.ViewTests {
-	public class AutoSizeTests {
-		readonly ITestOutputHelper output;
-
-		public AutoSizeTests (ITestOutputHelper output)
-		{
-			this.output = output;
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_GetAutoSize_Horizontal ()
-		{
-			var text = "text";
-			var view = new View () {
-				Text = text,
-				AutoSize = true
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			var size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length, 1), size);
-
-			view.Text = $"{text}\n{text}";
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length, 2), size);
-
-			view.Text = $"{text}\n{text}\n{text}+";
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length + 1, 3), size);
-
-			text = string.Empty;
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (0, 0), size);
-
-			text = "1";
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (1, 1), size);
-
-			text = "界";
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (2, 1), size);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_GetAutoSize_Vertical()
-		{
-			var text = "text";
-			var view = new View () {
-				Text = text,
-				TextDirection = TextDirection.TopBottom_LeftRight,
-				AutoSize = true
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			var size = view.GetAutoSize ();
-			Assert.Equal (new Size (1, text.Length), size);
-
-			view.Text = $"{text}\n{text}";
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (2, text.Length), size);
-
-			view.Text = $"{text}\n{text}\n{text}+";
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (3, text.Length + 1), size);
-
-			text = string.Empty;
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (0, 0), size);
-
-			text = "1";
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (1, 1), size);
-
-			text = "界";
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (2, 1), size);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_GetAutoSize_Left()
-		{
-			var text = "This is some text.";
-			var view = new View () {
-				Text = text,
-				TextAlignment = TextAlignment.Left,
-				AutoSize = true
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			var size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length, 1), size);
-
-			view.Text = $"{text}\n{text}";
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length, 2), size);
-
-			view.Text = $"{text}\n{text}\n{text}+";
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length + 1, 3), size);
-
-			text = string.Empty;
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (0, 0), size);
-
-			text = "1";
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (1, 1), size);
-
-			text = "界";
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (2, 1), size);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_GetAutoSize_Right ()
-		{
-			var text = "This is some text.";
-			var view = new View () {
-				Text = text,
-				TextAlignment = TextAlignment.Right,
-				AutoSize = true
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			var size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length, 1), size);
-
-			view.Text = $"{text}\n{text}";
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length, 2), size);
-
-			view.Text = $"{text}\n{text}\n{text}+";
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length + 1, 3), size);
-
-			text = string.Empty;
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (0, 0), size);
-
-			text = "1";
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (1, 1), size);
-
-			text = "界";
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (2, 1), size);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_GetAutoSize_Centered ()
-		{
-			var text = "This is some text.";
-			var view = new View () {
-				Text = text,
-				TextAlignment = TextAlignment.Centered,
-				AutoSize = true
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			var size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length, 1), size);
-
-			view.Text = $"{text}\n{text}";
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length, 2), size);
-
-			view.Text = $"{text}\n{text}\n{text}+";
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (text.Length + 1, 3), size);
-
-			text = string.Empty;
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (0, 0), size);
-
-			text = "1";
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (1, 1), size);
-
-			text = "界";
-			view.Text = text;
-			size = view.GetAutoSize ();
-			Assert.Equal (new Size (2, 1), size);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_False_View_IsEmpty_False_Return_Null_Lines ()
-		{
-			var text = "Views";
-			var view = new View () {
-				Width = Dim.Fill () - text.Length,
-				Height = 1,
-				Text = text
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			Assert.Equal (5, text.Length);
-			Assert.False (view.AutoSize);
-			Assert.Equal (new Rect (0, 0, 3, 1), view.Frame);
-			Assert.Equal (new Size (3, 1), view.TextFormatter.Size);
-			Assert.Equal (new List<string> () { "Vie" }, view.TextFormatter.Lines);
-			Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
-			Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
-			var expected = @"
-┌────────┐
-│Vie     │
-│        │
-└────────┘
-";
-
-			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-
-			text = "0123456789";
-			Assert.Equal (10, text.Length);
-			view.Width = Dim.Fill () - text.Length;
-			Application.Refresh ();
-
-			Assert.Equal (new Rect (0, 0, 0, 1), view.Frame);
-			Assert.Equal (new Size (0, 1), view.TextFormatter.Size);
-			Assert.Equal (new List<string> () { string.Empty }, view.TextFormatter.Lines);
-			expected = @"
-┌────────┐
-│        │
-│        │
-└────────┘
-";
-
-			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_False_View_IsEmpty_True_Minimum_Height ()
-		{
-			var text = "Views";
-			var view = new View () {
-				Width = Dim.Fill () - text.Length,
-				Text = text
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			Assert.Equal (5, text.Length);
-			Assert.False (view.AutoSize);
-			Assert.Equal (new Rect (0, 0, 3, 1), view.Frame);
-			Assert.Equal (new Size (3, 1), view.TextFormatter.Size);
-			Assert.Single (view.TextFormatter.Lines);
-			Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
-			Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
-			var expected = @"
-┌────────┐
-│Vie     │
-│        │
-└────────┘
-";
-
-			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-
-			text = "0123456789";
-			Assert.Equal (10, text.Length);
-			view.Width = Dim.Fill () - text.Length;
-			Application.Refresh ();
-
-			Assert.Equal (new Rect (0, 0, 0, 1), view.Frame);
-			Assert.Equal (new Size (0, 1), view.TextFormatter.Size);
-			var exception = Record.Exception (() => Assert.Equal (new List<string> () { string.Empty }, view.TextFormatter.Lines));
-			Assert.Null (exception);
-			expected = @"
-┌────────┐
-│        │
-│        │
-└────────┘
-";
-
-			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_True_Label_IsEmpty_False_Never_Return_Null_Lines ()
-		{
-			var text = "Label";
-			var label = new Label () {
-				Width = Dim.Fill () - text.Length,
-				Height = 1,
-				Text = text
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (label);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			Assert.Equal (5, text.Length);
-			Assert.True (label.AutoSize);
-			Assert.Equal (new Rect (0, 0, 5, 1), label.Frame);
-			Assert.Equal (new Size (5, 1), label.TextFormatter.Size);
-			Assert.Equal (new List<string> () { "Label" }, label.TextFormatter.Lines);
-			Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
-			Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
-			var expected = @"
-┌────────┐
-│Label   │
-│        │
-└────────┘
-";
-
-			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-
-			text = "0123456789";
-			Assert.Equal (10, text.Length);
-			label.Width = Dim.Fill () - text.Length;
-			Application.Refresh ();
-
-			Assert.True (label.AutoSize);
-			Assert.Equal (new Rect (0, 0, 5, 1), label.Frame);
-			Assert.Equal (new Size (5, 1), label.TextFormatter.Size);
-			Assert.Single (label.TextFormatter.Lines);
-			expected = @"
-┌────────┐
-│Label   │
-│        │
-└────────┘
-";
-
-			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_False_Label_IsEmpty_True_Return_Null_Lines ()
-		{
-			var text = "Label";
-			var label = new Label () {
-				Width = Dim.Fill () - text.Length,
-				Height = 1,
-				Text = text,
-				AutoSize = false
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (label);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			Assert.Equal (5, text.Length);
-			Assert.False (label.AutoSize);
-			Assert.Equal (new Rect (0, 0, 3, 1), label.Frame);
-			Assert.Equal (new Size (3, 1), label.TextFormatter.Size);
-			Assert.Equal (new List<string> () { "Lab" }, label.TextFormatter.Lines);
-			Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
-			Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
-			var expected = @"
-┌────────┐
-│Lab     │
-│        │
-└────────┘
-";
-
-			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-
-			text = "0123456789";
-			Assert.Equal (10, text.Length);
-			label.Width = Dim.Fill () - text.Length;
-			Application.Refresh ();
-
-			Assert.False (label.AutoSize);
-			Assert.Equal (new Rect (0, 0, 0, 1), label.Frame);
-			Assert.Equal (new Size (0, 1), label.TextFormatter.Size);
-			Assert.Equal (new List<string> { string.Empty }, label.TextFormatter.Lines);
-			expected = @"
-┌────────┐
-│        │
-│        │
-└────────┘
-";
-
-			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_True_Label_IsEmpty_False_Minimum_Height ()
-		{
-			var text = "Label";
-			var label = new Label () {
-				Width = Dim.Fill () - text.Length,
-				Text = text
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (label);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			Assert.Equal (5, text.Length);
-			Assert.True (label.AutoSize);
-			Assert.Equal (new Rect (0, 0, 5, 1), label.Frame);
-			Assert.Equal (new Size (5, 1), label.TextFormatter.Size);
-			Assert.Equal (new List<string> () { "Label" }, label.TextFormatter.Lines);
-			Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
-			Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
-			var expected = @"
-┌────────┐
-│Label   │
-│        │
-└────────┘
-";
-
-			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-
-			text = "0123456789";
-			Assert.Equal (10, text.Length);
-			label.Width = Dim.Fill () - text.Length;
-			Application.Refresh ();
-
-			Assert.Equal (new Rect (0, 0, 5, 1), label.Frame);
-			Assert.Equal (new Size (5, 1), label.TextFormatter.Size);
-			var exception = Record.Exception (() => Assert.Single (label.TextFormatter.Lines));
-			Assert.Null (exception);
-			expected = @"
-┌────────┐
-│Label   │
-│        │
-└────────┘
-";
-
-			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_False_Label_Height_Zero_Returns_Minimum_Height ()
-		{
-			var text = "Label";
-			var label = new Label () {
-				Width = Dim.Fill () - text.Length,
-				Text = text,
-				AutoSize = false
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (label);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
-
-			Assert.Equal (5, text.Length);
-			Assert.False (label.AutoSize);
-			Assert.Equal (new Rect (0, 0, 3, 1), label.Frame);
-			Assert.Equal (new Size (3, 1), label.TextFormatter.Size);
-			Assert.Single (label.TextFormatter.Lines);
-			Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
-			Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
-			var expected = @"
-┌────────┐
-│Lab     │
-│        │
-└────────┘
-";
-
-			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-
-			text = "0123456789";
-			Assert.Equal (10, text.Length);
-			label.Width = Dim.Fill () - text.Length;
-			Application.Refresh ();
-
-			Assert.Equal (new Rect (0, 0, 0, 1), label.Frame);
-			Assert.Equal (new Size (0, 1), label.TextFormatter.Size);
-			var exception = Record.Exception (() => Assert.Equal (new List<string> () { string.Empty }, label.TextFormatter.Lines));
-			Assert.Null (exception);
-			expected = @"
-┌────────┐
-│        │
-│        │
-└────────┘
-";
-
-			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 10, 4), pos);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_True_View_IsEmpty_False_Minimum_Width ()
-		{
-			var text = "Views";
-			var view = new View () {
-				TextDirection = TextDirection.TopBottom_LeftRight,
-				Height = Dim.Fill () - text.Length,
-				Text = text,
-				AutoSize = true
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (4, 10);
-
-			Assert.Equal (5, text.Length);
-			Assert.True (view.AutoSize);
-			Assert.Equal (new Rect (0, 0, 1, 5), view.Frame);
-			Assert.Equal (new Size (1, 5), view.TextFormatter.Size);
-			Assert.Equal (new List<string> () { "Views" }, view.TextFormatter.Lines);
-			Assert.Equal (new Rect (0, 0, 4, 10), win.Frame);
-			Assert.Equal (new Rect (0, 0, 4, 10), Application.Top.Frame);
-			var expected = @"
-┌──┐
-│V │
-│i │
-│e │
-│w │
-│s │
-│  │
-│  │
-│  │
-└──┘
-";
-
-			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 4, 10), pos);
-
-			text = "0123456789";
-			Assert.Equal (10, text.Length);
-			view.Height = Dim.Fill () - text.Length;
-			Application.Refresh ();
-
-			Assert.Equal (new Rect (0, 0, 1, 5), view.Frame);
-			Assert.Equal (new Size (1, 5), view.TextFormatter.Size);
-			var exception = Record.Exception (() => Assert.Single (view.TextFormatter.Lines));
-			Assert.Null (exception);
-			expected = @"
-┌──┐
-│V │
-│i │
-│e │
-│w │
-│s │
-│  │
-│  │
-│  │
-└──┘
-";
-
-			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 4, 10), pos);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_False_View_Width_Null_Returns_Host_Frame_Width ()
-		{
-			var text = "Views";
-			var view = new View () {
-				TextDirection = TextDirection.TopBottom_LeftRight,
-				Height = Dim.Fill () - text.Length,
-				Text = text
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (4, 10);
-
-			Assert.Equal (5, text.Length);
-			Assert.False (view.AutoSize);
-			Assert.Equal (new Rect (0, 0, 1, 3), view.Frame);
-			Assert.Equal (new Size (1, 3), view.TextFormatter.Size);
-			Assert.Single (view.TextFormatter.Lines);
-			Assert.Equal (new Rect (0, 0, 4, 10), win.Frame);
-			Assert.Equal (new Rect (0, 0, 4, 10), Application.Top.Frame);
-			var expected = @"
-┌──┐
-│V │
-│i │
-│e │
-│  │
-│  │
-│  │
-│  │
-│  │
-└──┘
-";
-
-			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 4, 10), pos);
-
-			text = "0123456789";
-			Assert.Equal (10, text.Length);
-			view.Height = Dim.Fill () - text.Length;
-			Application.Refresh ();
-
-			Assert.Equal (new Rect (0, 0, 1, 0), view.Frame);
-			Assert.Equal (new Size (1, 0), view.TextFormatter.Size);
-			var exception = Record.Exception (() => Assert.Equal (new List<string> () { string.Empty }, view.TextFormatter.Lines));
-			Assert.Null (exception);
-			expected = @"
-┌──┐
-│  │
-│  │
-│  │
-│  │
-│  │
-│  │
-│  │
-│  │
-└──┘
-";
-
-			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 4, 10), pos);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_True_View_IsEmpty_False_Minimum_Width_Wide_Rune ()
-		{
-			var text = "界View";
-			var view = new View () {
-				TextDirection = TextDirection.TopBottom_LeftRight,
-				Height = Dim.Fill () - text.Length,
-				Text = text,
-				AutoSize = true
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (4, 10);
-
-			Assert.Equal (5, text.Length);
-			Assert.True (view.AutoSize);
-			Assert.Equal (new Rect (0, 0, 2, 5), view.Frame);
-			Assert.Equal (new Size (2, 5), view.TextFormatter.Size);
-			Assert.Equal (new List<string> () { "界View" }, view.TextFormatter.Lines);
-			Assert.Equal (new Rect (0, 0, 4, 10), win.Frame);
-			Assert.Equal (new Rect (0, 0, 4, 10), Application.Top.Frame);
-			var expected = @"
-┌──┐
-│界│
-│V │
-│i │
-│e │
-│w │
-│  │
-│  │
-│  │
-└──┘
-";
-
-			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 4, 10), pos);
-
-			text = "0123456789";
-			Assert.Equal (10, text.Length);
-			view.Height = Dim.Fill () - text.Length;
-			Application.Refresh ();
-
-			Assert.Equal (new Rect (0, 0, 2, 5), view.Frame);
-			Assert.Equal (new Size (2, 5), view.TextFormatter.Size);
-			var exception = Record.Exception (() => Assert.Equal (new List<string> () { "界View" }, view.TextFormatter.Lines));
-			Assert.Null (exception);
-			expected = @"
-┌──┐
-│界│
-│V │
-│i │
-│e │
-│w │
-│  │
-│  │
-│  │
-└──┘
-";
-
-			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 4, 10), pos);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void AutoSize_False_View_Width_Zero_Returns_Minimum_Width_With_Wide_Rune ()
-		{
-			var text = "界View";
-			var view = new View () {
-				TextDirection = TextDirection.TopBottom_LeftRight,
-				Height = Dim.Fill () - text.Length,
-				Text = text
-			};
-			var win = new Window () {
-				Width = Dim.Fill (),
-				Height = Dim.Fill ()
-			};
-			win.Add (view);
-			Application.Top.Add (win);
-			Application.Begin (Application.Top);
-			((FakeDriver)Application.Driver).SetBufferSize (4, 10);
-
-			Assert.Equal (5, text.Length);
-			Assert.False (view.AutoSize);
-			Assert.Equal (new Rect (0, 0, 2, 3), view.Frame);
-			Assert.Equal (new Size (2, 3), view.TextFormatter.Size);
-			Assert.Single (view.TextFormatter.Lines);
-			Assert.Equal (new Rect (0, 0, 4, 10), win.Frame);
-			Assert.Equal (new Rect (0, 0, 4, 10), Application.Top.Frame);
-			var expected = @"
-┌──┐
-│界│
-│V │
-│i │
-│  │
-│  │
-│  │
-│  │
-│  │
-└──┘
-";
-
-			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 4, 10), pos);
-
-			text = "0123456789";
-			Assert.Equal (10, text.Length);
-			view.Height = Dim.Fill () - text.Length;
-			Application.Refresh ();
-
-			Assert.Equal (new Rect (0, 0, 2, 0), view.Frame);
-			Assert.Equal (new Size (2, 0), view.TextFormatter.Size);
-			var exception = Record.Exception (() => Assert.Equal (new List<string> () { string.Empty }, view.TextFormatter.Lines));
-			Assert.Null (exception);
-			expected = @"
-┌──┐
-│  │
-│  │
-│  │
-│  │
-│  │
-│  │
-│  │
-│  │
-└──┘
-";
-
-			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-			Assert.Equal (new Rect (0, 0, 4, 10), pos);
-		}
-	}
-}

UnitTests/View/Layout/CoordinateTests.cs

@@ -1,22 +1,15 @@
-using System;
-using System.Text;
-using Xunit;
+using Xunit;
 using Xunit.Abstractions;
 
-// Alias Console to MockConsole so we don't accidentally use Console
-using Console = Terminal.Gui.FakeConsole;
-
 namespace Terminal.Gui.ViewTests;
+
 /// <summary>
 /// Tests for view coordinate mapping (e.g. <see cref="View.ScreenToFrame"/> etc...).
 /// </summary>
 public class CoordinateTests {
 	readonly ITestOutputHelper _output;
 
-	public CoordinateTests (ITestOutputHelper output)
-	{
-		this._output = output;
-	}
+	public CoordinateTests (ITestOutputHelper output) => _output = output;
 
 	/// <summary>
 	/// Tests that screen to view mapping works correctly when the view has no superview and there are no Frames on the view.
@@ -32,7 +25,7 @@ public class CoordinateTests {
 	[InlineData (1, 1, 11, 11, 10, 10)] // it's ok for the view to return coordinates outside of its bounds
 	public void ScreenToView_NoSuper_NoFrames (int viewX, int viewY, int x, int y, int expectedX, int expectedY)
 	{
-		var view = new View () {
+		var view = new View {
 			X = viewX,
 			Y = viewY,
 			Width = 10,
@@ -58,7 +51,7 @@ public class CoordinateTests {
 	[InlineData (1, 1, 11, 11, 10, 10)] // it's ok for the view to return coordinates outside of its bounds
 	public void ScreenToView_NoSuper_HasFrames (int viewX, int viewY, int x, int y, int expectedX, int expectedY)
 	{
-		var view = new View () {
+		var view = new View {
 			X = viewX,
 			Y = viewY,
 			Width = 10,
@@ -85,13 +78,13 @@ public class CoordinateTests {
 	[InlineData (1, 1, 11, 11, 10, 10)] // it's ok for the view to return coordinates outside of its bounds
 	public void ScreenToView_SuperHasNoFrames (int viewX, int viewY, int x, int y, int expectedX, int expectedY)
 	{
-		var super = new View () {
+		var super = new View {
 			X = 0,
 			Y = 0,
 			Width = 10,
 			Height = 10
 		};
-		var view = new View () {
+		var view = new View {
 			X = viewX,
 			Y = viewY,
 			Width = 5,
@@ -118,14 +111,14 @@ public class CoordinateTests {
 	[InlineData (1, 1, 11, 11, 9, 9)] // it's ok for the view to return coordinates outside of its bounds
 	public void ScreenToView_SuperHasFrames (int viewX, int viewY, int x, int y, int expectedX, int expectedY)
 	{
-		var super = new View () {
+		var super = new View {
 			X = 0,
 			Y = 0,
 			Width = 10,
 			Height = 10,
 			BorderStyle = LineStyle.Single
 		};
-		var view = new View () {
+		var view = new View {
 			X = viewX,
 			Y = viewY,
 			Width = 5,
@@ -154,7 +147,7 @@ public class CoordinateTests {
 	[InlineData (1, 1, 11, 11, 10, 10)] // it's ok for the view to return coordinates outside of its bounds
 	public void ScreenToBounds_NoSuper_NoFrames (int viewX, int viewY, int x, int y, int expectedX, int expectedY)
 	{
-		var view = new View () {
+		var view = new View {
 			X = viewX,
 			Y = viewY,
 			Width = 10,
@@ -173,14 +166,14 @@ public class CoordinateTests {
 	[InlineData (0, 0, 0, 0, -1, -1)]
 	[InlineData (0, 0, 1, 1, 0, 0)]
 	[InlineData (0, 0, 9, 9, 8, 8)]
-	[InlineData (0, 0, 11, 11, 10, 10)] 
+	[InlineData (0, 0, 11, 11, 10, 10)]
 	[InlineData (1, 1, 0, 0, -2, -2)]
 	[InlineData (1, 1, 1, 1, -1, -1)]
 	[InlineData (1, 1, 9, 9, 7, 7)]
-	[InlineData (1, 1, 11, 11, 9, 9)] 
+	[InlineData (1, 1, 11, 11, 9, 9)]
 	public void ScreenToBounds_NoSuper_HasFrames (int viewX, int viewY, int x, int y, int expectedX, int expectedY)
 	{
-		var view = new View () {
+		var view = new View {
 			X = viewX,
 			Y = viewY,
 			Width = 10,
@@ -207,13 +200,13 @@ public class CoordinateTests {
 	[InlineData (1, 1, 11, 11, 10, 10)] // it's ok for the view to return coordinates outside of its bounds
 	public void ScreenToBounds_SuperHasNoFrames (int viewX, int viewY, int x, int y, int expectedX, int expectedY)
 	{
-		var super = new View () {
+		var super = new View {
 			X = 0,
 			Y = 0,
 			Width = 10,
 			Height = 10
 		};
-		var view = new View () {
+		var view = new View {
 			X = viewX,
 			Y = viewY,
 			Width = 5,
@@ -240,14 +233,14 @@ public class CoordinateTests {
 	[InlineData (1, 1, 11, 11, 9, 9)] // it's ok for the view to return coordinates outside of its bounds
 	public void ScreenToBounds_SuperHasFrames (int viewX, int viewY, int x, int y, int expectedX, int expectedY)
 	{
-		var super = new View () {
+		var super = new View {
 			X = 0,
 			Y = 0,
 			Width = 10,
 			Height = 10,
 			BorderStyle = LineStyle.Single
 		};
-		var view = new View () {
+		var view = new View {
 			X = viewX,
 			Y = viewY,
 			Width = 5,

UnitTests/View/Layout/PosTests.cs

@@ -22,7 +22,7 @@ public class PosTests {
 	[Fact]
 	public void AnchorEnd_SetsValue ()
 	{
-		int n = 0;
+		var n = 0;
 		var pos = Pos.AnchorEnd ();
 		Assert.Equal ($"AnchorEnd({n})", pos.ToString ());
 
@@ -34,8 +34,8 @@ public class PosTests {
 	[Fact]
 	public void AnchorEnd_Equal ()
 	{
-		int n1 = 0;
-		int n2 = 0;
+		var n1 = 0;
+		var n2 = 0;
 
 		var pos1 = Pos.AnchorEnd (n1);
 		var pos2 = Pos.AnchorEnd (n2);
@@ -47,13 +47,15 @@ public class PosTests {
 		Assert.NotEqual (pos1, pos2);
 	}
 
+	// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
+	// TODO: A new test that calls SetRelativeLayout directly is needed.
 	[Fact]
 	[AutoInitShutdown]
 	public void AnchorEnd_Equal_Inside_Window ()
 	{
-		int viewWidth = 10;
-		int viewHeight = 1;
-		var tv = new TextView () {
+		var viewWidth = 10;
+		var viewHeight = 1;
+		var tv = new TextView {
 			X = Pos.AnchorEnd (viewWidth),
 			Y = Pos.AnchorEnd (viewHeight),
 			Width = viewWidth,
@@ -74,13 +76,15 @@ public class PosTests {
 		Application.End (rs);
 	}
 
+	// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
+	// TODO: A new test that calls SetRelativeLayout directly is needed.
 	[Fact]
 	[AutoInitShutdown]
 	public void AnchorEnd_Equal_Inside_Window_With_MenuBar_And_StatusBar_On_Toplevel ()
 	{
-		int viewWidth = 10;
-		int viewHeight = 1;
-		var tv = new TextView () {
+		var viewWidth = 10;
+		var viewHeight = 1;
+		var tv = new TextView {
 			X = Pos.AnchorEnd (viewWidth),
 			Y = Pos.AnchorEnd (viewHeight),
 			Width = viewWidth,
@@ -106,212 +110,11 @@ public class PosTests {
 		Application.End (rs);
 	}
 
-	[Fact]
-	[AutoInitShutdown]
-	public void Bottom_Equal_Inside_Window ()
-	{
-		var win = new Window ();
-
-		var label = new Label ("This should be the last line.") {
-			ColorScheme = Colors.Menu,
-			Width = Dim.Fill (),
-			X = 0,
-			Y = Pos.Bottom (win) - 3 // two lines top and bottom borders more one line above the bottom border
-		};
-
-		win.Add (label);
-
-		var top = Application.Top;
-		top.Add (win);
-		var rs = 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 (0, 7, 38, 1), label.Frame);
-		string expected = @"
-┌──────────────────────────────────────┐
-│                                      │
-│                                      │
-│                                      │
-│                                      │
-│                                      │
-│                                      │
-│                                      │
-│This should be the last line.         │
-└──────────────────────────────────────┘
-";
-
-		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
-		Application.End (rs);
-	}
-
-	[Fact]
-	[AutoInitShutdown]
-	public void AnchorEnd_Better_Than_Bottom_Equal_Inside_Window ()
-	{
-		var win = new Window ();
-
-		var label = new Label ("This should be the last line.") {
-			ColorScheme = Colors.Menu,
-			Width = Dim.Fill (),
-			X = 0, // keep unit test focused; don't use Center here
-			Y = Pos.AnchorEnd (1)
-		};
-
-		win.Add (label);
-
-		var top = Application.Top;
-		top.Add (win);
-		var rs = Application.Begin (top);
-		((FakeDriver)Application.Driver).SetBufferSize (40, 10);
-
-		Assert.True (label.AutoSize);
-		Assert.Equal (29, label.Text.Length);
-		Assert.Equal (new Rect (0, 0, 40, 10), top.Frame);
-		Assert.Equal (new Rect (0, 0, 40, 10), win.Frame);
-		Assert.Equal (new Rect (0, 7, 38, 1), label.Frame);
-		string expected = @"
-┌──────────────────────────────────────┐
-│                                      │
-│                                      │
-│                                      │
-│                                      │
-│                                      │
-│                                      │
-│                                      │
-│This should be the last line.         │
-└──────────────────────────────────────┘
-";
-
-		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
-		Application.End (rs);
-	}
-
-	[Fact]
-	[AutoInitShutdown]
-	public void Bottom_Equal_Inside_Window_With_MenuBar_And_StatusBar_On_Toplevel ()
-	{
-		var win = new Window ();
-
-		var label = new Label ("This should be the last line.") {
-			ColorScheme = Colors.Menu,
-			Width = Dim.Fill (),
-			X = 0,
-			Y = Pos.Bottom (win) - 4 // two lines top and bottom borders more two lines above border
-		};
-
-		win.Add (label);
-
-		var menu = new MenuBar (new MenuBarItem [] { new ("Menu", "", null) });
-		var status = new StatusBar (new StatusItem [] { new (KeyCode.F1, "~F1~ Help", null) });
-		var top = Application.Top;
-		top.Add (win, menu, status);
-		var rs = Application.Begin (top);
-
-		Assert.True (label.AutoSize);
-		Assert.Equal (new Rect (0, 0, 80, 25), top.Frame);
-		Assert.Equal (new Rect (0, 0, 80, 1), menu.Frame);
-		Assert.Equal (new Rect (0, 24, 80, 1), status.Frame);
-		Assert.Equal (new Rect (0, 1, 80, 23), win.Frame);
-		Assert.Equal (new Rect (0, 20, 78, 1), label.Frame);
-		string expected = @"
- Menu                                                                           
-┌──────────────────────────────────────────────────────────────────────────────┐
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│This should be the last line.                                                 │
-└──────────────────────────────────────────────────────────────────────────────┘
- F1 Help                                                                        
-";
-
-		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
-		Application.End (rs);
-	}
-
-	[Fact]
-	[AutoInitShutdown]
-	public void AnchorEnd_Better_Than_Bottom_Equal_Inside_Window_With_MenuBar_And_StatusBar_On_Toplevel ()
-	{
-		var win = new Window ();
-
-		var label = new Label ("This should be the last line.") {
-			ColorScheme = Colors.Menu,
-			Width = Dim.Fill (),
-			X = 0,
-			Y = Pos.AnchorEnd (1)
-		};
-
-		win.Add (label);
-
-		var menu = new MenuBar (new MenuBarItem [] { new ("Menu", "", null) });
-		var status = new StatusBar (new StatusItem [] { new (KeyCode.F1, "~F1~ Help", null) });
-		var top = Application.Top;
-		top.Add (win, menu, status);
-		var rs = Application.Begin (top);
-
-		Assert.True (label.AutoSize);
-		Assert.Equal (new Rect (0, 0, 80, 25), top.Frame);
-		Assert.Equal (new Rect (0, 0, 80, 1), menu.Frame);
-		Assert.Equal (new Rect (0, 24, 80, 1), status.Frame);
-		Assert.Equal (new Rect (0, 1, 80, 23), win.Frame);
-		Assert.Equal (new Rect (0, 20, 78, 1), label.Frame);
-		string expected = @"
- Menu                                                                           
-┌──────────────────────────────────────────────────────────────────────────────┐
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│                                                                              │
-│This should be the last line.                                                 │
-└──────────────────────────────────────────────────────────────────────────────┘
- F1 Help                                                                        
-";
-
-		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
-		Application.End (rs);
-	}
-
 	[Fact]
 	public void AnchorEnd_Negative_Throws ()
 	{
 		Pos pos;
-		int n = -1;
+		var n = -1;
 		Assert.Throws<ArgumentException> (() => pos = Pos.AnchorEnd (n));
 	}
 
@@ -331,8 +134,8 @@ public class PosTests {
 	[Fact]
 	public void At_Equal ()
 	{
-		int n1 = 0;
-		int n2 = 0;
+		var n1 = 0;
+		var n2 = 0;
 
 		var pos1 = Pos.At (n1);
 		var pos2 = Pos.At (n2);
@@ -372,7 +175,7 @@ public class PosTests {
 	{
 		string side; // used in format string
 		var testRect = Rect.Empty;
-		int testInt = 0;
+		var testInt = 0;
 		Pos pos;
 
 		// Pos.Left
@@ -521,6 +324,8 @@ public class PosTests {
 #endif
 	}
 
+	// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
+	// TODO: A new test that calls SetRelativeLayout directly is needed.
 	// See: https://github.com/gui-cs/Terminal.Gui/issues/504
 	[Fact]
 	[TestRespondersDisposed]
@@ -533,7 +338,7 @@ public class PosTests {
 			Application.Iteration += (s, a) => {
 				Application.RequestStop ();
 			};
-			var win = new Window () {
+			var win = new Window {
 				X = 0,
 				Y = 0,
 				Width = Dim.Fill (),
@@ -671,39 +476,8 @@ public class PosTests {
 		Assert.Throws<ArgumentException> (() => pos = Pos.Percent (1000001));
 	}
 
-	[Fact]
-	public void ForceValidatePosDim_True_Pos_Validation_Throws_If_NewValue_Is_PosAbsolute_And_OldValue_Is_Another_Type ()
-	{
-		Application.Init (new FakeDriver ());
-
-		var t = Application.Top;
-
-		var w = new Window () {
-			X = Pos.Left (t) + 2,
-			Y = Pos.At (2)
-		};
-		var v = new View () {
-			X = Pos.Center (),
-			Y = Pos.Percent (10),
-			ValidatePosDim = true
-		};
-
-		w.Add (v);
-		t.Add (w);
-
-		t.Ready += (s, e) => {
-			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 += (s, a) => Application.RequestStop ();
-
-		Application.Run ();
-		Application.Shutdown ();
-	}
-
+	// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
+	// TODO: A new test that calls SetRelativeLayout directly is needed.
 	[Fact]
 	public void Pos_Validation_Do_Not_Throws_If_NewValue_Is_PosAbsolute_And_OldValue_Is_Null ()
 	{
@@ -726,85 +500,8 @@ public class PosTests {
 
 	}
 
-	[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 ());
-
-		var t = Application.Top;
-
-		var w = new Window () {
-			X = Pos.Left (t) + 2,
-			Y = Pos.At (2)
-		};
-		var v = new View () {
-			X = Pos.Center (),
-			Y = Pos.Percent (10)
-		};
-
-		w.Add (v);
-		t.Add (w);
-
-		t.Ready += (s, e) => {
-			v.LayoutStyle = LayoutStyle.Absolute;
-			Assert.Equal (2, v.X = 2);
-			Assert.Equal (2, v.Y = 2);
-		};
-
-		Application.Iteration += (s, a) => Application.RequestStop ();
-
-		Application.Run ();
-		Application.Shutdown ();
-	}
-
-	// DONE: Test PosCombine
-	// DONE: Test operators
-	// BUGBUG: v2 - This test is bogus. v1 and references it's superview's (f) superview (w). 
-	//[Fact]
-	//public void PosCombine_Do_Not_Throws ()
-	//{
-	//	Application.Init (new FakeDriver ());
-
-	//	var w = new Window () {
-	//		X = Pos.Left (Application.Top) + 2,
-	//		Y = Pos.Top (Application.Top) + 2
-	//	};
-	//	var f = new FrameView ();
-	//	var v1 = new View () {
-	//		X = Pos.Left (w) + 2,
-	//		Y = Pos.Top (w) + 2
-	//	};
-	//	var v2 = new View () {
-	//		X = Pos.Left (v1) + 2,
-	//		Y = Pos.Top (v1) + 2
-	//	};
-
-	//	f.Add (v1, v2);
-	//	w.Add (f);
-	//	Application.Top.Add (w);
-
-	//	f.X = Pos.X (Application.Top) + Pos.X (v2) - Pos.X (v1);
-	//	f.Y = Pos.Y (Application.Top) + Pos.Y (v2) - Pos.Y (v1);
-
-	//	Application.Top.LayoutComplete += (s, e) => {
-	//		Assert.Equal (0, Application.Top.Frame.X);
-	//		Assert.Equal (0, Application.Top.Frame.Y);
-	//		Assert.Equal (2, w.Frame.X);
-	//		Assert.Equal (2, w.Frame.Y);
-	//		Assert.Equal (2, f.Frame.X);
-	//		Assert.Equal (2, f.Frame.Y);
-	//		Assert.Equal (4, v1.Frame.X);
-	//		Assert.Equal (4, v1.Frame.Y);
-	//		Assert.Equal (6, v2.Frame.X);
-	//		Assert.Equal (6, v2.Frame.Y);
-	//	};
-
-	//	Application.Iteration += (s, a) => Application.RequestStop ();
-
-	//	Application.Run ();
-	//	Application.Shutdown ();
-	//}
-
+	// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
+	// TODO: A new test that calls SetRelativeLayout directly is needed.
 	[Fact]
 	[TestRespondersDisposed]
 	public void PosCombine_Will_Throws ()
@@ -813,16 +510,16 @@ public class PosTests {
 
 		var t = Application.Top;
 
-		var w = new Window () {
+		var w = new Window {
 			X = Pos.Left (t) + 2,
 			Y = Pos.Top (t) + 2
 		};
 		var f = new FrameView ();
-		var v1 = new View () {
+		var v1 = new View {
 			X = Pos.Left (w) + 2,
 			Y = Pos.Top (w) + 2
 		};
-		var v2 = new View () {
+		var v2 = new View {
 			X = Pos.Left (v1) + 2,
 			Y = Pos.Top (v1) + 2
 		};
@@ -840,6 +537,8 @@ public class PosTests {
 		v2.Dispose ();
 	}
 
+	// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
+	// TODO: A new test that calls SetRelativeLayout directly is needed.
 	[Fact]
 	[TestRespondersDisposed]
 	public void Pos_Add_Operator ()
@@ -848,9 +547,9 @@ public class PosTests {
 
 		var top = Application.Top;
 
-		var view = new View () { X = 0, Y = 0, Width = 20, Height = 20 };
-		var field = new TextField () { X = 0, Y = 0, Width = 20 };
-		int count = 0;
+		var view = new View { X = 0, Y = 0, Width = 20, Height = 20 };
+		var field = new TextField { X = 0, Y = 0, Width = 20 };
+		var count = 0;
 
 		field.KeyDown += (s, k) => {
 			if (k.KeyCode == KeyCode.Enter) {
@@ -889,6 +588,8 @@ public class PosTests {
 		Application.Shutdown ();
 	}
 
+	// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
+	// TODO: A new test that calls SetRelativeLayout directly is needed.
 	[Fact]
 	[TestRespondersDisposed]
 	public void Pos_Subtract_Operator ()
@@ -897,12 +598,12 @@ public class PosTests {
 
 		var top = Application.Top;
 
-		var view = new View () { X = 0, Y = 0, Width = 20, Height = 20 };
-		var field = new TextField () { X = 0, Y = 0, Width = 20 };
-		int count = 20;
+		var view = new View { X = 0, Y = 0, Width = 20, Height = 20 };
+		var field = new TextField { X = 0, Y = 0, Width = 20 };
+		var count = 20;
 		var listLabels = new List<Label> ();
 
-		for (int i = 0; i < count; i++) {
+		for (var i = 0; i < count; i++) {
 			field.Text = $"Label {i}";
 			var label = new Label (field.Text) { X = 0, Y = field.Y, Width = 20 };
 			view.Add (label);
@@ -993,7 +694,7 @@ public class PosTests {
 	[Fact]
 	public void Function_SetsValue ()
 	{
-		string text = "Test";
+		var text = "Test";
 		var pos = Pos.Function (() => text.Length);
 		Assert.Equal ("PosFunc(4)", pos.ToString ());
 
@@ -1019,6 +720,8 @@ public class PosTests {
 		Assert.NotEqual (pos1, pos2);
 	}
 
+	// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
+	// TODO: A new test that calls SetRelativeLayout directly is needed.
 	[Theory]
 	[AutoInitShutdown]
 	[InlineData (true)]
@@ -1053,6 +756,8 @@ public class PosTests {
 		}
 	}
 
+	// TODO: This actually a SetRelativeLayout/LayoutSubViews test and should be moved
+	// TODO: A new test that calls SetRelativeLayout directly is needed.
 	[Fact]
 	public void PosCombine_Referencing_Same_View ()
 	{
@@ -1086,7 +791,7 @@ public class PosTests {
 	[Fact]
 	public void DoNotReturnPosCombine ()
 	{
-		var v = new View () { Id = "V" };
+		var v = new View { Id = "V" };
 
 		var pos = Pos.Left (v);
 		Assert.Equal (
@@ -1118,5 +823,5 @@ public class PosTests {
 			"View(side=bottom,target=View(V)(0,0,0,0))",
 			pos.ToString ());
 	}
-}	
 
+}

UnitTests/View/Layout/SetRelativeLayoutTests.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Text;
-using Xunit;
+using Xunit;
 using Xunit.Abstractions;
-using static Terminal.Gui.SpinnerStyle;
 
 namespace Terminal.Gui.ViewTests;
 
@@ -12,138 +9,49 @@ public class SetRelativeLayoutTests {
 	public SetRelativeLayoutTests (ITestOutputHelper output) => _output = output;
 
 	[Fact]
-	public void Null_Pos_Is_Same_As_PosAbsolute0 ()
+	public void ComputedPosDim_StayComputed ()
 	{
-		var view = new View () {
-			X = null,
-			Y = null,
-		};
-
-		// Default layout style is Computed
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.Null (view.X);
-		Assert.Null (view.Y);
-
-		view.BeginInit(); view.EndInit();
-
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.Null (view.X);
-		Assert.Null (view.Y);
-
-		view.SetRelativeLayout (new Rect (5, 5, 10, 10));
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.Null (view.X);
-		Assert.Null (view.Y);
-
-		Assert.Equal (0, view.Frame.X);
-		Assert.Equal (0, view.Frame.Y);
-	}
-
-	[Theory]
-	[InlineData (1, 1)]
-	[InlineData (0, 0)]
-	public void NonNull_Pos (int pos, int expectedPos)
-	{
-		var view = new View () {
-			X = pos,
-			Y = pos,
+		var screen = new Rect (0, 0, 10, 15);
+		var view = new View {
+			X = 1,
+			Y = 2,
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
 		};
 
-		// Default layout style is Computed
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.NotNull (view.X);
-		Assert.NotNull (view.Y);
-
-		view.BeginInit (); view.EndInit ();
-
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.NotNull (view.X);
-		Assert.NotNull (view.Y);
-
-		view.SetRelativeLayout (new Rect (5, 5, 10, 10));
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.NotNull (view.X);
-		Assert.NotNull (view.Y);
-
-		Assert.Equal (expectedPos, view.Frame.X);
-		Assert.Equal (expectedPos, view.Frame.Y);
+		Assert.Equal ("Absolute(1)", view.X.ToString ());
+		Assert.Equal ("Absolute(2)", view.Y.ToString ());
+		Assert.Equal ("Fill(0)", view.Width.ToString ());
+		Assert.Equal ("Fill(0)", view.Height.ToString ());
+		view.SetRelativeLayout (screen);
+		Assert.Equal ("Fill(0)", view.Width.ToString ());
+		Assert.Equal ("Fill(0)", view.Height.ToString ());
 	}
 
 	[Fact]
-	public void Null_Dim_Is_Same_As_DimFill0 ()
+	public void AbsolutePosDim_DontChange ()
 	{
-		var view = new View () {
-			Width = null,
-			Height = null,
-		};
-
-		// Default layout style is Computed
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.Null (view.Width);
-		Assert.Null (view.Height);
-		view.BeginInit (); view.EndInit ();
-
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.Null (view.Width);
-		Assert.Null (view.Height);
-
-		view.SetRelativeLayout (new Rect (5, 5, 10, 10));
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.Null (view.Width);
-		Assert.Null (view.Height);
-		
-		Assert.Equal (0, view.Frame.X);
-		Assert.Equal (0, view.Frame.Y);
-
-		Assert.Equal (10, view.Frame.Width);
-		Assert.Equal (10, view.Frame.Height);
-
-		view.Width = Dim.Fill (0);
-		view.Height = Dim.Fill (0);
-		view.SetRelativeLayout (new Rect (5, 5, 10, 10));
-		Assert.Equal (10, view.Frame.Width);
-		Assert.Equal (10, view.Frame.Height);
-
-	}
-
-
-	[Theory]
-	[InlineData(1, 1)]
-	[InlineData (0, 0)]
-	public void NonNull_Dim (int dim, int expectedDim)
-	{
-		var view = new View () {
-			Width = dim,
-			Height = dim,
+		var screen = new Rect (0, 0, 10, 15);
+		var view = new View {
+			X = 1, // outside of screen +10
+			Y = 2, // outside of screen -10
+			Width = 3,
+			Height = 4
 		};
 
-		// Default layout style is Computed
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.NotNull (view.Width);
-		Assert.NotNull (view.Height);
-		view.BeginInit (); view.EndInit ();
-
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.NotNull (view.Width);
-		Assert.NotNull (view.Height);
-
-		view.SetRelativeLayout (new Rect (5, 5, 10, 10));
-		Assert.Equal (LayoutStyle.Computed, view.LayoutStyle);
-		Assert.NotNull (view.Width);
-		Assert.NotNull (view.Height);
-		
-		Assert.Equal (0, view.Frame.X);
-		Assert.Equal (0, view.Frame.Y);
-		// BUGBUG: Width == null is same as Dim.Absolute (0) (or should be). Thus this is a bug.
-		Assert.Equal (expectedDim, view.Frame.Width);
-		Assert.Equal (expectedDim, view.Frame.Height);
+		// Layout is Absolute. So the X and Y are not changed.
+		view.SetRelativeLayout (screen);
+		Assert.Equal (1, view.Frame.X);
+		Assert.Equal (2, view.Frame.Y);
+		Assert.Equal (3, view.Frame.Width);
+		Assert.Equal (4, view.Frame.Height);
 	}
 
 	[Fact]
 	public void Fill_Pos_Within_Bounds ()
 	{
 		var screen = new Rect (0, 0, 80, 25);
-		var view = new View () {
+		var view = new View {
 			X = 1,
 			Y = 1,
 			Width = 5,
@@ -187,21 +95,22 @@ public class SetRelativeLayoutTests {
 		view.SetRelativeLayout (screen);
 		Assert.Equal (80, view.Frame.X);
 		Assert.Equal (1, view.Frame.Y);
-		Assert.Equal (0, view.Frame.Width);  // proof (80 - 80)
+		Assert.Equal (0, view.Frame.Width); // proof (80 - 80)
 		Assert.Equal (24, view.Frame.Height);
 	}
 
 	[Fact]
-	public void FIll_Pos_Outside_Bounds ()
+	public void Fill_Pos_Outside_Bounds ()
 	{
 		var screen = new Rect (0, 0, 80, 25);
-		var view = new View () {
-			X = 90,  // outside of screen +10
-			Y = -10,   // outside of screen -10
+		var view = new View {
+			X = 90, // outside of screen +10
+			Y = -10, // outside of screen -10
 			Width = 15,
 			Height = 15
 		};
 
+		// Layout is Absolute. So the X and Y are not changed.
 		view.SetRelativeLayout (screen);
 		Assert.Equal (90, view.Frame.X);
 		Assert.Equal (-10, view.Frame.Y);
@@ -222,8 +131,8 @@ public class SetRelativeLayoutTests {
 		view.SetRelativeLayout (screen);
 		Assert.Equal (90, view.Frame.X);
 		Assert.Equal (-10, view.Frame.Y);
-		Assert.Equal (0, view.Frame.Width);    // proof: 15x15 view is placed beyond right side of screen, so fill width is 0
-		Assert.Equal (35, view.Frame.Height);  // proof: 15x15 view is placed beyond top of screen 10 rows, screen is 25 rows. so fill height is 25 + 10 = 35
+		Assert.Equal (0, view.Frame.Width); // proof: 15x15 view is placed beyond right side of screen, so fill width is 0
+		Assert.Equal (35, view.Frame.Height); // proof: 15x15 view is placed beyond top of screen 10 rows, screen is 25 rows. so fill height is 25 + 10 = 35
 	}
 
 	[Fact]
@@ -234,9 +143,9 @@ public class SetRelativeLayoutTests {
 		// because in v1 Pos.Center was broken in this regard!
 
 		var screen = new Rect (0, 0, 80, 25);
-		var view = new View () {
-			X = Pos.Center () - 41,  // -2 off left edge of screen
-			Y = Pos.Center () - 13,  // -1 off top edge of screen
+		var view = new View {
+			X = Pos.Center () - 41, // -2 off left edge of screen
+			Y = Pos.Center () - 13, // -1 off top edge of screen
 			Width = 1,
 			Height = 1
 		};
@@ -253,28 +162,28 @@ public class SetRelativeLayoutTests {
 		Assert.Equal (80, view.Frame.Width);
 		Assert.Equal (25, view.Frame.Height);
 
-		view.Width = Dim.Fill (); 
+		view.Width = Dim.Fill ();
 		view.Height = Dim.Fill ();
 		view.SetRelativeLayout (screen);
-		Assert.Equal (-41, view.Frame.X); 
+		Assert.Equal (-41, view.Frame.X);
 		Assert.Equal (-13, view.Frame.Y);
-		Assert.Equal (121, view.Frame.Width);  // 121 = screen.Width - (-Center - 41)
+		Assert.Equal (121, view.Frame.Width); // 121 = screen.Width - (-Center - 41)
 		Assert.Equal (38, view.Frame.Height);
 	}
 
 	[Fact]
-	public void FIll_And_PosCenter ()
+	public void Fill_And_PosCenter ()
 	{
 		var screen = new Rect (0, 0, 80, 25);
-		var view = new View () {
+		var view = new View {
 			X = Pos.Center (),
 			Y = Pos.Center (),
-			Width = Dim.Fill(),
-			Height = Dim.Fill()
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
 		};
 
 		view.SetRelativeLayout (screen);
-		Assert.Equal (0, view.Frame.X); 
+		Assert.Equal (0, view.Frame.X);
 		Assert.Equal (0, view.Frame.Y);
 		Assert.Equal (80, view.Frame.Width);
 		Assert.Equal (25, view.Frame.Height);
@@ -304,14 +213,14 @@ public class SetRelativeLayoutTests {
 		view.SetRelativeLayout (screen);
 		Assert.Equal (-1, view.Frame.X);
 		Assert.Equal (0, view.Frame.Y);
-		Assert.Equal (81, view.Frame.Width); 
+		Assert.Equal (81, view.Frame.Width);
 		Assert.Equal (25, view.Frame.Height);
 
 		view.X = Pos.Center () - 2; // Fill means all the way to right. So width will be 82. (dim gets calc'd before pos).
 		view.SetRelativeLayout (screen);
 		Assert.Equal (-2, view.Frame.X);
 		Assert.Equal (0, view.Frame.Y);
-		Assert.Equal (82, view.Frame.Width); 
+		Assert.Equal (82, view.Frame.Width);
 		Assert.Equal (25, view.Frame.Height);
 
 		view.X = Pos.Center () - 3; // Fill means all the way to right. So width will be 83. (dim gets calc'd before pos).
@@ -329,13 +238,14 @@ public class SetRelativeLayoutTests {
 		Assert.Equal (25, view.Frame.Height);
 
 	}
+
 	[Fact]
 	public void PosCombine_PosCenter_Plus_Absolute ()
 	{
 		var screen = new Rect (0, 0, 80, 25);
-		var view = new View () {
-			X = Pos.Center () + 41,  // ((80 / 2) - (5 / 2)) + 41 = (40 - 3 + 41) = 78
-			Y = Pos.Center () + 13,  // ((25 / 2) - (4 / 2)) + 13 = (12 - 2 + 13) = 23
+		var view = new View {
+			X = Pos.Center () + 41, // ((80 / 2) - (5 / 2)) + 41 = (40 - 3 + 41) = 78
+			Y = Pos.Center () + 13, // ((25 / 2) - (4 / 2)) + 13 = (12 - 2 + 13) = 23
 			Width = 5,
 			Height = 4
 		};
@@ -345,16 +255,17 @@ public class SetRelativeLayoutTests {
 		Assert.Equal (23, view.Frame.Y);
 	}
 
-	[Fact] [TestRespondersDisposed]
+	[Fact]
+	[TestRespondersDisposed]
 	public void PosCombine_Plus_Absolute ()
 	{
-		var superView = new View () {
+		var superView = new View {
 			AutoSize = false,
 			Width = 10,
 			Height = 10
 		};
 
-		var testView = new View () {
+		var testView = new View {
 			AutoSize = false,
 			X = Pos.Center (),
 			Y = Pos.Center (),
@@ -366,7 +277,7 @@ public class SetRelativeLayoutTests {
 		Assert.Equal (4, testView.Frame.X);
 		Assert.Equal (4, testView.Frame.Y);
 
-		testView = new View () {
+		testView = new View {
 			AutoSize = false,
 			X = Pos.Center () + 1, // ((10 / 2) - (1 / 2)) + 1 = 5 - 1 + 1 = 5
 			Y = Pos.Center () + 1,
@@ -378,7 +289,7 @@ public class SetRelativeLayoutTests {
 		Assert.Equal (5, testView.Frame.X);
 		Assert.Equal (5, testView.Frame.Y);
 
-		testView = new View () {
+		testView = new View {
 			AutoSize = false,
 			X = 1 + Pos.Center (),
 			Y = 1 + Pos.Center (),
@@ -390,7 +301,7 @@ public class SetRelativeLayoutTests {
 		Assert.Equal (5, testView.Frame.X);
 		Assert.Equal (5, testView.Frame.Y);
 
-		testView = new View () {
+		testView = new View {
 			AutoSize = false,
 			X = 1 + Pos.Percent (50),
 			Y = Pos.Percent (50) + 1,
@@ -402,7 +313,7 @@ public class SetRelativeLayoutTests {
 		Assert.Equal (6, testView.Frame.X);
 		Assert.Equal (6, testView.Frame.Y);
 
-		testView = new View () {
+		testView = new View {
 			AutoSize = false,
 			X = Pos.Percent (10) + Pos.Percent (40),
 			Y = Pos.Percent (10) + Pos.Percent (40),
@@ -414,7 +325,7 @@ public class SetRelativeLayoutTests {
 		Assert.Equal (5, testView.Frame.X);
 		Assert.Equal (5, testView.Frame.Y);
 
-		testView = new View () {
+		testView = new View {
 			AutoSize = false,
 			X = 1 + Pos.Percent (10) + Pos.Percent (40) - 1,
 			Y = 5 + Pos.Percent (10) + Pos.Percent (40) - 5,
@@ -426,7 +337,7 @@ public class SetRelativeLayoutTests {
 		Assert.Equal (5, testView.Frame.X);
 		Assert.Equal (5, testView.Frame.Y);
 
-		testView = new View () {
+		testView = new View {
 			AutoSize = false,
 			X = Pos.Left (testView),
 			Y = Pos.Left (testView),
@@ -438,7 +349,7 @@ public class SetRelativeLayoutTests {
 		Assert.Equal (5, testView.Frame.X);
 		Assert.Equal (5, testView.Frame.Y);
 
-		testView = new View () {
+		testView = new View {
 			AutoSize = false,
 			X = 1 + Pos.Left (testView),
 			Y = Pos.Top (testView) + 1,
@@ -453,4 +364,37 @@ public class SetRelativeLayoutTests {
 		superView.Dispose ();
 
 	}
+
+
+	[Fact]
+	public void PosDimFunction ()
+	{
+		var screen = new Rect (0, 0, 30, 1);
+		var view = new View ("abc");
+		view.X = Pos.AnchorEnd () - Pos.Function (GetViewWidth);
+
+		int GetViewWidth ()
+		{
+			return view.Frame.Width;
+		}
+
+		// view will be 3 chars wide. It's X will be 27 (30 - 3).
+		view.SetRelativeLayout (screen);
+		Assert.Equal (27, view.Frame.X);
+		Assert.Equal (0, view.Frame.Y);
+		Assert.Equal (3, view.Frame.Width);
+		Assert.Equal (1, view.Frame.Height);
+
+		var tf = new TextField ("01234567890123456789");
+		tf.Width = Dim.Fill (1) - Dim.Function (GetViewWidth);
+
+		// tf will fill the screen minus 1 minus the width of view (3).
+		// so it's width will be 26 (30 - 1 - 3).
+		tf.SetRelativeLayout (screen);
+		Assert.Equal (0, tf.Frame.X);
+		Assert.Equal (0, tf.Frame.Y);
+		Assert.Equal (26, tf.Frame.Width);
+		Assert.Equal (1, tf.Frame.Height);
+
+	}
 }

UnitTests/View/NavigationTests.cs

@@ -1001,7 +1001,7 @@ namespace Terminal.Gui.ViewTests {
 		{
 			// Arrange
 			Application.Init ();
-			using var top = Toplevel.Create ();
+			using var top = new Toplevel ();
 			using var view = new View (
 				x: 0,
 				y: 1,

UnitTests/View/Text/AutoSizeTextTests.cs

@@ -0,0 +1,2642 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Terminal.Gui.ViewTests;
+
+/// <summary>
+/// Tests of the  <see cref="View.AutoSize"/> property which auto sizes Views based on <see cref="Text"/>.
+/// </summary>
+public class AutoSizeTextTests {
+	readonly ITestOutputHelper _output;
+
+	readonly string [] expecteds = new string [21] {
+		@"
+┌────────────────────┐
+│View with long text │
+│                    │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 0             │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 1             │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 2             │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 3             │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 4             │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 5             │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 6             │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 7             │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 8             │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 9             │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 10            │
+│Label 10            │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 10            │
+│Label 11            │
+│Label 11            │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 10            │
+│Label 11            │
+│Label 12            │
+│Label 12            │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 10            │
+│Label 11            │
+│Label 12            │
+│Label 13            │
+│Label 13            │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 10            │
+│Label 11            │
+│Label 12            │
+│Label 13            │
+│Label 14            │
+│Label 14            │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 10            │
+│Label 11            │
+│Label 12            │
+│Label 13            │
+│Label 14            │
+│Label 15            │
+│Label 15            │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 10            │
+│Label 11            │
+│Label 12            │
+│Label 13            │
+│Label 14            │
+│Label 15            │
+│Label 16            │
+│Label 16            │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 10            │
+│Label 11            │
+│Label 12            │
+│Label 13            │
+│Label 14            │
+│Label 15            │
+│Label 16            │
+│Label 17            │
+│Label 17            │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 10            │
+│Label 11            │
+│Label 12            │
+│Label 13            │
+│Label 14            │
+│Label 15            │
+│Label 16            │
+│Label 17            │
+│Label 18            │
+│Label 18            │
+└────────────────────┘",
+		@"
+┌────────────────────┐
+│View with long text │
+│Label 0             │
+│Label 1             │
+│Label 2             │
+│Label 3             │
+│Label 4             │
+│Label 5             │
+│Label 6             │
+│Label 7             │
+│Label 8             │
+│Label 9             │
+│Label 10            │
+│Label 11            │
+│Label 12            │
+│Label 13            │
+│Label 14            │
+│Label 15            │
+│Label 16            │
+│Label 17            │
+│Label 18            │
+│Label 19            │
+│Label 19            │
+└────────────────────┘"
+	};
+
+	public AutoSizeTextTests (ITestOutputHelper output) => _output = output;
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_GetAutoSize_Horizontal ()
+	{
+		var text = "text";
+		var view = new View {
+			Text = text,
+			AutoSize = true
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		var size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length, 1), size);
+
+		view.Text = $"{text}\n{text}";
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length, 2), size);
+
+		view.Text = $"{text}\n{text}\n{text}+";
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length + 1, 3), size);
+
+		text = string.Empty;
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (0, 0), size);
+
+		text = "1";
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (1, 1), size);
+
+		text = "界";
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (2, 1), size);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_GetAutoSize_Vertical ()
+	{
+		var text = "text";
+		var view = new View {
+			Text = text,
+			TextDirection = TextDirection.TopBottom_LeftRight,
+			AutoSize = true
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		var size = view.GetAutoSize ();
+		Assert.Equal (new Size (1, text.Length), size);
+
+		view.Text = $"{text}\n{text}";
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (2, text.Length), size);
+
+		view.Text = $"{text}\n{text}\n{text}+";
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (3, text.Length + 1), size);
+
+		text = string.Empty;
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (0, 0), size);
+
+		text = "1";
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (1, 1), size);
+
+		text = "界";
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (2, 1), size);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_GetAutoSize_Left ()
+	{
+		var text = "This is some text.";
+		var view = new View {
+			Text = text,
+			TextAlignment = TextAlignment.Left,
+			AutoSize = true
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		var size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length, 1), size);
+
+		view.Text = $"{text}\n{text}";
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length, 2), size);
+
+		view.Text = $"{text}\n{text}\n{text}+";
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length + 1, 3), size);
+
+		text = string.Empty;
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (0, 0), size);
+
+		text = "1";
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (1, 1), size);
+
+		text = "界";
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (2, 1), size);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_GetAutoSize_Right ()
+	{
+		var text = "This is some text.";
+		var view = new View {
+			Text = text,
+			TextAlignment = TextAlignment.Right,
+			AutoSize = true
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		var size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length, 1), size);
+
+		view.Text = $"{text}\n{text}";
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length, 2), size);
+
+		view.Text = $"{text}\n{text}\n{text}+";
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length + 1, 3), size);
+
+		text = string.Empty;
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (0, 0), size);
+
+		text = "1";
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (1, 1), size);
+
+		text = "界";
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (2, 1), size);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_GetAutoSize_Centered ()
+	{
+		var text = "This is some text.";
+		var view = new View {
+			Text = text,
+			TextAlignment = TextAlignment.Centered,
+			AutoSize = true
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		var size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length, 1), size);
+
+		view.Text = $"{text}\n{text}";
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length, 2), size);
+
+		view.Text = $"{text}\n{text}\n{text}+";
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (text.Length + 1, 3), size);
+
+		text = string.Empty;
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (0, 0), size);
+
+		text = "1";
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (1, 1), size);
+
+		text = "界";
+		view.Text = text;
+		size = view.GetAutoSize ();
+		Assert.Equal (new Size (2, 1), size);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_True_Label_IsEmpty_False_Never_Return_Null_Lines ()
+	{
+		var text = "Label";
+		var label = new Label {
+			Width = Dim.Fill () - text.Length,
+			Height = 1,
+			Text = text
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (label);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		Assert.Equal (5, text.Length);
+		Assert.True (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 5, 1), label.Frame);
+		Assert.Equal (new Size (5, 1), label.TextFormatter.Size);
+		Assert.Equal (new List<string> { "Label" }, label.TextFormatter.Lines);
+		Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
+		Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
+		var expected = @"
+┌────────┐
+│Label   │
+│        │
+└────────┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+
+		text = "0123456789";
+		Assert.Equal (10, text.Length);
+		label.Width = Dim.Fill () - text.Length;
+		Application.Refresh ();
+
+		Assert.True (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 5, 1), label.Frame);
+		Assert.Equal (new Size (5, 1), label.TextFormatter.Size);
+		Assert.Single (label.TextFormatter.Lines);
+		expected = @"
+┌────────┐
+│Label   │
+│        │
+└────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_True_Label_IsEmpty_False_Minimum_Height ()
+	{
+		var text = "Label";
+		var label = new Label {
+			Width = Dim.Fill () - text.Length,
+			Text = text
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (label);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		Assert.Equal (5, text.Length);
+		Assert.True (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 5, 1), label.Frame);
+		Assert.Equal (new Size (5, 1), label.TextFormatter.Size);
+		Assert.Equal (new List<string> { "Label" }, label.TextFormatter.Lines);
+		Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
+		Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
+		var expected = @"
+┌────────┐
+│Label   │
+│        │
+└────────┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+
+		text = "0123456789";
+		Assert.Equal (10, text.Length);
+		label.Width = Dim.Fill () - text.Length;
+		Application.Refresh ();
+
+		Assert.Equal (new Rect (0, 0, 5, 1), label.Frame);
+		Assert.Equal (new Size (5, 1), label.TextFormatter.Size);
+		var exception = Record.Exception (() => Assert.Single (label.TextFormatter.Lines));
+		Assert.Null (exception);
+		expected = @"
+┌────────┐
+│Label   │
+│        │
+└────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_True_View_IsEmpty_False_Minimum_Width ()
+	{
+		var text = "Views";
+		var view = new View {
+			TextDirection = TextDirection.TopBottom_LeftRight,
+			Height = Dim.Fill () - text.Length,
+			Text = text,
+			AutoSize = true
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (4, 10);
+
+		Assert.Equal (5, text.Length);
+		Assert.True (view.AutoSize);
+		Assert.Equal (new Rect (0, 0, 1, 5), view.Frame);
+		Assert.Equal (new Size (1, 5), view.TextFormatter.Size);
+		Assert.Equal (new List<string> { "Views" }, view.TextFormatter.Lines);
+		Assert.Equal (new Rect (0, 0, 4, 10), win.Frame);
+		Assert.Equal (new Rect (0, 0, 4, 10), Application.Top.Frame);
+		var expected = @"
+┌──┐
+│V │
+│i │
+│e │
+│w │
+│s │
+│  │
+│  │
+│  │
+└──┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 4, 10), pos);
+
+		text = "0123456789";
+		Assert.Equal (10, text.Length);
+		view.Height = Dim.Fill () - text.Length;
+		Application.Refresh ();
+
+		Assert.Equal (new Rect (0, 0, 1, 5), view.Frame);
+		Assert.Equal (new Size (1, 5), view.TextFormatter.Size);
+		var exception = Record.Exception (() => Assert.Single (view.TextFormatter.Lines));
+		Assert.Null (exception);
+		expected = @"
+┌──┐
+│V │
+│i │
+│e │
+│w │
+│s │
+│  │
+│  │
+│  │
+└──┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 4, 10), pos);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_True_View_IsEmpty_False_Minimum_Width_Wide_Rune ()
+	{
+		var text = "界View";
+		var view = new View {
+			TextDirection = TextDirection.TopBottom_LeftRight,
+			Height = Dim.Fill () - text.Length,
+			Text = text,
+			AutoSize = true
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (4, 10);
+
+		Assert.Equal (5, text.Length);
+		Assert.True (view.AutoSize);
+		Assert.Equal (new Rect (0, 0, 2, 5), view.Frame);
+		Assert.Equal (new Size (2, 5), view.TextFormatter.Size);
+		Assert.Equal (new List<string> { "界View" }, view.TextFormatter.Lines);
+		Assert.Equal (new Rect (0, 0, 4, 10), win.Frame);
+		Assert.Equal (new Rect (0, 0, 4, 10), Application.Top.Frame);
+		var expected = @"
+┌──┐
+│界│
+│V │
+│i │
+│e │
+│w │
+│  │
+│  │
+│  │
+└──┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 4, 10), pos);
+
+		text = "0123456789";
+		Assert.Equal (10, text.Length);
+		view.Height = Dim.Fill () - text.Length;
+		Application.Refresh ();
+
+		Assert.Equal (new Rect (0, 0, 2, 5), view.Frame);
+		Assert.Equal (new Size (2, 5), view.TextFormatter.Size);
+		var exception = Record.Exception (() => Assert.Equal (new List<string> { "界View" }, view.TextFormatter.Lines));
+		Assert.Null (exception);
+		expected = @"
+┌──┐
+│界│
+│V │
+│i │
+│e │
+│w │
+│  │
+│  │
+│  │
+└──┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 4, 10), pos);
+	}
+
+	[Fact]
+	public void AutoSize_True_Label_If_Text_Emmpty ()
+	{
+		var label1 = new Label ();
+		var label2 = new Label ("");
+		var label3 = new Label { Text = "" };
+
+		Assert.True (label1.AutoSize);
+		Assert.True (label2.AutoSize);
+		Assert.True (label3.AutoSize);
+		label1.Dispose ();
+		label2.Dispose ();
+		label3.Dispose ();
+	}
+
+	[Fact]
+	public void AutoSize_True_Label_If_Text_Is_Not_Emmpty ()
+	{
+		var label1 = new Label ();
+		label1.Text = "Hello World";
+		var label2 = new Label ("Hello World");
+		var label3 = new Label { Text = "Hello World" };
+
+		Assert.True (label1.AutoSize);
+		Assert.True (label2.AutoSize);
+		Assert.True (label3.AutoSize);
+		label1.Dispose ();
+		label2.Dispose ();
+		label3.Dispose ();
+	}
+
+	[Fact]
+	public void AutoSize_True_ResizeView_With_Dim_Absolute ()
+	{
+		var super = new View ();
+		var label = new Label ();
+
+		label.Text = "New text";
+		// BUGBUG: v2 - label was never added to super, so it was never laid out.
+		super.Add (label);
+		super.LayoutSubviews ();
+
+		Assert.True (label.AutoSize);
+		Assert.Equal ("(0,0,8,1)", label.Bounds.ToString ());
+		super.Dispose ();
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_True_Setting_With_Height_Horizontal ()
+	{
+		var label = new Label ("Hello") { Width = 10, Height = 2, ValidatePosDim = true };
+		var viewX = new View ("X") { X = Pos.Right (label) };
+		var viewY = new View ("Y") { Y = Pos.Bottom (label) };
+
+		Application.Top.Add (label, viewX, viewY);
+		var rs = Application.Begin (Application.Top);
+
+		Assert.True (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 10, 2), label.Frame);
+
+		var expected = @"
+Hello     X
+           
+Y          
+"
+			;
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 11, 3), pos);
+
+		label.AutoSize = false;
+		Application.Refresh ();
+
+		Assert.False (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 10, 2), label.Frame);
+
+		expected = @"
+Hello     X
+           
+Y          
+"
+			;
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 11, 3), pos);
+		Application.End (rs);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_True_Setting_With_Height_Vertical ()
+	{
+		var label = new Label { Width = 2, Height = 10, TextDirection = TextDirection.TopBottom_LeftRight, ValidatePosDim = true };
+		var viewX = new View ("X") { X = Pos.Right (label) };
+		var viewY = new View ("Y") { Y = Pos.Bottom (label) };
+
+		Application.Top.Add (label, viewX, viewY);
+		var rs = Application.Begin (Application.Top);
+
+		Assert.True (label.AutoSize);
+		label.Text = "Hello";
+		Application.Refresh ();
+
+		// #3127: Label.Text is "Hello" - It's Vertical. So the width should be 2 (honoring Width = 2)
+		// and the height is should be 10 (because 10 is greater than length of Hello).
+		Assert.Equal (new Rect (0, 0, 2, 10), label.Frame);
+
+		var expected = @"
+H X
+e  
+l  
+l  
+o  
+   
+   
+   
+   
+   
+Y  
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 3, 11), pos);
+
+		label.AutoSize = false;
+		Application.Refresh ();
+
+		Assert.False (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 2, 10), label.Frame);
+
+		expected = @"
+H X
+e  
+l  
+l  
+o  
+   
+   
+   
+   
+   
+Y  
+"
+			;
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 3, 11), pos);
+		Application.End (rs);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void Excess_Text_Is_Erased_When_The_Width_Is_Reduced ()
+	{
+		var lbl = new Label ("123");
+		Application.Top.Add (lbl);
+		var rs = Application.Begin (Application.Top);
+
+		Assert.True (lbl.AutoSize);
+		Assert.Equal ("123 ", GetContents ());
+
+		lbl.Text = "12";
+		// Here the AutoSize ensuring the right size with width 3 (Dim.Absolute)
+		// that was set on the OnAdded method with the text length of 3
+		// and height 1 because wasn't set and the text has 1 line
+		Assert.Equal (new Rect (0, 0, 3, 1), lbl.Frame);
+		Assert.Equal (new Rect (0, 0, 3, 1), lbl._needsDisplayRect);
+		Assert.Equal (new Rect (0, 0, 0, 0), lbl.SuperView._needsDisplayRect);
+		Assert.True (lbl.SuperView.LayoutNeeded);
+		lbl.SuperView.Draw ();
+		Assert.Equal ("12  ", GetContents ());
+
+		string GetContents ()
+		{
+			var text = "";
+			for (var i = 0; i < 4; i++) {
+				text += Application.Driver.Contents [0, i].Rune;
+			}
+			return text;
+		}
+		Application.End (rs);
+	}
+
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_True_Equal_Before_And_After_IsInitialized_With_Different_Orders ()
+	{
+		var view1 = new View { Text = "Say Hello view1 你", AutoSize = true, Width = 10, Height = 5, ValidatePosDim = true };
+		var view2 = new View { Text = "Say Hello view2 你", Width = 10, Height = 5, AutoSize = true, ValidatePosDim = true };
+		var view3 = new View { AutoSize = true, Width = 10, Height = 5, Text = "Say Hello view3 你", ValidatePosDim = true };
+		var view4 = new View {
+			Text = "Say Hello view4 你",
+			AutoSize = true,
+			Width = 10,
+			Height = 5,
+			TextDirection = TextDirection.TopBottom_LeftRight,
+			ValidatePosDim = true
+		};
+		var view5 = new View {
+			Text = "Say Hello view5 你",
+			Width = 10,
+			Height = 5,
+			AutoSize = true,
+			TextDirection = TextDirection.TopBottom_LeftRight,
+			ValidatePosDim = true
+		};
+		var view6 = new View {
+			AutoSize = true,
+			Width = 10,
+			Height = 5,
+			TextDirection = TextDirection.TopBottom_LeftRight,
+			Text = "Say Hello view6 你",
+			ValidatePosDim = true
+		};
+		Application.Top.Add (view1, view2, view3, view4, view5, view6);
+
+		Assert.False (view1.IsInitialized);
+		Assert.False (view2.IsInitialized);
+		Assert.False (view3.IsInitialized);
+		Assert.False (view4.IsInitialized);
+		Assert.False (view5.IsInitialized);
+		Assert.True (view1.AutoSize);
+		Assert.Equal (new Rect (0, 0, 18, 5), view1.Frame);
+		Assert.Equal ("Absolute(18)", view1.Width.ToString ());
+		Assert.Equal ("Absolute(5)", view1.Height.ToString ());
+		Assert.True (view2.AutoSize);
+		Assert.Equal ("Say Hello view2 你".GetColumns (), view2.Width);
+		Assert.Equal (18, view2.Width);
+		Assert.Equal (new Rect (0, 0, 18, 5), view2.Frame);
+		Assert.Equal ("Absolute(18)", 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 ("Absolute(18)", view2.Width.ToString ());
+		Assert.Equal ("Absolute(5)", view3.Height.ToString ());
+		Assert.True (view4.AutoSize);
+
+		Assert.Equal ("Say Hello view4 你".GetColumns (), view2.Width);
+		Assert.Equal (18, view2.Width);
+
+		Assert.Equal (new Rect (0, 0, 18, 17), view4.Frame);
+		Assert.Equal ("Absolute(18)", view4.Width.ToString ());
+		Assert.Equal ("Absolute(17)", view4.Height.ToString ());
+		Assert.True (view5.AutoSize);
+		Assert.Equal (new Rect (0, 0, 18, 17), view5.Frame);
+		Assert.True (view6.AutoSize);
+		Assert.Equal (new Rect (0, 0, 10, 17), view6.Frame);
+
+		var rs = Application.Begin (Application.Top);
+
+		Assert.True (view1.IsInitialized);
+		Assert.True (view2.IsInitialized);
+		Assert.True (view3.IsInitialized);
+		Assert.True (view4.IsInitialized);
+		Assert.True (view5.IsInitialized);
+		Assert.True (view1.AutoSize);
+		Assert.Equal (new Rect (0, 0, 18, 5), view1.Frame);
+		Assert.Equal ("Absolute(18)", 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 ("Absolute(18)", 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 ("Absolute(18)", view5.Width.ToString ());
+		Assert.Equal ("Absolute(5)", view3.Height.ToString ());
+		Assert.True (view4.AutoSize);
+		Assert.Equal (new Rect (0, 0, 18, 17), view4.Frame);
+		Assert.Equal ("Absolute(18)", view5.Width.ToString ());
+		Assert.Equal ("Absolute(17)", view4.Height.ToString ());
+		Assert.True (view5.AutoSize);
+		Assert.Equal (new Rect (0, 0, 18, 17), view5.Frame);
+		Assert.Equal ("Absolute(18)", view5.Width.ToString ());
+		Assert.Equal ("Absolute(17)", 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(17)", view6.Height.ToString ());
+		Application.End (rs);
+	}
+
+	[Fact]
+	public void SetRelativeLayout_Respects_AutoSize ()
+	{
+		var view = new View (new Rect (0, 0, 10, 0)) {
+			AutoSize = true
+		};
+		view.Text = "01234567890123456789";
+
+		Assert.True (view.AutoSize);
+		Assert.Equal (LayoutStyle.Absolute, view.LayoutStyle);
+		Assert.Equal (new Rect (0, 0, 20, 1), view.Frame);
+		Assert.Equal ("Absolute(0)", view.X.ToString ());
+		Assert.Equal ("Absolute(0)", view.Y.ToString ());
+		Assert.Equal ("Absolute(20)", view.Width.ToString ());
+		Assert.Equal ("Absolute(1)", view.Height.ToString ());
+
+		view.SetRelativeLayout (new Rect (0, 0, 25, 5));
+
+		Assert.True (view.AutoSize);
+		Assert.Equal (LayoutStyle.Absolute, view.LayoutStyle);
+		Assert.Equal (new Rect (0, 0, 20, 1), view.Frame);
+		Assert.Equal ("Absolute(0)", view.X.ToString ());
+		Assert.Equal ("Absolute(0)", view.Y.ToString ());
+		Assert.Equal ("Absolute(20)", view.Width.ToString ());
+		Assert.Equal ("Absolute(1)", view.Height.ToString ());
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void Setting_Frame_Dont_Respect_AutoSize_True_On_Layout_Absolute ()
+	{
+		var view1 = new View (new Rect (0, 0, 10, 0)) {
+			Text = "Say Hello view1 你",
+			AutoSize = true
+		};
+		var viewTopBottom_LeftRight = new View (new Rect (0, 0, 0, 10)) {
+			Text = "Say Hello view2 你",
+			AutoSize = true,
+			TextDirection = TextDirection.TopBottom_LeftRight
+		};
+		Application.Top.Add (view1, viewTopBottom_LeftRight);
+
+		var rs = Application.Begin (Application.Top);
+
+		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.True (viewTopBottom_LeftRight.AutoSize);
+		Assert.Equal (LayoutStyle.Absolute, viewTopBottom_LeftRight.LayoutStyle);
+		Assert.Equal (new Rect (0, 0, 18, 17), viewTopBottom_LeftRight.Frame);
+		Assert.Equal ("Absolute(0)", viewTopBottom_LeftRight.X.ToString ());
+		Assert.Equal ("Absolute(0)", viewTopBottom_LeftRight.Y.ToString ());
+		Assert.Equal ("Absolute(18)", viewTopBottom_LeftRight.Width.ToString ());
+		Assert.Equal ("Absolute(17)", viewTopBottom_LeftRight.Height.ToString ());
+
+		view1.Frame = new Rect (0, 0, 25, 4);
+		var firstIteration = false;
+		Application.RunIteration (ref rs, ref firstIteration);
+
+		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(25)", view1.Width.ToString ());
+		Assert.Equal ("Absolute(4)", view1.Height.ToString ());
+
+		viewTopBottom_LeftRight.Frame = new Rect (0, 0, 1, 25);
+		Application.RunIteration (ref rs, ref firstIteration);
+
+		Assert.True (viewTopBottom_LeftRight.AutoSize);
+		Assert.Equal (LayoutStyle.Absolute, viewTopBottom_LeftRight.LayoutStyle);
+		Assert.Equal (new Rect (0, 0, 2, 25), viewTopBottom_LeftRight.Frame);
+		Assert.Equal ("Absolute(0)", viewTopBottom_LeftRight.X.ToString ());
+		Assert.Equal ("Absolute(0)", viewTopBottom_LeftRight.Y.ToString ());
+		Assert.Equal ("Absolute(2)", viewTopBottom_LeftRight.Width.ToString ());
+		Assert.Equal ("Absolute(25)", viewTopBottom_LeftRight.Height.ToString ());
+		Application.End (rs);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_Stays_True_Center_HotKeySpecifier ()
+	{
+		var label = new Label {
+			X = Pos.Center (),
+			Y = Pos.Center (),
+			Text = "Say Hello 你"
+		};
+
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill (),
+			Title = "Test Demo 你"
+		};
+		win.Add (label);
+		Application.Top.Add (win);
+
+		Assert.True (label.AutoSize);
+
+		var rs = Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (30, 5);
+		var expected = @"
+┌┤Test Demo 你├──────────────┐
+│                            │
+│        Say Hello 你        │
+│                            │
+└────────────────────────────┘
+";
+
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+
+		Assert.True (label.AutoSize);
+		label.Text = "Say Hello 你 changed";
+		Assert.True (label.AutoSize);
+		Application.Refresh ();
+		expected = @"
+┌┤Test Demo 你├──────────────┐
+│                            │
+│    Say Hello 你 changed    │
+│                            │
+└────────────────────────────┘
+";
+
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Application.End (rs);
+	}
+
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_Dim_Add_Operator_With_Text ()
+	{
+		var top = Application.Top;
+
+		var view = new View ("View with long text") { X = 0, Y = 0, Width = 20, Height = 1 };
+		var field = new TextField { X = 0, Y = Pos.Bottom (view), Width = 20 };
+		var count = 0;
+		// Label is AutoSize == true
+		var listLabels = new List<Label> ();
+
+		field.KeyDown += (s, k) => {
+			if (k.KeyCode == KeyCode.Enter) {
+				((FakeDriver)Application.Driver).SetBufferSize (22, count + 4);
+				var pos = TestHelpers.AssertDriverContentsWithFrameAre (expecteds [count], _output);
+				Assert.Equal (new Rect (0, 0, 22, count + 4), pos);
+
+				if (count < 20) {
+					field.Text = $"Label {count}";
+					// Label is AutoSize = true
+					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 ());
+					listLabels.Add (label);
+					//if (count == 0) {
+					//	Assert.Equal ($"Absolute({count})", view.Height.ToString ());
+					//	view.Height += 2;
+					//} else {
+					Assert.Equal ($"Absolute({count + 1})", view.Height.ToString ());
+					view.Height += 1;
+					//}
+					count++;
+				}
+				Assert.Equal ($"Absolute({count + 1})", view.Height.ToString ());
+			}
+		};
+
+		Application.Iteration += (s, a) => {
+			while (count < 21) {
+				field.NewKeyDownEvent (new Key (KeyCode.Enter));
+				if (count == 20) {
+					field.NewKeyDownEvent (new Key (KeyCode.Enter));
+					break;
+				}
+			}
+
+			Application.RequestStop ();
+		};
+
+		var win = new Window ();
+		win.Add (view);
+		win.Add (field);
+
+		top.Add (win);
+
+		Application.Run (top);
+
+		Assert.Equal (20, count);
+		Assert.Equal (count, listLabels.Count);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_Dim_Subtract_Operator_With_Text ()
+	{
+		var top = Application.Top;
+		var view = new View ("View with long text") { X = 0, Y = 0, Width = 20, Height = 1 };
+		var field = new TextField { X = 0, Y = Pos.Bottom (view), Width = 20 };
+		var count = 20;
+		// Label is AutoSize == true
+		var listLabels = new List<Label> ();
+
+		for (var i = 0; i < count; i++) {
+			field.Text = $"Label {i}";
+			var label = new Label (field.Text) { X = 0, Y = i + 1, Width = 10 };
+			view.Add (label);
+			Assert.Equal ($"Label {i}", label.Text);
+			Assert.Equal ($"Absolute({i + 1})", label.Y.ToString ());
+			listLabels.Add (label);
+
+			if (i == 0) {
+				Assert.Equal ($"Absolute({i + 1})", view.Height.ToString ());
+				view.Height += 1;
+				Assert.Equal ($"Absolute({i + 2})", view.Height.ToString ());
+			} else {
+				Assert.Equal ($"Absolute({i + 1})", view.Height.ToString ());
+				view.Height += 1;
+				Assert.Equal ($"Absolute({i + 2})", view.Height.ToString ());
+			}
+		}
+
+		field.KeyDown += (s, k) => {
+			if (k.KeyCode == KeyCode.Enter) {
+				((FakeDriver)Application.Driver).SetBufferSize (22, count + 4);
+				var pos = TestHelpers.AssertDriverContentsWithFrameAre (expecteds [count], _output);
+				Assert.Equal (new Rect (0, 0, 22, count + 4), pos);
+
+				if (count > 0) {
+					Assert.Equal ($"Label {count - 1}", listLabels [count - 1].Text);
+					view.Remove (listLabels [count - 1]);
+					listLabels [count - 1].Dispose ();
+					listLabels.RemoveAt (count - 1);
+					Assert.Equal ($"Absolute({count + 1})", view.Height.ToString ());
+					view.Height -= 1;
+					count--;
+					if (listLabels.Count > 0) {
+						field.Text = listLabels [count - 1].Text;
+					} else {
+						field.Text = string.Empty;
+					}
+				}
+				Assert.Equal ($"Absolute({count + 1})", view.Height.ToString ());
+			}
+		};
+
+		Application.Iteration += (s, a) => {
+			while (count > -1) {
+				field.NewKeyDownEvent (new Key (KeyCode.Enter));
+				if (count == 0) {
+					field.NewKeyDownEvent (new Key (KeyCode.Enter));
+					break;
+				}
+			}
+
+			Application.RequestStop ();
+		};
+
+		var win = new Window ();
+		win.Add (view);
+		win.Add (field);
+
+		top.Add (win);
+
+		Application.Run (top);
+
+		Assert.Equal (0, count);
+		Assert.Equal (count, listLabels.Count);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_AnchorEnd_Better_Than_Bottom_Equal_Inside_Window ()
+	{
+		var win = new Window ();
+
+		// Label is AutoSize == true
+		var label = new Label ("This should be the last line.") {
+			ColorScheme = Colors.Menu,
+			Width = Dim.Fill (),
+			X = 0, // keep unit test focused; don't use Center here
+			Y = Pos.AnchorEnd (1)
+		};
+
+		win.Add (label);
+
+		var top = Application.Top;
+		top.Add (win);
+		var rs = Application.Begin (top);
+		((FakeDriver)Application.Driver).SetBufferSize (40, 10);
+
+		Assert.True (label.AutoSize);
+		Assert.Equal (29, label.Text.Length);
+		Assert.Equal (new Rect (0, 0, 40, 10), top.Frame);
+		Assert.Equal (new Rect (0, 0, 40, 10), win.Frame);
+		Assert.Equal (new Rect (0, 7, 38, 1), label.Frame);
+		var expected = @"
+┌──────────────────────────────────────┐
+│                                      │
+│                                      │
+│                                      │
+│                                      │
+│                                      │
+│                                      │
+│                                      │
+│This should be the last line.         │
+└──────────────────────────────────────┘
+";
+
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Application.End (rs);
+	}
+
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_Bottom_Equal_Inside_Window ()
+	{
+		var win = new Window ();
+
+		// Label is AutoSize == true
+		var label = new Label ("This should be the last line.") {
+			ColorScheme = Colors.Menu,
+			Width = Dim.Fill (),
+			X = 0,
+			Y = Pos.Bottom (win) - 3 // two lines top and bottom borders more one line above the bottom border
+		};
+
+		win.Add (label);
+
+		var top = Application.Top;
+		top.Add (win);
+		var rs = 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 (0, 7, 38, 1), label.Frame);
+		var expected = @"
+┌──────────────────────────────────────┐
+│                                      │
+│                                      │
+│                                      │
+│                                      │
+│                                      │
+│                                      │
+│                                      │
+│This should be the last line.         │
+└──────────────────────────────────────┘
+";
+
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Application.End (rs);
+	}
+
+
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_Bottom_Equal_Inside_Window_With_MenuBar_And_StatusBar_On_Toplevel ()
+	{
+		var win = new Window ();
+
+		// Label is AutoSize == true
+		var label = new Label ("This should be the last line.") {
+			ColorScheme = Colors.Menu,
+			Width = Dim.Fill (),
+			X = 0,
+			Y = Pos.Bottom (win) - 4 // two lines top and bottom borders more two lines above border
+		};
+
+		win.Add (label);
+
+		var menu = new MenuBar (new MenuBarItem [] { new ("Menu", "", null) });
+		var status = new StatusBar (new StatusItem [] { new (KeyCode.F1, "~F1~ Help", null) });
+		var top = Application.Top;
+		top.Add (win, menu, status);
+		var rs = Application.Begin (top);
+
+		Assert.True (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 80, 25), top.Frame);
+		Assert.Equal (new Rect (0, 0, 80, 1), menu.Frame);
+		Assert.Equal (new Rect (0, 24, 80, 1), status.Frame);
+		Assert.Equal (new Rect (0, 1, 80, 23), win.Frame);
+		Assert.Equal (new Rect (0, 20, 78, 1), label.Frame);
+		var expected = @"
+ Menu                                                                           
+┌──────────────────────────────────────────────────────────────────────────────┐
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│This should be the last line.                                                 │
+└──────────────────────────────────────────────────────────────────────────────┘
+ F1 Help                                                                        
+";
+
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Application.End (rs);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_AnchorEnd_Better_Than_Bottom_Equal_Inside_Window_With_MenuBar_And_StatusBar_On_Toplevel ()
+	{
+		var win = new Window ();
+
+		// Label is AutoSize == true
+		var label = new Label ("This should be the last line.") {
+			ColorScheme = Colors.Menu,
+			Width = Dim.Fill (),
+			X = 0,
+			Y = Pos.AnchorEnd (1)
+		};
+
+		win.Add (label);
+
+		var menu = new MenuBar (new MenuBarItem [] { new ("Menu", "", null) });
+		var status = new StatusBar (new StatusItem [] { new (KeyCode.F1, "~F1~ Help", null) });
+		var top = Application.Top;
+		top.Add (win, menu, status);
+		var rs = Application.Begin (top);
+
+		Assert.True (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 80, 25), top.Frame);
+		Assert.Equal (new Rect (0, 0, 80, 1), menu.Frame);
+		Assert.Equal (new Rect (0, 24, 80, 1), status.Frame);
+		Assert.Equal (new Rect (0, 1, 80, 23), win.Frame);
+		Assert.Equal (new Rect (0, 20, 78, 1), label.Frame);
+		var expected = @"
+ Menu                                                                           
+┌──────────────────────────────────────────────────────────────────────────────┐
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│                                                                              │
+│This should be the last line.                                                 │
+└──────────────────────────────────────────────────────────────────────────────┘
+ F1 Help                                                                        
+";
+
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Application.End (rs);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_True_TextDirection_Toggle ()
+	{
+		var win = new Window { Width = Dim.Fill (), Height = Dim.Fill () };
+		// View is AutoSize == true
+		var view = new View ();
+		win.Add (view);
+		Application.Top.Add (win);
+
+		var rs = Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (15, 15);
+
+		Assert.Equal (new Rect (0, 0, 15, 15), win.Frame);
+		Assert.Equal (new Rect (0, 0, 15, 15), win.Margin.Frame);
+		Assert.Equal (new Rect (0, 0, 15, 15), win.Border.Frame);
+		Assert.Equal (new Rect (1, 1, 13, 13), win.Padding.Frame);
+		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 ());
+		var expected = @"
+┌─────────────┐
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+└─────────────┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+
+		view.Text = "Hello World";
+		view.Width = 11;
+		view.Height = 1;
+		win.LayoutSubviews ();
+		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 ());
+		expected = @"
+┌─────────────┐
+│Hello World  │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+└─────────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+
+		view.AutoSize = true;
+		view.Text = "Hello Worlds";
+		Application.Refresh ();
+		var len = "Hello Worlds".Length;
+		Assert.Equal (12, len);
+		Assert.Equal (new Rect (0, 0, len, 1), view.Frame);
+		Assert.Equal ("Absolute(0)", view.X.ToString ());
+		Assert.Equal ("Absolute(0)", view.Y.ToString ());
+		Assert.Equal ("Absolute(12)", view.Width.ToString ());
+		Assert.Equal ("Absolute(1)", view.Height.ToString ());
+		expected = @"
+┌─────────────┐
+│Hello Worlds │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+└─────────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+
+		view.TextDirection = TextDirection.TopBottom_LeftRight;
+		Application.Refresh ();
+
+		Assert.Equal (new Rect (0, 0, 12, 12), view.Frame);
+		Assert.Equal ("Absolute(0)", view.X.ToString ());
+		Assert.Equal ("Absolute(0)", view.Y.ToString ());
+		Assert.Equal ("Absolute(12)", view.Width.ToString ());
+		Assert.Equal ("Absolute(12)", view.Height.ToString ());
+		expected = @"
+┌─────────────┐
+│H            │
+│e            │
+│l            │
+│l            │
+│o            │
+│             │
+│W            │
+│o            │
+│r            │
+│l            │
+│d            │
+│s            │
+│             │
+└─────────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+
+		view.AutoSize = false;
+		view.Height = 1;
+		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(12)", view.Width.ToString ());
+		Assert.Equal ("Absolute(1)", view.Height.ToString ());
+		// TextDirection.TopBottom_LeftRight - Height of 1 and Width of 12 means 
+		// that the text will be spread "vertically" across 1 line.
+		// Hence no space.
+		expected = @"
+┌─────────────┐
+│HelloWorlds  │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+└─────────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+
+		view.PreserveTrailingSpaces = true;
+		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(12)", view.Width.ToString ());
+		Assert.Equal ("Absolute(1)", view.Height.ToString ());
+		expected = @"
+┌─────────────┐
+│Hello Worlds │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+│             │
+└─────────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+
+		view.PreserveTrailingSpaces = false;
+		var f = view.Frame;
+		view.Width = f.Height;
+		view.Height = f.Width;
+		view.TextDirection = TextDirection.TopBottom_LeftRight;
+		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(12)", view.Height.ToString ());
+		expected = @"
+┌─────────────┐
+│H            │
+│e            │
+│l            │
+│l            │
+│o            │
+│             │
+│W            │
+│o            │
+│r            │
+│l            │
+│d            │
+│s            │
+│             │
+└─────────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+
+		view.AutoSize = true;
+		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(12)", view.Height.ToString ());
+		expected = @"
+┌─────────────┐
+│H            │
+│e            │
+│l            │
+│l            │
+│o            │
+│             │
+│W            │
+│o            │
+│r            │
+│l            │
+│d            │
+│s            │
+│             │
+└─────────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Application.End (rs);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_True_Width_Height_Stay_True_If_TextFormatter_Size_Fit ()
+	{
+		var text = "Fi_nish 終";
+		var horizontalView = new View {
+			Id = "horizontalView",
+			AutoSize = true,
+			HotKeySpecifier = (Rune)'_',
+			Text = text
+		};
+		var verticalView = new View {
+			Id = "verticalView",
+			Y = 3,
+			AutoSize = true,
+			HotKeySpecifier = (Rune)'_',
+			Text = text,
+			TextDirection = TextDirection.TopBottom_LeftRight
+		};
+		var win = new Window {
+			Id = "win",
+			Width = Dim.Fill (),
+			Height = Dim.Fill (),
+			Text = "Window"
+		};
+		win.Add (horizontalView, verticalView);
+		Application.Top.Add (win);
+		var rs = Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (22, 22);
+
+		Assert.True (horizontalView.AutoSize);
+		Assert.True (verticalView.AutoSize);
+		Assert.Equal (new Size (text.GetColumns (), 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 ());
+
+		// BUGBUG - v2 - With v1 AutoSize = true Width/Height should always grow or keep initial value, 
+
+		Assert.Equal ("Absolute(9)", horizontalView.Width.ToString ());
+		Assert.Equal ("Absolute(1)", horizontalView.Height.ToString ());
+		Assert.Equal (new Rect (0, 3, 9, 8), verticalView.Frame);
+		Assert.Equal ("Absolute(0)", verticalView.X.ToString ());
+		Assert.Equal ("Absolute(3)", verticalView.Y.ToString ());
+		Assert.Equal ("Absolute(9)", verticalView.Width.ToString ());
+		Assert.Equal ("Absolute(8)", verticalView.Height.ToString ());
+		var expected = @"
+┌────────────────────┐
+│Finish 終           │
+│                    │
+│                    │
+│F                   │
+│i                   │
+│n                   │
+│i                   │
+│s                   │
+│h                   │
+│                    │
+│終                  │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+└────────────────────┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 22, 22), pos);
+
+		verticalView.Text = "最初_の行二行目";
+		Application.Top.Draw ();
+		Assert.True (horizontalView.AutoSize);
+		Assert.True (verticalView.AutoSize);
+		// height was initialized with 8 and can only grow or keep initial value
+		Assert.Equal (new Rect (0, 3, 9, 8), verticalView.Frame);
+		Assert.Equal ("Absolute(0)", verticalView.X.ToString ());
+		Assert.Equal ("Absolute(3)", verticalView.Y.ToString ());
+		Assert.Equal ("Absolute(9)", verticalView.Width.ToString ());
+		Assert.Equal ("Absolute(8)", verticalView.Height.ToString ());
+		expected = @"
+┌────────────────────┐
+│Finish 終           │
+│                    │
+│                    │
+│最                  │
+│初                  │
+│の                  │
+│行                  │
+│二                  │
+│行                  │
+│目                  │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+│                    │
+└────────────────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 22, 22), pos);
+		Application.End (rs);
+	}
+
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_SetWidthHeight_With_Dim_Fill_And_Dim_Absolute_After_IsAdded_And_IsInitialized ()
+	{
+		var win = new Window (new Rect (0, 0, 30, 50));
+		var label = new Label { Width = Dim.Fill () };
+		win.Add (label);
+		Application.Top.Add (win);
+
+		Assert.True (label.IsAdded);
+
+		Assert.True (label.AutoSize);
+
+		// #3127: Before: 
+		//		 Text is empty but height=1 by default, see Label view
+		//		 BUGBUG: LayoutSubviews has not been called, so this test is not really valid (pos/dim are indeterminate, not 0)
+		//		 Not really a bug because View call OnResizeNeeded method on the SetInitialProperties method
+		// #3127: After: Text is empty Width=Dim.Fill is honored. 
+		//        LayoutSubViews has not been called, and OnResizeNeeded ends up using Application.Top.Bounds
+		//        Which has a width of 80.
+		Assert.Equal ("(0,0,80,1)", label.Bounds.ToString ());
+
+		label.Text = "First line\nSecond line";
+		Application.Top.LayoutSubviews ();
+
+		Assert.True (label.AutoSize);
+		Assert.Equal ("(0,0,28,2)", label.Bounds.ToString ());
+		Assert.False (label.IsInitialized);
+
+		var rs = Application.Begin (Application.Top);
+
+		Assert.True (label.AutoSize);
+		Assert.Equal ("(0,0,28,2)", label.Bounds.ToString ());
+		Assert.True (label.IsInitialized);
+
+		label.AutoSize = false;
+
+		// Width should still be Dim.Fill
+		Assert.Equal ("Fill(0)", label.Width.ToString ());
+
+		// Height should be 2
+		Assert.Equal ("Absolute(2)", label.Height.ToString ());
+		Assert.Equal (2, label.Frame.Height);
+
+		Assert.False (label.AutoSize);
+		Assert.Equal ("(0,0,28,2)", label.Bounds.ToString ());
+		Application.End (rs);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_SetWidthHeight_With_Dim_Fill_And_Dim_Absolute_With_Initialization ()
+	{
+		var win = new Window (new Rect (0, 0, 30, 80));
+		var label = new Label { Width = Dim.Fill () };
+		win.Add (label);
+		Application.Top.Add (win);
+
+		// Text is empty but height=1 by default. 
+		Assert.True (label.AutoSize);
+		Assert.Equal ("(0,0,80,1)", label.Bounds.ToString ());
+
+		var rs = Application.Begin (Application.Top);
+
+		Assert.True (label.AutoSize);
+		// Here the AutoSize ensuring the right size with width 28 (Dim.Fill)
+		// and height 0 because wasn't set and the text is empty
+		// BUGBUG: Because of #2450, this test is bogus: pos/dim is indeterminate!
+		//Assert.Equal ("(0,0,28,0)", label.Bounds.ToString ());
+
+		label.Text = "First line\nSecond line";
+		Application.Refresh ();
+
+		// Here the AutoSize ensuring the right size with width 28 (Dim.Fill)
+		// and height 2 because wasn't set and the text has 2 lines
+		Assert.True (label.AutoSize);
+		Assert.Equal ("(0,0,28,2)", label.Bounds.ToString ());
+
+		label.AutoSize = false;
+		Application.Refresh ();
+
+		// Here the SetMinWidthHeight ensuring the minimum height
+		// #3127: After: (0,0,28,2) because turning off AutoSize leaves
+		// Height set to 2.
+		Assert.False (label.AutoSize);
+		Assert.Equal ("(0,0,28,2)", label.Bounds.ToString ());
+
+		label.Text = "First changed line\nSecond changed line\nNew line";
+		Application.Refresh ();
+
+		// Here the AutoSize is false and the width 28 (Dim.Fill) and
+		// #3127: Before: height 1 because it wasn't set and SetMinWidthHeight ensuring the minimum height
+		// #3127: After: (0,0,28,2) because setting Text leaves Height set to 2..
+		Assert.False (label.AutoSize);
+		Assert.Equal ("(0,0,28,2)", label.Bounds.ToString ());
+
+		label.AutoSize = true;
+		Application.Refresh ();
+
+		// Here the AutoSize ensuring the right size with width 19 (width of longest line)
+		// and height 3 because the text has 3 lines
+		Assert.True (label.AutoSize);
+		Assert.Equal ("(0,0,19,3)", label.Bounds.ToString ());
+
+		Application.End (rs);
+	}
+
+
+	//	[Fact]
+	//	[AutoInitShutdown]
+	//	public void AutoSize_False_TextDirection_Toggle ()
+	//	{
+	//		var win = new Window { Width = Dim.Fill (), Height = Dim.Fill () };
+	//		// View is AutoSize == true
+	//		var view = new View ();
+	//		win.Add (view);
+	//		Application.Top.Add (win);
+
+	//		var rs = Application.Begin (Application.Top);
+	//		((FakeDriver)Application.Driver).SetBufferSize (22, 22);
+
+	//		Assert.Equal (new Rect (0, 0, 22, 22), win.Frame);
+	//		Assert.Equal (new Rect (0, 0, 22, 22), win.Margin.Frame);
+	//		Assert.Equal (new Rect (0, 0, 22, 22), win.Border.Frame);
+	//		Assert.Equal (new Rect (1, 1, 20, 20), win.Padding.Frame);
+	//		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 ());
+	//		var expected = @"
+	//┌────────────────────┐
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//└────────────────────┘
+	//";
+
+	//		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+	//		Assert.Equal (new Rect (0, 0, 22, 22), pos);
+
+	//		view.Text = "Hello World";
+	//		view.Width = 11;
+	//		view.Height = 1;
+	//		win.LayoutSubviews ();
+	//		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 ());
+	//		expected = @"
+	//┌────────────────────┐
+	//│Hello World         │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//└────────────────────┘
+	//";
+
+	//		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+	//		Assert.Equal (new Rect (0, 0, 22, 22), pos);
+
+	//		view.AutoSize = true;
+	//		view.Text = "Hello Worlds";
+	//		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(1)", view.Height.ToString ());
+	//		expected = @"
+	//┌────────────────────┐
+	//│Hello Worlds        │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//└────────────────────┘
+	//";
+
+	//		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+	//		Assert.Equal (new Rect (0, 0, 22, 22), pos);
+
+	//		view.TextDirection = TextDirection.TopBottom_LeftRight;
+	//		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(1)", view.Height.ToString ());
+	//		expected = @"
+	//┌────────────────────┐
+	//│H                   │
+	//│e                   │
+	//│l                   │
+	//│l                   │
+	//│o                   │
+	//│                    │
+	//│W                   │
+	//│o                   │
+	//│r                   │
+	//│l                   │
+	//│d                   │
+	//│s                   │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//└────────────────────┘
+	//";
+
+	//		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+	//		Assert.Equal (new Rect (0, 0, 22, 22), pos);
+
+	//		view.AutoSize = false;
+	//		view.Height = 1;
+	//		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 ());
+	//		expected = @"
+	//┌────────────────────┐
+	//│HelloWorlds         │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//└────────────────────┘
+	//";
+
+	//		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+	//		Assert.Equal (new Rect (0, 0, 22, 22), pos);
+
+	//		view.PreserveTrailingSpaces = true;
+	//		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 ());
+	//		expected = @"
+	//┌────────────────────┐
+	//│Hello World         │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//└────────────────────┘
+	//";
+
+	//		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+	//		Assert.Equal (new Rect (0, 0, 22, 22), pos);
+
+	//		view.PreserveTrailingSpaces = false;
+	//		var f = view.Frame;
+	//		view.Width = f.Height;
+	//		view.Height = f.Width;
+	//		view.TextDirection = TextDirection.TopBottom_LeftRight;
+	//		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 ());
+	//		expected = @"
+	//┌────────────────────┐
+	//│H                   │
+	//│e                   │
+	//│l                   │
+	//│l                   │
+	//│o                   │
+	//│                    │
+	//│W                   │
+	//│o                   │
+	//│r                   │
+	//│l                   │
+	//│d                   │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//└────────────────────┘
+	//";
+
+	//		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+	//		Assert.Equal (new Rect (0, 0, 22, 22), pos);
+
+	//		view.AutoSize = true;
+	//		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(12)", view.Height.ToString ());
+	//		expected = @"
+	//┌────────────────────┐
+	//│H                   │
+	//│e                   │
+	//│l                   │
+	//│l                   │
+	//│o                   │
+	//│                    │
+	//│W                   │
+	//│o                   │
+	//│r                   │
+	//│l                   │
+	//│d                   │
+	//│s                   │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//│                    │
+	//└────────────────────┘
+	//";
+
+	//		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+	//		Assert.Equal (new Rect (0, 0, 22, 22), pos);
+	//		Application.End (rs);
+	//	}
+
+
+	[Fact]
+	[AutoInitShutdown]
+	public void GetTextFormatterBoundsSize_GetSizeNeededForText_HotKeySpecifier ()
+	{
+		var text = "Say Hello 你";
+
+		// Frame: 0, 0, 12, 1
+		var horizontalView = new View {
+			AutoSize = true,
+			HotKeySpecifier = (Rune)'_'
+		};
+		horizontalView.Text = text;
+
+		// Frame: 0, 0, 1, 12
+		var verticalView = new View {
+			AutoSize = true,
+			HotKeySpecifier = (Rune)'_',
+			TextDirection = TextDirection.TopBottom_LeftRight
+		};
+		verticalView.Text = text;
+
+		Application.Top.Add (horizontalView, verticalView);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (50, 50);
+
+		Assert.True (horizontalView.AutoSize);
+		Assert.Equal (new Rect (0, 0, 12, 1), horizontalView.Frame);
+		Assert.Equal (new Size (12, 1), horizontalView.GetSizeNeededForTextWithoutHotKey ());
+		Assert.Equal (horizontalView.Frame.Size, horizontalView.GetSizeNeededForTextWithoutHotKey ());
+
+		Assert.True (verticalView.AutoSize);
+		Assert.Equal (new Rect (0, 0, 2, 11), verticalView.Frame);
+		Assert.Equal (new Size (2, 11), verticalView.GetSizeNeededForTextWithoutHotKey ());
+		Assert.Equal (verticalView.Frame.Size, verticalView.GetSizeNeededForTextWithoutHotKey ());
+
+		text = "Say He_llo 你";
+		horizontalView.Text = text;
+		verticalView.Text = text;
+
+		Assert.True (horizontalView.AutoSize);
+		Assert.Equal (new Rect (0, 0, 12, 1), horizontalView.Frame);
+		Assert.Equal (new Size (12, 1), horizontalView.GetSizeNeededForTextWithoutHotKey ());
+		Assert.Equal (horizontalView.Frame.Size, horizontalView.GetSizeNeededForTextWithoutHotKey ());
+
+		Assert.True (verticalView.AutoSize);
+		Assert.Equal (new Rect (0, 0, 2, 11), verticalView.Frame);
+		Assert.Equal (new Size (2, 11), verticalView.GetSizeNeededForTextWithoutHotKey ());
+		Assert.Equal (verticalView.Frame.Size, verticalView.GetSizeNeededForTextWithoutHotKey ());
+	}
+
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_True_Width_Height_SetMinWidthHeight_Narrow_Wide_Runes ()
+	{
+		var text = $"First line{Environment.NewLine}Second line";
+		var horizontalView = new View {
+			AutoSize = true,
+			Width = 20,
+			Height = 1,
+			Text = text
+		};
+		var verticalView = new View {
+			AutoSize = true,
+			Y = 3,
+			Height = 20,
+			Width = 1,
+			Text = text,
+			TextDirection = TextDirection.TopBottom_LeftRight
+		};
+		var win = new Window {
+			AutoSize = true,
+			Width = Dim.Fill (),
+			Height = Dim.Fill (),
+			Text = "Window"
+		};
+		win.Add (horizontalView, verticalView);
+		Application.Top.Add (win);
+		var rs = Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (20, 20);
+
+		Assert.True (horizontalView.AutoSize);
+		Assert.True (verticalView.AutoSize);
+		Assert.Equal (new Rect (0, 0, 20, 2), horizontalView.Frame);
+		Assert.Equal (new Rect (0, 3, 11, 20), verticalView.Frame);
+		var expected = @"
+┌──────────────────┐
+│First line        │
+│Second line       │
+│                  │
+│FS                │
+│ie                │
+│rc                │
+│so                │
+│tn                │
+│ d                │
+│l                 │
+│il                │
+│ni                │
+│en                │
+│ e                │
+│                  │
+│                  │
+│                  │
+│                  │
+└──────────────────┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+
+		verticalView.Text = $"最初の行{Environment.NewLine}二行目";
+		Application.Top.Draw ();
+		Assert.Equal (new Rect (0, 3, 11, 20), verticalView.Frame);
+		expected = @"
+┌──────────────────┐
+│First line        │
+│Second line       │
+│                  │
+│最二              │
+│初行              │
+│の目              │
+│行                │
+│                  │
+│                  │
+│                  │
+│                  │
+│                  │
+│                  │
+│                  │
+│                  │
+│                  │
+│                  │
+│                  │
+└──────────────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Application.End (rs);
+	}
+
+	[Theory] [AutoInitShutdown]
+	[InlineData (true)]
+	[InlineData (false)]
+	public void View_Draw_Horizontal_Simple_TextAlignments (bool autoSize)
+	{
+		var text = "Hello World";
+		var width = 20;
+		var lblLeft = new View (text) { Width = width, AutoSize = autoSize };
+		var lblCenter = new View (text) { Y = 1, Width = width, TextAlignment = TextAlignment.Centered, AutoSize = autoSize };
+		var lblRight = new View (text) { Y = 2, Width = width, TextAlignment = TextAlignment.Right, AutoSize = autoSize };
+		var lblJust = new View (text) { Y = 3, Width = width, TextAlignment = TextAlignment.Justified, AutoSize = autoSize };
+		var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill () };
+		frame.Add (lblLeft, lblCenter, lblRight, lblJust);
+		Application.Top.Add (frame);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (width + 2, 6);
+
+		Assert.True (lblLeft.AutoSize == autoSize);
+		Assert.True (lblCenter.AutoSize == autoSize);
+		Assert.True (lblRight.AutoSize == autoSize);
+		Assert.True (lblJust.AutoSize == autoSize);
+		Assert.True (lblLeft.TextFormatter.AutoSize == autoSize);
+		Assert.True (lblCenter.TextFormatter.AutoSize == autoSize);
+		Assert.True (lblRight.TextFormatter.AutoSize == autoSize);
+		Assert.True (lblJust.TextFormatter.AutoSize == autoSize);
+		Assert.Equal (new Rect (0, 0, width, 1), lblLeft.Frame);
+		Assert.Equal (new Rect (0, 1, width, 1), lblCenter.Frame);
+		Assert.Equal (new Rect (0, 2, width, 1), lblRight.Frame);
+		Assert.Equal (new Rect (0, 3, width, 1), lblJust.Frame);
+		if (autoSize) {
+			Assert.Equal (new Size (11, 1), lblLeft.TextFormatter.Size);
+			Assert.Equal (new Size (11, 1), lblCenter.TextFormatter.Size);
+			Assert.Equal (new Size (11, 1), lblRight.TextFormatter.Size);
+		} else {
+			Assert.Equal (new Size (width, 1), lblLeft.TextFormatter.Size);
+			Assert.Equal (new Size (width, 1), lblCenter.TextFormatter.Size);
+			Assert.Equal (new Size (width, 1), lblRight.TextFormatter.Size);
+		}
+		Assert.Equal (new Size (width, 1), lblJust.TextFormatter.Size);
+		Assert.Equal (new Rect (0, 0, width + 2, 6), frame.Frame);
+
+		var expected = @"
+┌────────────────────┐
+│Hello World         │
+│    Hello World     │
+│         Hello World│
+│Hello          World│
+└────────────────────┘
+"
+			;
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, width + 2, 6), pos);
+	}
+
+	[Theory] [AutoInitShutdown]
+	[InlineData (true)]
+	[InlineData (false)]
+	public void View_Draw_Vertical_Simple_TextAlignments (bool autoSize)
+	{
+		var text = "Hello World";
+		var height = 20;
+		var lblLeft = new View (text) { Height = height, TextDirection = TextDirection.TopBottom_LeftRight, AutoSize = autoSize };
+		var lblCenter = new View (text) { X = 2, Height = height, TextDirection = TextDirection.TopBottom_LeftRight, AutoSize = autoSize, VerticalTextAlignment = VerticalTextAlignment.Middle };
+		var lblRight = new View (text) { X = 4, Height = height, TextDirection = TextDirection.TopBottom_LeftRight, AutoSize = autoSize, VerticalTextAlignment = VerticalTextAlignment.Bottom };
+		var lblJust = new View (text) { X = 6, Height = height, TextDirection = TextDirection.TopBottom_LeftRight, AutoSize = autoSize, VerticalTextAlignment = VerticalTextAlignment.Justified };
+		var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill () };
+
+		frame.Add (lblLeft, lblCenter, lblRight, lblJust);
+		Application.Top.Add (frame);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (9, height + 2);
+
+		Assert.True (lblLeft.AutoSize == autoSize);
+		Assert.True (lblCenter.AutoSize == autoSize);
+		Assert.True (lblRight.AutoSize == autoSize);
+		Assert.True (lblJust.AutoSize == autoSize);
+		Assert.True (lblLeft.TextFormatter.AutoSize == autoSize);
+		Assert.True (lblCenter.TextFormatter.AutoSize == autoSize);
+		Assert.True (lblRight.TextFormatter.AutoSize == autoSize);
+		Assert.True (lblJust.TextFormatter.AutoSize == autoSize);
+		Assert.Equal (new Rect (0, 0, 11, height), lblLeft.Frame);
+		Assert.Equal (new Rect (2, 0, 11, height), lblCenter.Frame);
+		Assert.Equal (new Rect (4, 0, 11, height), lblRight.Frame);
+		Assert.Equal (new Rect (6, 0, 11, height), lblJust.Frame);
+		if (autoSize) {
+			Assert.Equal (new Size (1, 11), lblLeft.TextFormatter.Size);
+			Assert.Equal (new Size (1, 11), lblCenter.TextFormatter.Size);
+			Assert.Equal (new Size (1, 11), lblRight.TextFormatter.Size);
+		} else {
+			Assert.Equal (new Size (11, height), lblLeft.TextFormatter.Size);
+			Assert.Equal (new Size (11, height), lblCenter.TextFormatter.Size);
+			Assert.Equal (new Size (11, height), lblRight.TextFormatter.Size);
+		}
+		Assert.Equal (new Size (11, height), lblJust.TextFormatter.Size);
+		Assert.Equal (new Rect (0, 0, 9, height + 2), frame.Frame);
+
+		var expected = @"
+┌───────┐
+│H     H│
+│e     e│
+│l     l│
+│l     l│
+│o H   o│
+│  e    │
+│W l    │
+│o l    │
+│r o    │
+│l   H  │
+│d W e  │
+│  o l  │
+│  r l  │
+│  l o  │
+│  d    │
+│    W W│
+│    o o│
+│    r r│
+│    l l│
+│    d d│
+└───────┘
+"
+			;
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 9, height + 2), pos);
+	}
+}

UnitTests/View/Text/TextTests.cs

@@ -0,0 +1,652 @@
+using System;
+using System.Collections.Generic;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Terminal.Gui.ViewTests;
+
+/// <summary>
+/// Tests of the  <see cref="View.Text"/> property with <see cref="View.AutoSize"/> set to false.
+/// </summary>
+public class TextTests {
+	readonly ITestOutputHelper _output;
+
+	public TextTests (ITestOutputHelper output) => _output = output;
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_View_IsEmpty_False_Return_Null_Lines ()
+	{
+		var text = "Views";
+		var view = new View {
+			Width = Dim.Fill () - text.Length,
+			Height = 1,
+			Text = text
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		Assert.Equal (5, text.Length);
+		Assert.False (view.AutoSize);
+		Assert.Equal (new Rect (0, 0, 3, 1), view.Frame);
+		Assert.Equal (new Size (3, 1), view.TextFormatter.Size);
+		Assert.Equal (new List<string> { "Vie" }, view.TextFormatter.Lines);
+		Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
+		Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
+		var expected = @"
+┌────────┐
+│Vie     │
+│        │
+└────────┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+
+		text = "0123456789";
+		Assert.Equal (10, text.Length);
+		view.Width = Dim.Fill () - text.Length;
+		Application.Refresh ();
+
+		Assert.Equal (new Rect (0, 0, 0, 1), view.Frame);
+		Assert.Equal (new Size (0, 1), view.TextFormatter.Size);
+		Assert.Equal (new List<string> { string.Empty }, view.TextFormatter.Lines);
+		expected = @"
+┌────────┐
+│        │
+│        │
+└────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_View_IsEmpty_True_Minimum_Height ()
+	{
+		var text = "Views";
+		var view = new View {
+			Width = Dim.Fill () - text.Length,
+			Text = text
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		Assert.Equal (5, text.Length);
+		Assert.False (view.AutoSize);
+		Assert.Equal (new Rect (0, 0, 3, 1), view.Frame);
+		Assert.Equal (new Size (3, 1), view.TextFormatter.Size);
+		Assert.Single (view.TextFormatter.Lines);
+		Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
+		Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
+		var expected = @"
+┌────────┐
+│Vie     │
+│        │
+└────────┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+
+		text = "0123456789";
+		Assert.Equal (10, text.Length);
+		view.Width = Dim.Fill () - text.Length;
+		Application.Refresh ();
+
+		Assert.Equal (new Rect (0, 0, 0, 1), view.Frame);
+		Assert.Equal (new Size (0, 1), view.TextFormatter.Size);
+		var exception = Record.Exception (() => Assert.Equal (new List<string> { string.Empty }, view.TextFormatter.Lines));
+		Assert.Null (exception);
+		expected = @"
+┌────────┐
+│        │
+│        │
+└────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_Label_IsEmpty_True_Return_Null_Lines ()
+	{
+		var text = "Label";
+		var label = new Label {
+			Width = Dim.Fill () - text.Length,
+			Height = 1,
+			Text = text,
+			AutoSize = false
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (label);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		Assert.Equal (5, text.Length);
+		Assert.False (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 3, 1), label.Frame);
+		Assert.Equal (new Size (3, 1), label.TextFormatter.Size);
+		Assert.Equal (new List<string> { "Lab" }, label.TextFormatter.Lines);
+		Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
+		Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
+		var expected = @"
+┌────────┐
+│Lab     │
+│        │
+└────────┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+
+		text = "0123456789";
+		Assert.Equal (10, text.Length);
+		label.Width = Dim.Fill () - text.Length;
+		Application.Refresh ();
+
+		Assert.False (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 0, 1), label.Frame);
+		Assert.Equal (new Size (0, 1), label.TextFormatter.Size);
+		Assert.Equal (new List<string> { string.Empty }, label.TextFormatter.Lines);
+		expected = @"
+┌────────┐
+│        │
+│        │
+└────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_Label_Height_Zero_Returns_Minimum_Height ()
+	{
+		var text = "Label";
+		var label = new Label {
+			Width = Dim.Fill () - text.Length,
+			Text = text,
+			AutoSize = false
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (label);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+
+		Assert.Equal (5, text.Length);
+		Assert.False (label.AutoSize);
+		Assert.Equal (new Rect (0, 0, 3, 1), label.Frame);
+		Assert.Equal (new Size (3, 1), label.TextFormatter.Size);
+		Assert.Single (label.TextFormatter.Lines);
+		Assert.Equal (new Rect (0, 0, 10, 4), win.Frame);
+		Assert.Equal (new Rect (0, 0, 10, 4), Application.Top.Frame);
+		var expected = @"
+┌────────┐
+│Lab     │
+│        │
+└────────┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+
+		text = "0123456789";
+		Assert.Equal (10, text.Length);
+		label.Width = Dim.Fill () - text.Length;
+		Application.Refresh ();
+
+		Assert.Equal (new Rect (0, 0, 0, 1), label.Frame);
+		Assert.Equal (new Size (0, 1), label.TextFormatter.Size);
+		var exception = Record.Exception (() => Assert.Equal (new List<string> { string.Empty }, label.TextFormatter.Lines));
+		Assert.Null (exception);
+		expected = @"
+┌────────┐
+│        │
+│        │
+└────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 10, 4), pos);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_View_Width_Null_Returns_Host_Frame_Width ()
+	{
+		var text = "Views";
+		var view = new View {
+			TextDirection = TextDirection.TopBottom_LeftRight,
+			Height = Dim.Fill () - text.Length,
+			Text = text
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (4, 10);
+
+		Assert.Equal (5, text.Length);
+		Assert.False (view.AutoSize);
+		Assert.Equal (new Rect (0, 0, 1, 3), view.Frame);
+		Assert.Equal (new Size (1, 3), view.TextFormatter.Size);
+		Assert.Single (view.TextFormatter.Lines);
+		Assert.Equal (new Rect (0, 0, 4, 10), win.Frame);
+		Assert.Equal (new Rect (0, 0, 4, 10), Application.Top.Frame);
+		var expected = @"
+┌──┐
+│V │
+│i │
+│e │
+│  │
+│  │
+│  │
+│  │
+│  │
+└──┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 4, 10), pos);
+
+		text = "0123456789";
+		Assert.Equal (10, text.Length);
+		view.Height = Dim.Fill () - text.Length;
+		Application.Refresh ();
+
+		Assert.Equal (new Rect (0, 0, 1, 0), view.Frame);
+		Assert.Equal (new Size (1, 0), view.TextFormatter.Size);
+		var exception = Record.Exception (() => Assert.Equal (new List<string> { string.Empty }, view.TextFormatter.Lines));
+		Assert.Null (exception);
+		expected = @"
+┌──┐
+│  │
+│  │
+│  │
+│  │
+│  │
+│  │
+│  │
+│  │
+└──┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 4, 10), pos);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_View_Width_Zero_Returns_Minimum_Width_With_Wide_Rune ()
+	{
+		var text = "界View";
+		var view = new View {
+			TextDirection = TextDirection.TopBottom_LeftRight,
+			Height = Dim.Fill () - text.Length,
+			Text = text
+		};
+		var win = new Window {
+			Width = Dim.Fill (),
+			Height = Dim.Fill ()
+		};
+		win.Add (view);
+		Application.Top.Add (win);
+		Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (4, 10);
+
+		Assert.Equal (5, text.Length);
+		Assert.False (view.AutoSize);
+		Assert.Equal (new Rect (0, 0, 2, 3), view.Frame);
+		Assert.Equal (new Size (2, 3), view.TextFormatter.Size);
+		Assert.Single (view.TextFormatter.Lines);
+		Assert.Equal (new Rect (0, 0, 4, 10), win.Frame);
+		Assert.Equal (new Rect (0, 0, 4, 10), Application.Top.Frame);
+		var expected = @"
+┌──┐
+│界│
+│V │
+│i │
+│  │
+│  │
+│  │
+│  │
+│  │
+└──┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 4, 10), pos);
+
+		text = "0123456789";
+		Assert.Equal (10, text.Length);
+		view.Height = Dim.Fill () - text.Length;
+		Application.Refresh ();
+
+		Assert.Equal (new Rect (0, 0, 2, 0), view.Frame);
+		Assert.Equal (new Size (2, 0), view.TextFormatter.Size);
+		var exception = Record.Exception (() => Assert.Equal (new List<string> { string.Empty }, view.TextFormatter.Lines));
+		Assert.Null (exception);
+		expected = @"
+┌──┐
+│  │
+│  │
+│  │
+│  │
+│  │
+│  │
+│  │
+│  │
+└──┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 4, 10), pos);
+	}
+
+
+	[Fact]
+	public void AutoSize_False_If_Text_Empty ()
+	{
+		var view1 = new View ();
+		var view2 = new View ("");
+		var view3 = new View { Text = "" };
+
+		Assert.False (view1.AutoSize);
+		Assert.False (view2.AutoSize);
+		Assert.False (view3.AutoSize);
+		view1.Dispose ();
+		view2.Dispose ();
+		view3.Dispose ();
+	}
+
+	[Fact]
+	public void AutoSize_False_If_Text_Is_Not_Empty ()
+	{
+		var view1 = new View ();
+		view1.Text = "Hello World";
+		var view2 = new View ("Hello World");
+		var view3 = new View { Text = "Hello World" };
+
+		Assert.False (view1.AutoSize);
+		Assert.False (view2.AutoSize);
+		Assert.False (view3.AutoSize);
+		view1.Dispose ();
+		view2.Dispose ();
+		view3.Dispose ();
+	}
+
+	[Fact]
+	public void AutoSize_False_ResizeView_Is_Always_False ()
+	{
+		var super = new View ();
+		var label = new Label { AutoSize = false };
+		super.Add (label);
+
+		label.Text = "New text";
+		super.LayoutSubviews ();
+
+		Assert.False (label.AutoSize);
+		Assert.Equal ("(0,0,0,1)", label.Bounds.ToString ());
+		super.Dispose ();
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_ResizeView_With_Dim_Fill_After_IsInitialized ()
+	{
+		var win = new Window (new Rect (0, 0, 30, 80));
+		var label = new Label { AutoSize = false, Width = Dim.Fill (), Height = Dim.Fill () };
+		win.Add (label);
+		Application.Top.Add (win);
+
+		Assert.False (label.AutoSize);
+		Assert.Equal ("(0,0,80,25)", label.Bounds.ToString ());
+
+		label.Text = "New text\nNew line";
+		Application.Top.LayoutSubviews ();
+
+		Assert.False (label.AutoSize);
+		Assert.Equal ("(0,0,28,78)", label.Bounds.ToString ());
+		Assert.False (label.IsInitialized);
+
+		var rs = Application.Begin (Application.Top);
+		Assert.True (label.IsInitialized);
+		Assert.False (label.AutoSize);
+		Assert.Equal ("(0,0,28,78)", label.Bounds.ToString ());
+		Application.End (rs);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_Equal_Before_And_After_IsInitialized_With_Differents_Orders ()
+	{
+		var view1 = new View { Text = "Say Hello view1 你", AutoSize = false, Width = 10, Height = 5 };
+		var view2 = new View { Text = "Say Hello view2 你", Width = 10, Height = 5, AutoSize = false };
+		var view3 = new View { AutoSize = false, Width = 10, Height = 5, Text = "Say Hello view3 你" };
+		var view4 = new View {
+			Text = "Say Hello view4 你",
+			AutoSize = false,
+			Width = 10,
+			Height = 5,
+			TextDirection = TextDirection.TopBottom_LeftRight
+		};
+		var view5 = new View {
+			Text = "Say Hello view5 你",
+			Width = 10,
+			Height = 5,
+			AutoSize = false,
+			TextDirection = TextDirection.TopBottom_LeftRight
+		};
+		var view6 = new View {
+			AutoSize = false,
+			Width = 10,
+			Height = 5,
+			TextDirection = TextDirection.TopBottom_LeftRight,
+			Text = "Say Hello view6 你"
+		};
+		Application.Top.Add (view1, view2, view3, view4, view5, view6);
+
+		Assert.False (view1.IsInitialized);
+		Assert.False (view2.IsInitialized);
+		Assert.False (view3.IsInitialized);
+		Assert.False (view4.IsInitialized);
+		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.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.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.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.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.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 ());
+
+		var rs = Application.Begin (Application.Top);
+
+		Assert.True (view1.IsInitialized);
+		Assert.True (view2.IsInitialized);
+		Assert.True (view3.IsInitialized);
+		Assert.True (view4.IsInitialized);
+		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.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.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.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.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.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 ());
+		Application.End (rs);
+	}
+
+	[Fact]
+	[AutoInitShutdown]
+	public void AutoSize_False_Width_Height_SetMinWidthHeight_Narrow_Wide_Runes ()
+	{
+		string text = $"First line{Environment.NewLine}Second line";
+		var horizontalView = new View () {
+			Width = 20,
+			Height = 1,
+			Text = text
+		};
+		var verticalView = new View () {
+			Y = 3,
+			Height = 20,
+			Width = 1,
+			Text = text,
+			TextDirection = TextDirection.TopBottom_LeftRight
+		};
+		var win = new Window () {
+			Width = Dim.Fill (),
+			Height = Dim.Fill (),
+			Text = "Window"
+		};
+		win.Add (horizontalView, verticalView);
+		Application.Top.Add (win);
+		var rs = Application.Begin (Application.Top);
+		((FakeDriver)Application.Driver).SetBufferSize (32, 32);
+
+		Assert.False (horizontalView.AutoSize);
+		Assert.False (verticalView.AutoSize);
+		Assert.Equal (new Rect (0, 0, 20, 1), horizontalView.Frame);
+		Assert.Equal (new Rect (0, 3, 1, 20), verticalView.Frame);
+		string expected = @"
+┌──────────────────────────────┐
+│First line Second li          │
+│                              │
+│                              │
+│F                             │
+│i                             │
+│r                             │
+│s                             │
+│t                             │
+│                              │
+│l                             │
+│i                             │
+│n                             │
+│e                             │
+│                              │
+│S                             │
+│e                             │
+│c                             │
+│o                             │
+│n                             │
+│d                             │
+│                              │
+│l                             │
+│i                             │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+└──────────────────────────────┘
+";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+
+		verticalView.Text = $"最初の行{Environment.NewLine}二行目";
+		Application.Top.Draw ();
+		// BUGBUG: #3127 - If AutoSize == false, setting text should NOT change the size of the view.
+		Assert.Equal (new Rect (0, 3, 2, 20), verticalView.Frame);
+		expected = @"
+┌──────────────────────────────┐
+│First line Second li          │
+│                              │
+│                              │
+│最                            │
+│初                            │
+│の                            │
+│行                            │
+│                              │
+│二                            │
+│行                            │
+│目                            │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+│                              │
+└──────────────────────────────┘
+";
+
+		pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Application.End (rs);
+	}
+}

UnitTests/View/ViewKeyBindingTests.cs

@@ -27,13 +27,13 @@ public class ViewKeyBindingTests {
 			AddCommand (Command.Save, () => ApplicationCommand = true);
 			AddCommand (Command.Default, () => HotKeyCommand = true);
 			AddCommand (Command.Left, () => FocusedCommand = true);
-			
+
 			KeyBindings.Add (KeyCode.A, KeyBindingScope.Application, Command.Save);
 			HotKey = KeyCode.H;
 			KeyBindings.Add (KeyCode.F, KeyBindingScope.Focused, Command.Left);
 		}
 	}
-	
+
 	[Fact]
 	[AutoInitShutdown]
 	public void Focus_KeyBinding ()
@@ -64,7 +64,7 @@ public class ViewKeyBindingTests {
 		Assert.True (view.HasFocus);
 		Application.OnKeyDown (new (KeyCode.F));
 		Assert.True (invoked);
-		
+
 		Assert.True (view.ApplicationCommand);
 		Assert.True (view.HotKeyCommand);
 		Assert.True (view.FocusedCommand);

UnitTests/Views/AllViewsTests.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using Xunit;
-using System.IO;
-using System.Text;
-using Microsoft.VisualStudio.TestPlatform.Utilities;
 using Xunit.Abstractions;
 
 namespace Terminal.Gui.ViewsTests;
@@ -14,22 +12,62 @@ public class AllViewsTests {
 
 	public AllViewsTests (ITestOutputHelper output)
 	{
-		this._output = output;
+		_output = output;
+	}
+
+	[Fact]
+	public void AllViews_Center_Properly ()
+	{
+		// See https://github.com/gui-cs/Terminal.Gui/issues/3156
+
+		foreach (var type in GetAllViewClasses ()) {
+			Application.Init (new FakeDriver ());
+			var view = CreateViewFromType (type, type.GetConstructor (Array.Empty<Type> ()));
+			if (view == null) {
+				_output.WriteLine ($"Ignoring {type} - It's a Generic");
+				Application.Shutdown ();
+				continue;
+			}
+			view.X = Pos.Center ();
+			view.Y = Pos.Center ();
+
+			// Ensure the view has positive dimensions
+			view.Width = 10;
+			view.Height = 10;
+
+			var frame = new View () {
+				X = 0,
+				Y = 0,
+				Width = 50,
+				Height = 50,
+			};
+			frame.Add (view);
+			frame.BeginInit ();
+			frame.EndInit ();
+			frame.LayoutSubviews ();
+
+			// What's the natural width/height?
+			var expectedX = (frame.Frame.Width - view.Frame.Width) / 2;
+			var expectedY = (frame.Frame.Height - view.Frame.Height) / 2;
+
+			Assert.True (view.Frame.Left == expectedX, $"{view} did not center horizontally. Expected: {expectedX}. Actual: {view.Frame.Left}");
+			Assert.True (view.Frame.Top == expectedY, $"{view} did not center vertically. Expected: {expectedY}. Actual: {view.Frame.Top}");
+			Application.Shutdown ();
+		}
 	}
-	
+
 	[Fact]
 	public void AllViews_Tests_All_Constructors ()
 	{
 		Application.Init (new FakeDriver ());
 
 		foreach (var type in GetAllViewClasses ()) {
-			Assert.True (Constructors_FullTest (type));
+			Assert.True (Test_All_Constructors_Of_Type (type));
 		}
 
 		Application.Shutdown ();
 	}
 
-
 	[Fact]
 	public void AllViews_Enter_Leave_Events ()
 	{
@@ -39,8 +77,9 @@ public class AllViewsTests {
 			Application.Init (new FakeDriver ());
 
 			var top = Application.Top;
-			var vType = GetTypeInitializer (type, type.GetConstructor (Array.Empty<Type> ()));
+			var vType = CreateViewFromType (type, type.GetConstructor (Array.Empty<Type> ()));
 			if (vType == null) {
+				_output.WriteLine ($"Ignoring {type} - It's a Generic");
 				Application.Shutdown ();
 				continue;
 			}
@@ -102,10 +141,10 @@ public class AllViewsTests {
 	//	}
 	//}
 
-	public bool Constructors_FullTest (Type type)	
+	public bool Test_All_Constructors_Of_Type (Type type)
 	{
 		foreach (var ctor in type.GetConstructors ()) {
-			var view = GetTypeInitializer (type, ctor);
+			var view = CreateViewFromType (type, ctor);
 			if (view != null) {
 				Assert.True (type.FullName == view.GetType ().FullName);
 			}
@@ -114,7 +153,7 @@ public class AllViewsTests {
 		return true;
 	}
 
-	private static View GetTypeInitializer (Type type, ConstructorInfo ctor)
+	private static View CreateViewFromType (Type type, ConstructorInfo ctor)
 	{
 		View viewType = null;
 
@@ -166,6 +205,8 @@ public class AllViewsTests {
 		return viewType;
 	}
 
+	// BUGBUG: This is a hack. We should figure out how to dynamically
+	// create the right type of argument for the constructor.
 	private static void AddArguments (Type paramType, List<object> pTypes)
 	{
 		if (paramType == typeof (Rect)) {

UnitTests/Views/AppendAutocompleteTests.cs

@@ -1,19 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Terminal.Gui.TextTests; 
+namespace Terminal.Gui.TextTests;
 
 public class AppendAutocompleteTests {
 	readonly ITestOutputHelper output;
 
 	public AppendAutocompleteTests (ITestOutputHelper output) => this.output = output;
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void TestAutoAppend_ShowThenAccept_MatchCase ()
 	{
 		var tf = GetTextFieldsInView ();
@@ -26,7 +25,7 @@ public class AppendAutocompleteTests {
 		tf.PositionCursor ();
 		TestHelpers.AssertDriverContentsAre ("", output);
 
-		tf.NewKeyDownEvent (new ('f'));
+		tf.NewKeyDownEvent (new Key ('f'));
 
 		tf.Draw ();
 		tf.PositionCursor ();
@@ -47,7 +46,8 @@ public class AppendAutocompleteTests {
 		Assert.NotSame (tf, Application.Top.Focused);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void TestAutoAppend_ShowThenAccept_CasesDiffer ()
 	{
 		var tf = GetTextFieldsInView ();
@@ -78,7 +78,8 @@ public class AppendAutocompleteTests {
 		Assert.Equal ("my FISH", tf.Text);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void TestAutoAppend_AfterCloseKey_NoAutocomplete ()
 	{
 		var tf = GetTextFieldsInViewSuggesting ("fish");
@@ -93,7 +94,7 @@ public class AppendAutocompleteTests {
 		// When cancelling autocomplete
 		Application.Driver.SendKeys ('e', ConsoleKey.Escape, false, false, false);
 
-		// Suggestion should disapear
+		// Suggestion should disappear
 		tf.Draw ();
 		TestHelpers.AssertDriverContentsAre ("f", output);
 		Assert.Equal ("f", tf.Text);
@@ -106,8 +107,9 @@ public class AppendAutocompleteTests {
 		Assert.NotSame (tf, Application.Top.Focused);
 	}
 
-	[Fact] [AutoInitShutdown]
-	public void TestAutoAppend_AfterCloseKey_ReapearsOnLetter ()
+	[Fact]
+	[AutoInitShutdown]
+	public void TestAutoAppend_AfterCloseKey_ReappearsOnLetter ()
 	{
 		var tf = GetTextFieldsInViewSuggesting ("fish");
 
@@ -119,22 +121,23 @@ public class AppendAutocompleteTests {
 		Assert.Equal ("f", tf.Text);
 
 		// When cancelling autocomplete
-		Application.Driver.SendKeys ('e', ConsoleKey.Escape, false, false, false);
+		Application.Driver.SendKeys ('\0', ConsoleKey.Escape, false, false, false);
 
-		// Suggestion should disapear
+		// Suggestion should disappear
 		tf.Draw ();
 		TestHelpers.AssertDriverContentsAre ("f", output);
 		Assert.Equal ("f", tf.Text);
 
-		// Should reapear when you press next letter
+		// Should reappear when you press next letter
 		Application.Driver.SendKeys ('i', ConsoleKey.I, false, false, false);
 		tf.Draw ();
-		// BUGBUG: v2 - I broke this test and don't have time to figure out why. @tznind - help!
-		//TestHelpers.AssertDriverContentsAre ("fish", output);
+		tf.PositionCursor ();
+		TestHelpers.AssertDriverContentsAre ("fish", output);
 		Assert.Equal ("fi", tf.Text);
 	}
 
-	[Theory] [AutoInitShutdown]
+	[Theory]
+	[AutoInitShutdown]
 	[InlineData ("ffffffffffffffffffffffffff", "ffffffffff")]
 	[InlineData ("f234567890", "f234567890")]
 	[InlineData ("fisérables", "fisérables")]
@@ -150,7 +153,8 @@ public class AppendAutocompleteTests {
 		Assert.Equal ("f", tf.Text);
 	}
 
-	[Theory] [AutoInitShutdown]
+	[Theory]
+	[AutoInitShutdown]
 	[InlineData (ConsoleKey.UpArrow)]
 	[InlineData (ConsoleKey.DownArrow)]
 	public void TestAutoAppend_CycleSelections (ConsoleKey cycleKey)
@@ -180,7 +184,8 @@ public class AppendAutocompleteTests {
 		Assert.Equal ("f", tf.Text);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void TestAutoAppend_NoRender_WhenNoMatch ()
 	{
 		var tf = GetTextFieldsInViewSuggesting ("fish");
@@ -199,7 +204,8 @@ public class AppendAutocompleteTests {
 		Assert.Equal ("fx", tf.Text);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void TestAutoAppend_NoRender_WhenCursorNotAtEnd ()
 	{
 		var tf = GetTextFieldsInViewSuggesting ("fish");

UnitTests/Views/ButtonTests.cs

@@ -659,7 +659,7 @@ namespace Terminal.Gui.ViewsTests {
 				args = e;
 
 			};
-			
+
 			btn.HotKey = KeyCode.R;
 			Assert.Same (btn, sender);
 			Assert.Equal (KeyCode.Null, args.OldKey);

UnitTests/Views/CheckBoxTests.cs

@@ -68,13 +68,13 @@ namespace Terminal.Gui.ViewsTests {
 			Assert.False (ckb.Checked);
 			Assert.False (toggled);
 			Assert.Equal (KeyCode.Null, ckb.HotKey);
-			
+
 			ckb.Text = "Test";
 			Assert.Equal (KeyCode.T, ckb.HotKey);
 			Assert.True (Application.Top.NewKeyDownEvent (new (KeyCode.T)));
 			Assert.True (ckb.Checked);
 			Assert.True (toggled);
-			
+
 			ckb.Text = "T_est";
 			toggled = false;
 			Assert.Equal (KeyCode.E, ckb.HotKey);
@@ -139,53 +139,52 @@ namespace Terminal.Gui.ViewsTests {
 			checkBox.Checked = true;
 			Assert.Equal ($"{CM.Glyphs.Checked} Check this out 你", checkBox.TextFormatter.Text);
 
-			//checkBox.AutoSize = false;
+			checkBox.AutoSize = false;
+			checkBox.AutoSize = false;
 			// It isn't auto-size so the height is guaranteed by the SetMinWidthHeight
-			//checkBox.Text = "Check this out 你 changed";
-			//Application.RunMainLoopIteration (ref runstate, ref first);
+			checkBox.Text = "Check this out 你 changed";
+			var firstIteration = false;
+			Application.RunIteration (ref runstate, ref firstIteration);
 			// BUGBUG - v2 - Autosize is busted; disabling tests for now
-//			Assert.Equal (new Rect (1, 1, 19, 1), checkBox.Frame);
-//			expected = @"
-//┌┤Test Demo 你├──────────────┐
-//│                            │
-//│ √ Check this out 你        │
-//│                            │
-//└────────────────────────────┘
-//";
-
-//			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-//			Assert.Equal (new Rect (0, 0, 30, 5), pos);
-
-//			checkBox.Width = 19;
-//			// It isn't auto-size so the height is guaranteed by the SetMinWidthHeight
-//			checkBox.Text = "Check this out 你 changed";
-//			Application.RunMainLoopIteration (ref runstate, ref first);
-//			Assert.False (checkBox.AutoSize);
-//			Assert.Equal (new Rect (1, 1, 19, 1), checkBox.Frame);
-//			expected = @"
-//┌┤Test Demo 你├──────────────┐
-//│                            │
-//│ √ Check this out 你        │
-//│                            │
-//└────────────────────────────┘
-//";
-
-//			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-//			Assert.Equal (new Rect (0, 0, 30, 5), pos);
-
-//			checkBox.AutoSize = true;
-//			Application.RunMainLoopIteration (ref runstate, ref first);
-//			Assert.Equal (new Rect (1, 1, 27, 1), checkBox.Frame);
-//			expected = @"
-//┌┤Test Demo 你├──────────────┐
-//│                            │
-//│ √ Check this out 你 changed│
-//│                            │
-//└────────────────────────────┘
-//";
-
-//			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
-//			Assert.Equal (new Rect (0, 0, 30, 5), pos);
+			Assert.Equal (new Rect (1, 1, 19, 1), checkBox.Frame);
+			var expected = @"
+┌┤Test Demo 你├──────────────┐
+│                            │
+│ ☑ Check this out 你        │
+│                            │
+└────────────────────────────┘";
+
+			var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
+			Assert.Equal (new Rect (0, 0, 30, 5), pos);
+
+			checkBox.Width = 19;
+			// It isn't auto-size so the height is guaranteed by the SetMinWidthHeight
+			checkBox.Text = "Check this out 你 changed";
+			Application.RunIteration (ref runstate, ref firstIteration);
+			Assert.False (checkBox.AutoSize);
+			Assert.Equal (new Rect (1, 1, 19, 1), checkBox.Frame);
+			expected = @"
+┌┤Test Demo 你├──────────────┐
+│                            │
+│ ☑ Check this out 你        │
+│                            │
+└────────────────────────────┘";
+
+			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
+			Assert.Equal (new Rect (0, 0, 30, 5), pos);
+
+			checkBox.AutoSize = true;
+			Application.RunIteration (ref runstate, ref firstIteration);
+			Assert.Equal (new Rect (1, 1, 27, 1), checkBox.Frame);
+			expected = @"
+┌┤Test Demo 你├──────────────┐
+│                            │
+│ ☑ Check this out 你 changed│
+│                            │
+└────────────────────────────┘";
+
+			pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
+			Assert.Equal (new Rect (0, 0, 30, 5), pos);
 		}
 
 		[Fact, AutoInitShutdown]

UnitTests/Views/ContextMenuTests.cs

@@ -302,7 +302,7 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Begin (Application.Top);
 
 			Assert.Equal (new Rect (70, 24, 10, 1), view.Frame);
-			Assert.Equal (new Point (0, 0), cm.Position);
+			//Assert.Equal (new Point (0, 0), cm.Position);
 
 			cm.Show ();
 			Assert.Equal (new Point (70, 24), cm.Position);
@@ -993,7 +993,7 @@ namespace Terminal.Gui.ViewsTests {
 
 			Assert.Equal (new Rect (0, 0, 20, 15), Application.Driver.Clip);
 			TestHelpers.AssertDriverContentsWithFrameAre ("", output);
-			
+
 			// Don't use Dialog here as it has more layout logic. Use Window instead.
 			var dialog = new Window () { X = 2, Y = 2, Width = 15, Height = 4 };
 			dialog.Add (new TextField ("Test") { X = Pos.Center (), Width = 10 });

UnitTests/Views/HexViewTests.cs

@@ -51,6 +51,8 @@ namespace Terminal.Gui.ViewsTests {
 				Width = 20,
 				Height = 20
 			};
+			// Needed because HexView relies on LayoutComplete to calc sizes
+			hv.LayoutSubviews ();
 
 			Assert.Empty (hv.Edits);
 			hv.AllowEdits = false;
@@ -88,6 +90,8 @@ namespace Terminal.Gui.ViewsTests {
 				Width = 20,
 				Height = 20
 			};
+			// Needed because HexView relies on LayoutComplete to calc sizes
+			hv.LayoutSubviews ();
 
 			Assert.Equal (0, hv.DisplayStart);
 
@@ -105,8 +109,11 @@ namespace Terminal.Gui.ViewsTests {
 		public void Edited_Event ()
 		{
 			var hv = new HexView (LoadStream (true)) { Width = 20, Height = 20 };
+			// Needed because HexView relies on LayoutComplete to calc sizes
+			hv.LayoutSubviews ();
+
 			KeyValuePair<long, byte> keyValuePair = default;
-			hv.Edited += (s,e) => keyValuePair = new KeyValuePair<long, byte>(e.Position,e.NewValue);
+			hv.Edited += (s, e) => keyValuePair = new KeyValuePair<long, byte> (e.Position, e.NewValue);
 
 			Assert.True (hv.NewKeyDownEvent (new (KeyCode.D4)));
 			Assert.True (hv.NewKeyDownEvent (new (KeyCode.D6)));
@@ -120,6 +127,9 @@ namespace Terminal.Gui.ViewsTests {
 		public void DiscardEdits_Method ()
 		{
 			var hv = new HexView (LoadStream (true)) { Width = 20, Height = 20 };
+			// Needed because HexView relies on LayoutComplete to calc sizes
+			hv.LayoutSubviews ();
+
 			Assert.True (hv.NewKeyDownEvent (new (KeyCode.D4)));
 			Assert.True (hv.NewKeyDownEvent (new (KeyCode.D1)));
 			Assert.Single (hv.Edits);
@@ -135,6 +145,8 @@ namespace Terminal.Gui.ViewsTests {
 		public void Position_Using_Encoding_Unicode ()
 		{
 			var hv = new HexView (LoadStream (true)) { Width = 20, Height = 20 };
+			// Needed because HexView relies on LayoutComplete to calc sizes
+			hv.LayoutSubviews ();
 			Assert.Equal (126, hv.Source.Length);
 			Assert.Equal (126, hv.Source.Position);
 			Assert.Equal (1, hv.Position);
@@ -166,6 +178,8 @@ namespace Terminal.Gui.ViewsTests {
 		public void Position_Using_Encoding_Default ()
 		{
 			var hv = new HexView (LoadStream ()) { Width = 20, Height = 20 };
+			// Needed because HexView relies on LayoutComplete to calc sizes
+			hv.LayoutSubviews ();
 			Assert.Equal (63, hv.Source.Length);
 			Assert.Equal (63, hv.Source.Position);
 			Assert.Equal (1, hv.Position);
@@ -376,6 +390,9 @@ namespace Terminal.Gui.ViewsTests {
 			original.CopyTo (copy);
 			copy.Flush ();
 			var hv = new HexView (copy) { Width = Dim.Fill (), Height = Dim.Fill () };
+			// Needed because HexView relies on LayoutComplete to calc sizes
+			hv.LayoutSubviews ();
+
 			byte [] readBuffer = new byte [hv.Source.Length];
 			hv.Source.Position = 0;
 			hv.Source.Read (readBuffer);

UnitTests/Views/MenuBarTests.cs

@@ -2755,4 +2755,58 @@ wo
 		var exception = Record.Exception (() => Assert.True (menu.NewKeyDownEvent (new Key (KeyCode.AltMask | KeyCode.Q))));
 		Assert.Null (exception);
 	}
+
+	[Fact]
+	public void RemoveAndThenAddMenuBar_ShouldNotChangeWidth ()
+	{
+		MenuBar menuBar;
+		MenuBar menuBar2;
+
+		// TODO: When https: //github.com/gui-cs/Terminal.Gui/issues/3136 is fixed, 
+		// TODO: Change this to Window
+		var w = new View ();
+		menuBar2 = new Terminal.Gui.MenuBar ();
+		menuBar = new Terminal.Gui.MenuBar ();
+		w.Width = Dim.Fill (0);
+		w.Height = Dim.Fill (0);
+		w.X = 0;
+		w.Y = 0;
+
+		w.Visible = true;
+		// TODO: When https: //github.com/gui-cs/Terminal.Gui/issues/3136 is fixed, 
+		// TODO: uncomment this.
+		//w.Modal = false;
+		w.Title = "";
+		menuBar.Width = Dim.Fill (0);
+		menuBar.Height = 1;
+		menuBar.X = 0;
+		menuBar.Y = 0;
+		menuBar.Visible = true;
+		w.Add (menuBar);
+
+		menuBar2.Width = Dim.Fill (0);
+		menuBar2.Height = 1;
+		menuBar2.X = 0;
+		menuBar2.Y = 4;
+		menuBar2.Visible = true;
+		w.Add (menuBar2);
+
+
+		var menuBars = w.Subviews.OfType<MenuBar> ().ToArray ();
+		Assert.Equal (2, menuBars.Length);
+
+		Assert.Equal (Dim.Fill (0), menuBars [0].Width);
+		Assert.Equal (Dim.Fill (0), menuBars [1].Width);
+
+		// Goes wrong here
+		w.Remove (menuBar);
+		w.Remove (menuBar2);
+
+		w.Add (menuBar);
+		w.Add (menuBar2);
+
+		// These assertions fail
+		Assert.Equal (Dim.Fill (0), menuBars [0].Width);
+		Assert.Equal (Dim.Fill (0), menuBars [1].Width);
+	}
 }

UnitTests/Views/RadioGroupTests.cs

@@ -16,42 +16,42 @@ public class RadioGroupTests {
 		var rg = new RadioGroup ();
 		Assert.True (rg.CanFocus);
 		Assert.Empty (rg.RadioLabels);
-		Assert.Null (rg.X);
-		Assert.Null (rg.Y);
-		Assert.Null (rg.Width);
-		Assert.Null (rg.Height);
 		Assert.Equal (Rect.Empty, rg.Frame);
 		Assert.Equal (0, rg.SelectedItem);
 
 		rg = new RadioGroup (new string [] { "Test" });
 		Assert.True (rg.CanFocus);
 		Assert.Single (rg.RadioLabels);
-		Assert.Null (rg.X);
-		Assert.Null (rg.Y);
-		Assert.Null (rg.Width);
-		Assert.Null (rg.Height);
 		Assert.Equal (new Rect (0, 0, 0, 0), rg.Frame);
 		Assert.Equal (0, rg.SelectedItem);
 
-		rg = new RadioGroup (new Rect (1, 2, 20, 5), new string [] { "Test" });
+		rg = new RadioGroup (new string [] { "Test" }) {
+			X = 1,
+			Y = 2,
+			Width = 20,
+			Height = 5,
+		};
 		Assert.True (rg.CanFocus);
 		Assert.Single (rg.RadioLabels);
-		Assert.Equal (LayoutStyle.Absolute, rg.LayoutStyle);
-		Assert.Null (rg.X);
-		Assert.Null (rg.Y);
-		Assert.Null (rg.Width);
-		Assert.Null (rg.Height);
 		Assert.Equal (new Rect (1, 2, 20, 5), rg.Frame);
 		Assert.Equal (0, rg.SelectedItem);
 
-		rg = new RadioGroup (1, 2, new string [] { "Test" });
+		rg = new RadioGroup (new string [] { "Test" }) {
+			X = 1,
+			Y = 2,
+		};
+
+		var view = new View () {
+			Width = 30,
+			Height = 40,
+		};
+		view.Add (rg);
+		view.BeginInit ();
+		view.EndInit ();
+		view.LayoutSubviews ();
+
 		Assert.True (rg.CanFocus);
 		Assert.Single (rg.RadioLabels);
-		Assert.Equal (LayoutStyle.Absolute, rg.LayoutStyle);
-		Assert.Null (rg.X);
-		Assert.Null (rg.Y);
-		Assert.Null (rg.Width);
-		Assert.Null (rg.Height);
 		Assert.Equal (new Rect (1, 2, 6, 1), rg.Frame);
 		Assert.Equal (0, rg.SelectedItem);
 	}
@@ -66,7 +66,7 @@ public class RadioGroupTests {
 	}
 
 	[Fact, AutoInitShutdown]
-	public void DisplayMode_Width_Height_Vertical_Horizontal_Space ()
+	public void Orientation_Width_Height_Vertical_Horizontal_Space ()
 	{
 		var rg = new RadioGroup (new string [] { "Test", "New Test 你" });
 		var win = new Window () {
@@ -79,7 +79,7 @@ public class RadioGroupTests {
 		Application.Begin (Application.Top);
 		((FakeDriver)Application.Driver).SetBufferSize (30, 5);
 
-		Assert.Equal (DisplayModeLayout.Vertical, rg.DisplayMode);
+		Assert.Equal (Orientation.Vertical, rg.Orientation);
 		Assert.Equal (2, rg.RadioLabels.Length);
 		Assert.Equal (0, rg.X);
 		Assert.Equal (0, rg.Y);
@@ -96,10 +96,10 @@ public class RadioGroupTests {
 		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
 		Assert.Equal (new Rect (0, 0, 30, 5), pos);
 
-		rg.DisplayMode = DisplayModeLayout.Horizontal;
+		rg.Orientation = Orientation.Horizontal;
 		Application.Refresh ();
 
-		Assert.Equal (DisplayModeLayout.Horizontal, rg.DisplayMode);
+		Assert.Equal (Orientation.Horizontal, rg.Orientation);
 		Assert.Equal (2, rg.HorizontalSpace);
 		Assert.Equal (0, rg.X);
 		Assert.Equal (0, rg.Y);
@@ -120,7 +120,7 @@ public class RadioGroupTests {
 		rg.HorizontalSpace = 4;
 		Application.Refresh ();
 
-		Assert.Equal (DisplayModeLayout.Horizontal, rg.DisplayMode);
+		Assert.Equal (Orientation.Horizontal, rg.Orientation);
 		Assert.Equal (4, rg.HorizontalSpace);
 		Assert.Equal (0, rg.X);
 		Assert.Equal (0, rg.Y);

UnitTests/Views/ScrollViewTests.cs

@@ -16,14 +16,10 @@ namespace Terminal.Gui.ViewsTests {
 		public void Constructors_Defaults ()
 		{
 			var sv = new ScrollView ();
-			Assert.Equal (LayoutStyle.Computed, sv.LayoutStyle);
+			Assert.Equal (LayoutStyle.Absolute, sv.LayoutStyle);
 			Assert.True (sv.CanFocus);
 			Assert.Equal (new Rect (0, 0, 0, 0), sv.Frame);
 			Assert.Equal (Rect.Empty, sv.Frame);
-			Assert.Null (sv.X);
-			Assert.Null (sv.Y);
-			Assert.Null (sv.Width);
-			Assert.Null (sv.Height);
 			Assert.Equal (Point.Empty, sv.ContentOffset);
 			Assert.Equal (Size.Empty, sv.ContentSize);
 			Assert.True (sv.AutoHideScrollBars);
@@ -33,10 +29,6 @@ namespace Terminal.Gui.ViewsTests {
 			Assert.Equal (LayoutStyle.Absolute, sv.LayoutStyle);
 			Assert.True (sv.CanFocus);
 			Assert.Equal (new Rect (1, 2, 20, 10), sv.Frame);
-			Assert.Null (sv.X);
-			Assert.Null (sv.Y);
-			Assert.Null (sv.Width);
-			Assert.Null (sv.Height);
 			Assert.Equal (Point.Empty, sv.ContentOffset);
 			Assert.Equal (Size.Empty, sv.ContentSize);
 			Assert.True (sv.AutoHideScrollBars);
@@ -196,6 +188,8 @@ namespace Terminal.Gui.ViewsTests {
 			Application.Top.Add (sv);
 			Application.Begin (Application.Top);
 
+			Assert.Equal (new Rect (0, 0, 10, 10), sv.Bounds);
+
 			Assert.False (sv.AutoHideScrollBars);
 			Assert.True (sv.ShowHorizontalScrollIndicator);
 			Assert.True (sv.ShowVerticalScrollIndicator);
@@ -214,7 +208,9 @@ namespace Terminal.Gui.ViewsTests {
 ", output);
 
 			sv.ShowHorizontalScrollIndicator = false;
+			Assert.Equal (new Rect (0, 0, 10, 10), sv.Bounds);
 			sv.ShowVerticalScrollIndicator = true;
+			Assert.Equal (new Rect (0, 0, 10, 10), sv.Bounds);
 
 			Assert.False (sv.AutoHideScrollBars);
 			Assert.False (sv.ShowHorizontalScrollIndicator);
@@ -228,6 +224,7 @@ namespace Terminal.Gui.ViewsTests {
          │
          │
          │
+         │
          ┴
          ▼
 ", output);
@@ -249,7 +246,7 @@ namespace Terminal.Gui.ViewsTests {
          
          
          
-◄├─────┤► 
+◄├──────┤► 
 ", output);
 
 			sv.ShowHorizontalScrollIndicator = false;
@@ -373,235 +370,234 @@ namespace Terminal.Gui.ViewsTests {
 ", output);
 		}
 
-		// BUGBUG: v2 - I can't figure out what this test is trying to test and it fails in weird ways
-		// Disabling for now
-		//[Fact, AutoInitShutdown]
-		//public void Frame_And_Labels_Does_Not_Overspill_ScrollView ()
-		//{
-		//	var sv = new ScrollView {
-		//		X = 3,
-		//		Y = 3,
-		//		Width = 10,
-		//		Height = 10,
-		//		ContentSize = new Size (50, 50)
-		//	};
-		//	for (int i = 0; i < 8; i++) {
-		//		sv.Add (new CustomButton ("█", $"Button {i}", 20, 3) { Y = i * 3 });
-		//	}
-		//	Application.Top.Add (sv);
-		//	Application.Begin (Application.Top);
-
-		//	TestHelpers.AssertDriverContentsWithFrameAre (@"
-		// █████████▲
-		// ██████But┬
-		// █████████┴
-		// ┌────────░
-		// │     But░
-		// └────────░
-		// ┌────────░
-		// │     But░
-		// └────────▼
-		// ◄├┤░░░░░► ", output);
-
-		//	sv.ContentOffset = new Point (5, 5);
-		//	sv.LayoutSubviews ();
-		//	Application.Refresh ();
-		//	TestHelpers.AssertDriverContentsWithFrameAre (@"
-		// ─────────▲
-		// ─────────┬
-		//  Button 2│
-		// ─────────┴
-		// ─────────░
-		//  Button 3░
-		// ─────────░
-		// ─────────░
-		//  Button 4▼
-		// ◄├─┤░░░░► ", output);
-		//}
-
-		//private class CustomButton : FrameView {
-		//	private Label labelFill;
-		//	private Label labelText;
-
-		//	public CustomButton (string fill, string text, int width, int height) : base ()
-		//	{
-		//		Width = width;
-		//		Height = height;
-		//		labelFill = new Label () { AutoSize = false, X = Pos.Center (), Y = Pos.Center (), Width = Dim.Fill (), Height = Dim.Fill (), Visible = false };
-		//		labelFill.LayoutComplete += (s, e) => {
-		//			var fillText = new System.Text.StringBuilder ();
-		//			for (int i = 0; i < labelFill.Bounds.Height; i++) {
-		//				if (i > 0) {
-		//					fillText.AppendLine ("");
-		//				}
-		//				for (int j = 0; j < labelFill.Bounds.Width; j++) {
-		//					fillText.Append (fill);
-		//				}
-		//			}
-		//			labelFill.Text = fillText;
-		//		};
-
-		//		labelText = new Label (text) { X = Pos.Center (), Y = Pos.Center () };
-		//		Add (labelFill, labelText);
-		//		CanFocus = true;
-		//	}
-
-		//	public override bool OnEnter (View view)
-		//	{
-		//		Border.BorderStyle = BorderStyle.None;
-		//		Border.DrawMarginFrame = false;
-		//		labelFill.Visible = true;
-		//		view = this;
-		//		return base.OnEnter (view);
-		//	}
-
-		//	public override bool OnLeave (View view)
-		//	{
-		//		Border.BorderStyle = BorderStyle.Single;
-		//		Border.DrawMarginFrame = true;
-		//		labelFill.Visible = false;
-		//		if (view == null)
-		//			view = this;
-		//		return base.OnLeave (view);
-		//	}
-		//}
-
-		// BUGBUG: Broke this test with #2483 - @bdisp I need your help figuring out why
-//		[Fact, AutoInitShutdown]
-//		public void Clear_Window_Inside_ScrollView ()
-//		{
-//			var topLabel = new Label ("At 15,0") { X = 15 };
-//			var sv = new ScrollView {
-//				X = 3,
-//				Y = 3,
-//				Width = 10,
-//				Height = 10,
-//				ContentSize = new Size (23, 23),
-//				KeepContentAlwaysInViewport = false
-//			};
-//			var bottomLabel = new Label ("At 15,15") { X = 15, Y = 15 };
-//			Application.Top.Add (topLabel, sv, bottomLabel);
-//			Application.Begin (Application.Top);
-
-//			TestHelpers.AssertDriverContentsWithFrameAre (@"
-//               At 15,0 
+		// There still have an issue with lower right corner of the scroll view
+		[Fact, AutoInitShutdown]
+		public void Frame_And_Labels_Does_Not_Overspill_ScrollView ()
+		{
+			var sv = new ScrollView {
+				X = 3,
+				Y = 3,
+				Width = 10,
+				Height = 10,
+				ContentSize = new Size (50, 50)
+			};
+			for (int i = 0; i < 8; i++) {
+				sv.Add (new CustomButton ("█", $"Button {i}", 20, 3) { Y = i * 3 });
+			}
+			Application.Top.Add (sv);
+			Application.Begin (Application.Top);
+
+			TestHelpers.AssertDriverContentsWithFrameAre (@"
+   █████████▲
+   ██████But┬
+   █████████┴
+   ┌────────░
+   │     But░
+   └────────░
+   ┌────────░
+   │     But░
+   └────────▼
+   ◄├┤░░░░░►─", output);
+
+			sv.ContentOffset = new Point (5, 5);
+			sv.LayoutSubviews ();
+			Application.Refresh ();
+			TestHelpers.AssertDriverContentsWithFrameAre (@"
+   ─────────▲
+   ─────────┬
+    Button 2│
+   ─────────┴
+   ─────────░
+    Button 3░
+   ─────────░
+   ─────────░
+    Button 4▼
+   ◄├─┤░░░░►─", output);
+		}
+
+		private class CustomButton : FrameView {
+			private Label labelFill;
+			private Label labelText;
+
+			public CustomButton (string fill, string text, int width, int height) : base ()
+			{
+				Width = width;
+				Height = height;
+				//labelFill = new Label () { AutoSize = false, X = Pos.Center (), Y = Pos.Center (), Width = Dim.Fill (), Height = Dim.Fill (), Visible = false };
+				labelFill = new Label () { AutoSize = false, Width = Dim.Fill (), Height = Dim.Fill (), Visible = false };
+				labelFill.LayoutComplete += (s, e) => {
+					var fillText = new System.Text.StringBuilder ();
+					for (int i = 0; i < labelFill.Bounds.Height; i++) {
+						if (i > 0) {
+							fillText.AppendLine ("");
+						}
+						for (int j = 0; j < labelFill.Bounds.Width; j++) {
+							fillText.Append (fill);
+						}
+					}
+					labelFill.Text = fillText.ToString ();
+				};
+
+				labelText = new Label (text) { X = Pos.Center (), Y = Pos.Center () };
+				Add (labelFill, labelText);
+				CanFocus = true;
+			}
+
+			public override bool OnEnter (View view)
+			{
+				Border.BorderStyle = LineStyle.None;
+				Border.Thickness = new Thickness (0);
+				labelFill.Visible = true;
+				view = this;
+				return base.OnEnter (view);
+			}
+
+			public override bool OnLeave (View view)
+			{
+				Border.BorderStyle = LineStyle.Single;
+				Border.Thickness = new Thickness (1);
+				labelFill.Visible = false;
+				if (view == null)
+					view = this;
+				return base.OnLeave (view);
+			}
+		}
+		// There are still issue with the lower right corner of the scroll view
+		[Fact, AutoInitShutdown]
+		public void Clear_Window_Inside_ScrollView ()
+		{
+			var topLabel = new Label ("At 15,0") { X = 15 };
+			var sv = new ScrollView {
+				X = 3,
+				Y = 3,
+				Width = 10,
+				Height = 10,
+				ContentSize = new Size (23, 23),
+				KeepContentAlwaysInViewport = false
+			};
+			var bottomLabel = new Label ("At 15,15") { X = 15, Y = 15 };
+			Application.Top.Add (topLabel, sv, bottomLabel);
+			Application.Begin (Application.Top);
+
+			TestHelpers.AssertDriverContentsWithFrameAre (@"
+               At 15,0 
                        
                        
-//            ▲          
-//            ┬          
-//            ┴          
-//            ░          
-//            ░          
-//            ░          
-//            ░          
-//            ░          
-//            ▼          
-//   ◄├┤░░░░░►           
+            ▲          
+            ┬          
+            ┴          
+            ░          
+            ░          
+            ░          
+            ░          
+            ░          
+            ▼          
+   ◄├┤░░░░░►           
                        
                        
-//               At 15,15", output);
-
-//			var attributes = new Attribute [] {
-//				Colors.TopLevel.Normal,
-//				Colors.TopLevel.Focus,
-//				Colors.Base.Normal
-//			};
-
-//			TestHelpers.AssertDriverColorsAre (@"
-//00000000000000000000000
-//00000000000000000000000
-//00000000000000000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00011111111110000000000
-//00000000000000000000000
-//00000000000000000000000
-//00000000000000000000000", attributes);
-
-//			sv.Add (new Window { X = 3, Y = 3, Width = 20, Height = 20 });
-
-//			Application.Refresh ();
-//			TestHelpers.AssertDriverContentsWithFrameAre (@"
-//               At 15,0 
+               At 15,15", output);
+
+			var attributes = new Attribute [] {
+						Colors.TopLevel.Normal,
+						Colors.TopLevel.Focus,
+						Colors.Base.Normal
+					};
+
+			TestHelpers.AssertDriverColorsAre (@"
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00011111111100000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000", null, attributes);
+
+			sv.Add (new Window { X = 3, Y = 3, Width = 20, Height = 20 });
+
+			Application.Refresh ();
+			TestHelpers.AssertDriverContentsWithFrameAre (@"
+               At 15,0 
                        
                        
-//            ▲          
-//            ┬          
-//            ┴          
-//      ┌─────░          
-//      │     ░          
-//      │     ░          
-//      │     ░          
-//      │     ░          
-//      │     ▼          
-//   ◄├┤░░░░░►           
+            ▲          
+            ┬          
+            ┴          
+      ┌─────░          
+      │     ░          
+      │     ░          
+      │     ░          
+      │     ░          
+      │     ▼          
+   ◄├┤░░░░░►           
                        
                        
-//               At 15,15", output);
-
-//			TestHelpers.AssertDriverColorsAre (@"
-//00000000000000000000000
-//00000000000000000000000
-//00000000000000000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000022222210000000000
-//00000022222210000000000
-//00000022222210000000000
-//00000022222210000000000
-//00000022222210000000000
-//00000022222210000000000
-//00011111111110000000000
-//00000000000000000000000
-//00000000000000000000000
-//00000000000000000000000", attributes);
-
-//			sv.ContentOffset = new Point (20, 20);
-//			Application.Refresh ();
-//			TestHelpers.AssertDriverContentsWithFrameAre (@"
-//               At 15,0 
+               At 15,15", output);
+
+			TestHelpers.AssertDriverColorsAre (@"
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00000022222210000000000
+00000022222210000000000
+00000022222210000000000
+00000022222210000000000
+00000022222210000000000
+00000022222210000000000
+00011111111120000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000", null, attributes);
+
+			sv.ContentOffset = new Point (20, 20);
+			Application.Refresh ();
+			TestHelpers.AssertDriverContentsWithFrameAre (@"
+               At 15,0 
                        
                        
-//     │      ▲          
-//     │      ░          
-//   ──┘      ░          
-//            ░          
-//            ░          
-//            ┬          
-//            │          
-//            ┴          
-//            ▼          
-//   ◄░░░░├─┤►           
+     │      ▲          
+     │      ░          
+   ──┘      ░          
+            ░          
+            ░          
+            ┬          
+            │          
+            ┴          
+            ▼          
+   ◄░░░░├─┤►           
                        
                        
-//               At 15,15", output);
-
-//			TestHelpers.AssertDriverColorsAre (@"
-//00000000000000000000000
-//00000000000000000000000
-//00000000000000000000000
-//00022200000010000000000
-//00022200000010000000000
-//00022200000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00000000000010000000000
-//00011111111110000000000
-//00000000000000000000000
-//00000000000000000000000
-//00000000000000000000000", attributes);
-//		}
+               At 15,15", output);
+
+			TestHelpers.AssertDriverColorsAre (@"
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00022200000010000000000
+00022200000010000000000
+00022200000010000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00000000000010000000000
+00011111111100000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000", null, attributes);
+		}
 
 		[Fact, AutoInitShutdown]
 		public void DrawTextFormatter_Respects_The_Clip_Bounds ()

UnitTests/Views/TextViewTests.cs

@@ -6200,6 +6200,7 @@ This is the second line.
 ", _output);
 
 		((FakeDriver)Application.Driver).SetBufferSize (6, 25);
+		tv.SetRelativeLayout (Application.Driver.Bounds);
 		tv.Draw ();
 		Assert.Equal (new Point (4, 2), tv.CursorPosition);
 		Assert.Equal (new Point (12, 0), cp);

UnitTests/Views/ToplevelTests.cs

@@ -5,9 +5,9 @@ using Xunit.Abstractions;
 namespace Terminal.Gui.ViewsTests;
 
 public class ToplevelTests {
-	readonly ITestOutputHelper output;
+	readonly ITestOutputHelper _output;
 
-	public ToplevelTests (ITestOutputHelper output) => this.output = output;
+	public ToplevelTests (ITestOutputHelper output) => _output = output;
 
 	[Fact]
 	[AutoInitShutdown]
@@ -26,15 +26,6 @@ public class ToplevelTests {
 		Assert.False (top.IsOverlapped);
 	}
 
-	[Fact]
-	[AutoInitShutdown]
-	public void Create_Toplevel ()
-	{
-		var top = Toplevel.Create ();
-		top.BeginInit ();
-		top.EndInit ();
-		Assert.Equal (new Rect (0, 0, Application.Driver.Cols, Application.Driver.Rows), top.Bounds);
-	}
 
 #if BROKE_IN_2927
 		// BUGBUG: The name of this test does not match what it does. 
@@ -157,7 +148,7 @@ public class ToplevelTests {
 	{
 		var top = new Toplevel ();
 
-		string eventInvoked = "";
+		var eventInvoked = "";
 
 		top.ChildUnloaded += (s, e) => eventInvoked = "ChildUnloaded";
 		top.OnChildUnloaded (top);
@@ -206,7 +197,7 @@ public class ToplevelTests {
 		Assert.Equal (top, Application.Top);
 
 		// Application.Top without menu and status bar.
-		var supView = top.GetLocationThatFits (top, 2, 2, out int nx, out int ny, out var mb, out var sb);
+		var supView = top.GetLocationThatFits (top, 2, 2, out var nx, out var ny, out var mb, out var sb);
 		Assert.Equal (Application.Top, supView);
 		Assert.Equal (0, nx);
 		Assert.Equal (0, ny);
@@ -251,7 +242,7 @@ public class ToplevelTests {
 		Assert.Null (top.StatusBar);
 		Assert.Null (top.MenuBar);
 
-		var win = new Window () { Width = Dim.Fill (), Height = Dim.Fill () };
+		var win = new Window { Width = Dim.Fill (), Height = Dim.Fill () };
 		top.Add (win);
 		top.LayoutSubviews ();
 
@@ -297,7 +288,7 @@ public class ToplevelTests {
 
 		top.Remove (win);
 
-		win = new Window () { Width = 60, Height = 15 };
+		win = new Window { Width = 60, Height = 15 };
 		top.Add (win);
 
 		// Application.Top without menu and status bar.
@@ -331,12 +322,12 @@ public class ToplevelTests {
 		Assert.Equal (new Rect (0, 1, 60, 15), win.Frame);
 
 		Assert.Null (Toplevel._dragPosition);
-		win.MouseEvent (new MouseEvent () { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed });
+		win.MouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed });
 		Assert.Equal (new Point (6, 0), Toplevel._dragPosition);
-		win.MouseEvent (new MouseEvent () { X = 6, Y = 0, Flags = MouseFlags.Button1Released });
+		win.MouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Released });
 		Assert.Null (Toplevel._dragPosition);
 		win.CanFocus = false;
-		win.MouseEvent (new MouseEvent () { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed });
+		win.MouseEvent (new MouseEvent { X = 6, Y = 0, Flags = MouseFlags.Button1Pressed });
 		Assert.Null (Toplevel._dragPosition);
 	}
 
@@ -344,22 +335,22 @@ public class ToplevelTests {
 	[AutoInitShutdown]
 	public void KeyBindings_Command ()
 	{
-		bool isRunning = false;
+		var isRunning = false;
 
-		var win1 = new Window () { Id = "win1", Width = Dim.Percent (50f), Height = Dim.Fill () };
+		var win1 = new Window { Id = "win1", Width = Dim.Percent (50f), Height = Dim.Fill () };
 		var lblTf1W1 = new Label ("Enter text in TextField on Win1:") { Id = "lblTf1W1" };
 		var tf1W1 = new TextField ("Text1 on Win1") { Id = "tf1W1", X = Pos.Right (lblTf1W1) + 1, Width = Dim.Fill () };
 		var lblTvW1 = new Label ("Enter text in TextView on Win1:") { Id = "lblTvW1", Y = Pos.Bottom (lblTf1W1) + 1 };
-		var tvW1 = new TextView () { Id = "tvW1", X = Pos.Left (tf1W1), Width = Dim.Fill (), Height = 2, Text = "First line Win1\nSecond line Win1" };
+		var tvW1 = new TextView { Id = "tvW1", X = Pos.Left (tf1W1), Width = Dim.Fill (), Height = 2, Text = "First line Win1\nSecond line Win1" };
 		var lblTf2W1 = new Label ("Enter text in TextField on Win1:") { Id = "lblTf2W1", Y = Pos.Bottom (lblTvW1) + 1 };
 		var tf2W1 = new TextField ("Text2 on Win1") { Id = "tf2W1", X = Pos.Left (tf1W1), Width = Dim.Fill () };
 		win1.Add (lblTf1W1, tf1W1, lblTvW1, tvW1, lblTf2W1, tf2W1);
 
-		var win2 = new Window () { Id = "win2", X = Pos.Right (win1) + 1, Width = Dim.Percent (50f), Height = Dim.Fill () };
+		var win2 = new Window { Id = "win2", X = Pos.Right (win1) + 1, Width = Dim.Percent (50f), Height = Dim.Fill () };
 		var lblTf1W2 = new Label ("Enter text in TextField on Win2:") { Id = "lblTf1W2" };
 		var tf1W2 = new TextField ("Text1 on Win2") { Id = "tf1W2", X = Pos.Right (lblTf1W2) + 1, Width = Dim.Fill () };
 		var lblTvW2 = new Label ("Enter text in TextView on Win2:") { Id = "lblTvW2", Y = Pos.Bottom (lblTf1W2) + 1 };
-		var tvW2 = new TextView () { Id = "tvW2", X = Pos.Left (tf1W2), Width = Dim.Fill (), Height = 2, Text = "First line Win1\nSecond line Win2" };
+		var tvW2 = new TextView { Id = "tvW2", X = Pos.Left (tf1W2), Width = Dim.Fill (), Height = 2, Text = "First line Win1\nSecond line Win2" };
 		var lblTf2W2 = new Label ("Enter text in TextField on Win2:") { Id = "lblTf2W2", Y = Pos.Bottom (lblTvW2) + 1 };
 		var tf2W2 = new TextField ("Text2 on Win2") { Id = "tf2W2", X = Pos.Left (tf1W2), Width = Dim.Fill () };
 		win2.Add (lblTf1W2, tf1W2, lblTvW2, tvW2, lblTf2W2, tf2W2);
@@ -472,22 +463,22 @@ public class ToplevelTests {
 		Application.Begin (top);
 		Assert.Equal (Application.Top, Application.OverlappedTop);
 
-		bool isRunning = true;
+		var isRunning = true;
 
-		var win1 = new Window () { Id = "win1", Width = Dim.Percent (50f), Height = Dim.Fill () };
+		var win1 = new Window { Id = "win1", Width = Dim.Percent (50f), Height = Dim.Fill () };
 		var lblTf1W1 = new Label ("Enter text in TextField on Win1:");
 		var tf1W1 = new TextField ("Text1 on Win1") { X = Pos.Right (lblTf1W1) + 1, Width = Dim.Fill () };
 		var lblTvW1 = new Label ("Enter text in TextView on Win1:") { Y = Pos.Bottom (lblTf1W1) + 1 };
-		var tvW1 = new TextView () { X = Pos.Left (tf1W1), Width = Dim.Fill (), Height = 2, Text = "First line Win1\nSecond line Win1" };
+		var tvW1 = new TextView { X = Pos.Left (tf1W1), Width = Dim.Fill (), Height = 2, Text = "First line Win1\nSecond line Win1" };
 		var lblTf2W1 = new Label ("Enter text in TextField on Win1:") { Y = Pos.Bottom (lblTvW1) + 1 };
 		var tf2W1 = new TextField ("Text2 on Win1") { X = Pos.Left (tf1W1), Width = Dim.Fill () };
 		win1.Add (lblTf1W1, tf1W1, lblTvW1, tvW1, lblTf2W1, tf2W1);
 
-		var win2 = new Window () { Id = "win2", Width = Dim.Percent (50f), Height = Dim.Fill () };
+		var win2 = new Window { Id = "win2", Width = Dim.Percent (50f), Height = Dim.Fill () };
 		var lblTf1W2 = new Label ("Enter text in TextField on Win2:");
 		var tf1W2 = new TextField ("Text1 on Win2") { X = Pos.Right (lblTf1W2) + 1, Width = Dim.Fill () };
 		var lblTvW2 = new Label ("Enter text in TextView on Win2:") { Y = Pos.Bottom (lblTf1W2) + 1 };
-		var tvW2 = new TextView () { X = Pos.Left (tf1W2), Width = Dim.Fill (), Height = 2, Text = "First line Win1\nSecond line Win2" };
+		var tvW2 = new TextView { X = Pos.Left (tf1W2), Width = Dim.Fill (), Height = 2, Text = "First line Win1\nSecond line Win2" };
 		var lblTf2W2 = new Label ("Enter text in TextField on Win2:") { Y = Pos.Bottom (lblTvW2) + 1 };
 		var tf2W2 = new TextField ("Text2 on Win2") { X = Pos.Left (tf1W2), Width = Dim.Fill () };
 		win2.Add (lblTf1W2, tf1W2, lblTvW2, tvW2, lblTf2W2, tf2W2);
@@ -620,7 +611,7 @@ public class ToplevelTests {
 		Key alternateForwardKey = default;
 		Key alternateBackwardKey = default;
 		Key quitKey = default;
-		bool wasAdded = false;
+		var wasAdded = false;
 
 		var view = new View ();
 		view.Added += View_Added;
@@ -707,7 +698,7 @@ public class ToplevelTests {
 		var win = new Window ();
 		var top = Application.Top;
 		top.Add (win);
-		int iterations = -1;
+		var iterations = -1;
 		Window testWindow;
 
 		Application.Iteration += (s, a) => {
@@ -715,7 +706,7 @@ public class ToplevelTests {
 			if (iterations == 0) {
 				((FakeDriver)Application.Driver).SetBufferSize (15, 7);
 				// Don't use MessageBox here; it's too complicated for this unit test; just use Window
-				testWindow = new Window () {
+				testWindow = new Window {
 					Text = "Hello",
 					X = 2,
 					Y = 2,
@@ -725,7 +716,7 @@ public class ToplevelTests {
 				Application.Run (testWindow);
 
 			} else if (iterations == 1) {
-				TestHelpers.AssertDriverContentsWithFrameAre (@$"
+				TestHelpers.AssertDriverContentsWithFrameAre (@"
 ┌─────────────┐
 │             │
 │ ┌────────┐  │
@@ -733,11 +724,11 @@ public class ToplevelTests {
 │ └────────┘  │
 │             │
 └─────────────┘
-", output);
+", _output);
 			} else if (iterations == 2) {
 				Assert.Null (Application.MouseGrabView);
 				// Grab the mouse
-				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 					X = 3,
 					Y = 2,
 					Flags = MouseFlags.Button1Pressed
@@ -749,7 +740,7 @@ public class ToplevelTests {
 			} else if (iterations == 3) {
 				Assert.Equal (Application.Current, Application.MouseGrabView);
 				// Drag to left
-				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 					X = 2,
 					Y = 2,
 					Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -762,20 +753,20 @@ public class ToplevelTests {
 			} else if (iterations == 4) {
 				Assert.Equal (Application.Current, Application.MouseGrabView);
 
-				TestHelpers.AssertDriverContentsWithFrameAre (@$"
+				TestHelpers.AssertDriverContentsWithFrameAre (@"
 ┌─────────────┐
 │             │
 │┌────────┐   │
 ││Hello   │   │
 │└────────┘   │
 │             │
-└─────────────┘", output);
+└─────────────┘", _output);
 
 				Assert.Equal (Application.Current, Application.MouseGrabView);
 			} else if (iterations == 5) {
 				Assert.Equal (Application.Current, Application.MouseGrabView);
 				// Drag up
-				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 					X = 2,
 					Y = 1,
 					Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -788,14 +779,14 @@ public class ToplevelTests {
 			} else if (iterations == 6) {
 				Assert.Equal (Application.Current, Application.MouseGrabView);
 
-				TestHelpers.AssertDriverContentsWithFrameAre (@$"
+				TestHelpers.AssertDriverContentsWithFrameAre (@"
 ┌─────────────┐
 │┌────────┐   │
 ││Hello   │   │
 │└────────┘   │
 │             │
 │             │
-└─────────────┘", output);
+└─────────────┘", _output);
 
 				Assert.Equal (Application.Current, Application.MouseGrabView);
 				Assert.Equal (new Rect (1, 1, 10, 3), Application.MouseGrabView.Frame);
@@ -803,7 +794,7 @@ public class ToplevelTests {
 			} else if (iterations == 7) {
 				Assert.Equal (Application.Current, Application.MouseGrabView);
 				// Ungrab the mouse
-				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 					X = 2,
 					Y = 1,
 					Flags = MouseFlags.Button1Released
@@ -826,7 +817,7 @@ public class ToplevelTests {
 	[AutoInitShutdown]
 	public void Mouse_Drag_On_Top_With_Superview_Not_Null ()
 	{
-		var win = new Window () {
+		var win = new Window {
 			X = 3,
 			Y = 2,
 			Width = 10,
@@ -835,10 +826,10 @@ public class ToplevelTests {
 		var top = Application.Top;
 		top.Add (win);
 
-		int iterations = -1;
+		var iterations = -1;
 
-		int movex = 0;
-		int movey = 0;
+		var movex = 0;
+		var movey = 0;
 
 		var location = new Rect (win.Frame.X, win.Frame.Y, 7, 3);
 
@@ -851,7 +842,7 @@ public class ToplevelTests {
 
 				Assert.Null (Application.MouseGrabView);
 				// Grab the mouse
-				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 					X = win.Frame.X,
 					Y = win.Frame.Y,
 					Flags = MouseFlags.Button1Pressed
@@ -864,7 +855,7 @@ public class ToplevelTests {
 				// Drag to left
 				movex = 1;
 				movey = 0;
-				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 					X = win.Frame.X + movex,
 					Y = win.Frame.Y + movey,
 					Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -884,7 +875,7 @@ public class ToplevelTests {
 				// Drag up
 				movex = 0;
 				movey = -1;
-				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 					X = win.Frame.X + movex,
 					Y = win.Frame.Y + movey,
 					Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -903,7 +894,7 @@ public class ToplevelTests {
 				// Ungrab the mouse
 				movex = 0;
 				movey = 0;
-				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+				Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 					X = win.Frame.X + movex,
 					Y = win.Frame.Y + movey,
 					Flags = MouseFlags.Button1Released
@@ -936,8 +927,8 @@ public class ToplevelTests {
 	[AutoInitShutdown]
 	public void OnEnter_OnLeave_Triggered_On_Application_Begin_End ()
 	{
-		bool isEnter = false;
-		bool isLeave = false;
+		var isEnter = false;
+		var isLeave = false;
 		var v = new View ();
 		v.Enter += (s, _) => isEnter = true;
 		v.Leave += (s, _) => isLeave = true;
@@ -975,10 +966,10 @@ public class ToplevelTests {
 	[AutoInitShutdown]
 	public void OnEnter_OnLeave_Triggered_On_Application_Begin_End_With_More_Toplevels ()
 	{
-		int iterations = 0;
-		int [] steps = new int [5];
-		bool isEnterTop = false;
-		bool isLeaveTop = false;
+		var iterations = 0;
+		var steps = new int [5];
+		var isEnterTop = false;
+		var isLeaveTop = false;
 		var vt = new View ();
 		var top = Application.Top;
 		var diag = new Dialog ();
@@ -1015,8 +1006,8 @@ public class ToplevelTests {
 		Assert.False (isLeaveTop);
 
 		isEnterTop = false;
-		bool isEnterDiag = false;
-		bool isLeaveDiag = false;
+		var isEnterDiag = false;
+		var isLeaveDiag = false;
 		var vd = new View ();
 		vd.Enter += (s, e) => {
 			iterations++;
@@ -1067,7 +1058,7 @@ public class ToplevelTests {
 	public void PositionCursor_SetCursorVisibility_To_Invisible_If_Focused_Is_Null ()
 	{
 		var tf = new TextField ("test") { Width = 5 };
-		var view = new View () { Width = 10, Height = 10 };
+		var view = new View { Width = 10, Height = 10 };
 		view.Add (tf);
 		Application.Top.Add (view);
 		Application.Begin (Application.Top);
@@ -1137,14 +1128,14 @@ public class ToplevelTests {
 	[AutoInitShutdown]
 	public void Toplevel_Inside_ScrollView_MouseGrabView ()
 	{
-		var scrollView = new ScrollView () {
+		var scrollView = new ScrollView {
 			X = 3,
 			Y = 3,
 			Width = 40,
 			Height = 16,
 			ContentSize = new Size (200, 100)
 		};
-		var win = new Window () { X = 3, Y = 3, Width = Dim.Fill (3), Height = Dim.Fill (3) };
+		var win = new Window { X = 3, Y = 3, Width = Dim.Fill (3), Height = Dim.Fill (3) };
 		scrollView.Add (win);
 		var top = Application.Top;
 		top.Add (scrollView);
@@ -1170,9 +1161,9 @@ public class ToplevelTests {
       │                                   ░
       │                                   ░
       │                                   ▼
-   ◄├──────┤░░░░░░░░░░░░░░░░░░░░░░░░░░░░░► ", output);
+   ◄├──────┤░░░░░░░░░░░░░░░░░░░░░░░░░░░░░► ", _output);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 6,
 			Y = 6,
 			Flags = MouseFlags.Button1Pressed
@@ -1180,7 +1171,7 @@ public class ToplevelTests {
 		Assert.Equal (win, Application.MouseGrabView);
 		Assert.Equal (new Rect (3, 3, 194, 94), win.Frame);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 9,
 			Y = 9,
 			Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -1206,9 +1197,9 @@ public class ToplevelTests {
          │                                ░
          │                                ░
          │                                ▼
-   ◄├──────┤░░░░░░░░░░░░░░░░░░░░░░░░░░░░░► ", output);
+   ◄├──────┤░░░░░░░░░░░░░░░░░░░░░░░░░░░░░► ", _output);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 5,
 			Y = 5,
 			Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -1234,16 +1225,16 @@ public class ToplevelTests {
      │                                    ░
      │                                    ░
      │                                    ▼
-   ◄├──────┤░░░░░░░░░░░░░░░░░░░░░░░░░░░░░► ", output);
+   ◄├──────┤░░░░░░░░░░░░░░░░░░░░░░░░░░░░░► ", _output);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 5,
 			Y = 5,
 			Flags = MouseFlags.Button1Released
 		}));
 		Assert.Null (Application.MouseGrabView);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 4,
 			Y = 4,
 			Flags = MouseFlags.ReportMousePosition
@@ -1256,22 +1247,22 @@ public class ToplevelTests {
 	public void Window_Bounds_Bigger_Than_Driver_Cols_And_Rows_Allow_Drag_Beyond_Left_Right_And_Bottom ()
 	{
 		var top = Application.Top;
-		var window = new Window () { Width = 20, Height = 3 };
+		var window = new Window { Width = 20, Height = 3 };
 		Application.Begin (top);
 		((FakeDriver)Application.Driver).SetBufferSize (40, 10);
 		Application.Begin (window);
 		Application.Refresh ();
 		Assert.Equal (new Rect (0, 0, 40, 10), top.Frame);
 		Assert.Equal (new Rect (0, 0, 20, 3), window.Frame);
-		TestHelpers.AssertDriverContentsWithFrameAre (@$"
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
 ┌──────────────────┐
 │                  │
 └──────────────────┘
-", output);
+", _output);
 
 		Assert.Null (Application.MouseGrabView);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 0,
 			Y = 0,
 			Flags = MouseFlags.Button1Pressed
@@ -1279,7 +1270,7 @@ public class ToplevelTests {
 
 		Assert.Equal (window, Application.MouseGrabView);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = -11,
 			Y = -4,
 			Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -1288,15 +1279,15 @@ public class ToplevelTests {
 		Application.Refresh ();
 		Assert.Equal (new Rect (0, 0, 40, 10), top.Frame);
 		Assert.Equal (new Rect (0, 0, 20, 3), window.Frame);
-		TestHelpers.AssertDriverContentsWithFrameAre (@$"
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
 ┌──────────────────┐
 │                  │
 └──────────────────┘
-", output);
+", _output);
 
 		// Changes Top size to same size as Dialog more menu and scroll bar
 		((FakeDriver)Application.Driver).SetBufferSize (20, 3);
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = -1,
 			Y = -1,
 			Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -1305,15 +1296,15 @@ public class ToplevelTests {
 		Application.Refresh ();
 		Assert.Equal (new Rect (0, 0, 20, 3), top.Frame);
 		Assert.Equal (new Rect (0, 0, 20, 3), window.Frame);
-		TestHelpers.AssertDriverContentsWithFrameAre (@$"
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
 ┌──────────────────┐
 │                  │
 └──────────────────┘
-", output);
+", _output);
 
 		// Changes Top size smaller than Dialog size
 		((FakeDriver)Application.Driver).SetBufferSize (19, 2);
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = -1,
 			Y = -1,
 			Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -1322,12 +1313,12 @@ public class ToplevelTests {
 		Application.Refresh ();
 		Assert.Equal (new Rect (0, 0, 19, 2), top.Frame);
 		Assert.Equal (new Rect (-1, 0, 20, 3), window.Frame);
-		TestHelpers.AssertDriverContentsWithFrameAre (@$"
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
 ──────────────────┐
                   │
-", output);
+", _output);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 18,
 			Y = 1,
 			Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -1337,10 +1328,10 @@ public class ToplevelTests {
 		Assert.Equal (new Rect (0, 0, 19, 2), top.Frame);
 		Assert.Equal (new Rect (18, 1, 20, 3), window.Frame);
 		TestHelpers.AssertDriverContentsWithFrameAre (@"
-                  ┌", output);
+                  ┌", _output);
 
 		// On a real app we can't go beyond the SuperView bounds
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 19,
 			Y = 2,
 			Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -1349,7 +1340,7 @@ public class ToplevelTests {
 		Application.Refresh ();
 		Assert.Equal (new Rect (0, 0, 19, 2), top.Frame);
 		Assert.Equal (new Rect (19, 2, 20, 3), window.Frame);
-		TestHelpers.AssertDriverContentsWithFrameAre (@"", output);
+		TestHelpers.AssertDriverContentsWithFrameAre (@"", _output);
 	}
 
 	[Fact]
@@ -1357,7 +1348,7 @@ public class ToplevelTests {
 	public void Modal_As_Top_Will_Drag_Cleanly ()
 	{
 		// Don't use Dialog as a Top, use a Window instead - dialog has complex layout behavior that is not needed here.
-		var window = new Window () { Width = 10, Height = 3};
+		var window = new Window { Width = 10, Height = 3 };
 		window.Add (new Label (
 			"Test") {
 			X = Pos.Center (),
@@ -1376,15 +1367,15 @@ public class ToplevelTests {
 		TestHelpers.AssertDriverContentsWithFrameAre (@"
 ┌────────┐
 │  Test  │
-└────────┘", output);
+└────────┘", _output);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 0,
 			Y = 0,
 			Flags = MouseFlags.Button1Pressed
 		}));
 
-		bool firstIteration = false;
+		var firstIteration = false;
 		Application.RunIteration (ref rs, ref firstIteration);
 		Assert.Equal (window, Application.MouseGrabView);
 
@@ -1392,9 +1383,9 @@ public class ToplevelTests {
 		TestHelpers.AssertDriverContentsWithFrameAre (@"
 ┌────────┐
 │  Test  │
-└────────┘", output);
+└────────┘", _output);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 1,
 			Y = 1,
 			Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition
@@ -1403,15 +1394,30 @@ public class ToplevelTests {
 		firstIteration = false;
 		Application.RunIteration (ref rs, ref firstIteration);
 		Assert.Equal (window, Application.MouseGrabView);
-		Assert.Equal (new Rect (1, 1, 10,3), window.Frame);
+		Assert.Equal (new Rect (1, 1, 10, 3), window.Frame);
 		TestHelpers.AssertDriverContentsWithFrameAre (@"
  ┌────────┐
  │  Test  │
- └────────┘", output);
+ └────────┘", _output);
 
 		Application.End (rs);
 	}
 
+	[Fact]
+	[AutoInitShutdown]
+	public void Begin_With_Window_Sets_Size_Correctly ()
+	{
+		var top = Application.Top;
+		Application.Begin (top);
+		((FakeDriver)Application.Driver).SetBufferSize (20, 20);
+
+		var testWindow = new Window { X = 2, Y = 1, Width = 15, Height = 10 };
+		Assert.Equal (new Rect (2, 1, 15, 10), testWindow.Frame);
+
+		var rs = Application.Begin (testWindow);
+		Assert.Equal (new Rect (2, 1, 15, 10), testWindow.Frame);
+	}
+
 	// Don't use Dialog as a Top, use a Window instead - dialog has complex layout behavior that is not needed here.
 	[Fact]
 	[AutoInitShutdown]
@@ -1444,14 +1450,14 @@ public class ToplevelTests {
 │                  │
 │                  │
 │                  │
-└──────────────────┘", output);
+└──────────────────┘", _output);
 
 		var btnPopup = new Button ("Popup");
-		var testWindow = new Window () { X = 2, Y = 1, Width = 15, Height = 10 };
+		var testWindow = new Window { X = 2, Y = 1, Width = 15, Height = 10 };
 		testWindow.Add (btnPopup);
 		btnPopup.Clicked += (s, e) => {
 			var viewToScreen = btnPopup.BoundsToScreen (top.Frame);
-			var viewAddedToTop = new View () {
+			var viewAddedToTop = new View {
 				Text = "viewAddedToTop",
 				X = 1,
 				Y = viewToScreen.Y + 1,
@@ -1504,16 +1510,16 @@ public class ToplevelTests {
 │                  │
 │                  │
 │                  │
-└──────────────────┘", output);
+└──────────────────┘", _output);
 
-		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent () {
+		Application.OnMouseEvent (new MouseEventEventArgs (new MouseEvent {
 			X = 5,
 			Y = 2,
 			Flags = MouseFlags.Button1Clicked
 		}));
 		Application.Top.Draw ();
 
-		bool firstIteration = false;
+		var firstIteration = false;
 		Application.RunIteration (ref rs, ref firstIteration);
 		TestHelpers.AssertDriverContentsWithFrameAre (@$"
 ┌──────────────────┐
@@ -1535,7 +1541,7 @@ public class ToplevelTests {
 ││Two             ││
 ││Three           ││
 │└────────────────┘│
-└──────────────────┘", output);
+└──────────────────┘", _output);
 
 		Application.End (rs);
 	}
@@ -1571,9 +1577,9 @@ public class ToplevelTests {
 
 		int count = 0, count1 = 0, count2 = 0;
 		bool log = false, log1 = false, log2 = false;
-		bool fromTopStillKnowFirstIsRunning = false;
-		bool fromTopStillKnowSecondIsRunning = false;
-		bool fromFirstStillKnowSecondIsRunning = false;
+		var fromTopStillKnowFirstIsRunning = false;
+		var fromTopStillKnowSecondIsRunning = false;
+		var fromFirstStillKnowSecondIsRunning = false;
 
 		Application.AddTimeout (TimeSpan.FromMilliseconds (100), () => {
 			count++;

UnitTests/Views/WindowTests.cs

@@ -1,12 +1,13 @@
-using Xunit;
+using System;
+using Xunit;
 using Xunit.Abstractions;
 
-namespace Terminal.Gui.ViewsTests; 
+namespace Terminal.Gui.ViewsTests;
 
 public class WindowTests {
 	readonly ITestOutputHelper _output;
 
-	public WindowTests (ITestOutputHelper output) => this._output = output;
+	public WindowTests (ITestOutputHelper output) => _output = output;
 
 	[Fact]
 	public void New_Initializes ()
@@ -14,19 +15,21 @@ public class WindowTests {
 		// Parameterless
 		var r = new Window ();
 		Assert.NotNull (r);
-		Assert.Equal (string.Empty,         r.Title);
+		Assert.Equal (string.Empty, r.Title);
+		// Toplevels have Width/Height set to Dim.Fill
 		Assert.Equal (LayoutStyle.Computed, r.LayoutStyle);
-		Assert.Equal ("Window()(0,0,0,0)",  r.ToString ());
+		// If there's no SuperView, Top, or Driver, the default Fill width is int.MaxValue
+		Assert.Equal ("Window()(0,0,2147483647,2147483647)", r.ToString ());
 		Assert.True (r.CanFocus);
 		Assert.False (r.HasFocus);
-		Assert.Equal (new Rect (0, 0, 0, 0), r.Bounds);
-		Assert.Equal (new Rect (0, 0, 0, 0), r.Frame);
+		Assert.Equal (new Rect (0, 0, 2147483645, 2147483645), r.Bounds);
+		Assert.Equal (new Rect (0, 0, 2147483647, 2147483647), r.Frame);
 		Assert.Null (r.Focused);
 		Assert.NotNull (r.ColorScheme);
+		Assert.Equal (0, r.X);
+		Assert.Equal (0, r.Y);
 		Assert.Equal (Dim.Fill (), r.Width);
 		Assert.Equal (Dim.Fill (), r.Height);
-		Assert.Null (r.X);
-		Assert.Null (r.Y);
 		Assert.False (r.IsCurrentTop);
 		Assert.Empty (r.Id);
 		Assert.False (r.WantContinuousButtonPressed);
@@ -38,8 +41,10 @@ public class WindowTests {
 		// Empty Rect
 		r = new Window (Rect.Empty) { Title = "title" };
 		Assert.NotNull (r);
-		Assert.Equal ("title",                  r.Title);
-		Assert.Equal (LayoutStyle.Absolute,     r.LayoutStyle);
+		Assert.Equal ("title", r.Title);
+		Assert.Equal (LayoutStyle.Absolute, r.LayoutStyle);
+		Assert.Equal ("title", r.Title);
+		Assert.Equal (LayoutStyle.Absolute, r.LayoutStyle);
 		Assert.Equal ("Window(title)(0,0,0,0)", r.ToString ());
 		Assert.True (r.CanFocus);
 		Assert.False (r.HasFocus);
@@ -47,10 +52,10 @@ public class WindowTests {
 		Assert.Equal (new Rect (0, 0, 0, 0), r.Frame);
 		Assert.Null (r.Focused);
 		Assert.NotNull (r.ColorScheme);
-		Assert.Null (r.Width);  // All view Dim are initialized now in the IsAdded setter,
-		Assert.Null (r.Height); // avoiding Dim errors.
-		Assert.Null (r.X);      // All view Pos are initialized now in the IsAdded setter,
-		Assert.Null (r.Y);      // avoiding Pos errors.
+		Assert.Equal (0, r.X);
+		Assert.Equal (0, r.Y);
+		Assert.Equal (0, r.Width);
+		Assert.Equal (0, r.Height);
 		Assert.False (r.IsCurrentTop);
 		Assert.Equal (r.Title, r.Id);
 		Assert.False (r.WantContinuousButtonPressed);
@@ -63,7 +68,8 @@ public class WindowTests {
 		r = new Window (new Rect (1, 2, 3, 4)) { Title = "title" };
 		Assert.Equal ("title", r.Title);
 		Assert.NotNull (r);
-		Assert.Equal (LayoutStyle.Absolute,     r.LayoutStyle);
+		Assert.Equal (LayoutStyle.Absolute, r.LayoutStyle);
+		Assert.Equal (LayoutStyle.Absolute, r.LayoutStyle);
 		Assert.Equal ("Window(title)(1,2,3,4)", r.ToString ());
 		Assert.True (r.CanFocus);
 		Assert.False (r.HasFocus);
@@ -71,10 +77,10 @@ public class WindowTests {
 		Assert.Equal (new Rect (1, 2, 3, 4), r.Frame);
 		Assert.Null (r.Focused);
 		Assert.NotNull (r.ColorScheme);
-		Assert.Null (r.Width);
-		Assert.Null (r.Height);
-		Assert.Null (r.X);
-		Assert.Null (r.Y);
+		Assert.Equal (1, r.X);
+		Assert.Equal (2, r.Y);
+		Assert.Equal (3, r.Width);
+		Assert.Equal (4, r.Height);
 		Assert.False (r.IsCurrentTop);
 		Assert.Equal (r.Title, r.Id);
 		Assert.False (r.WantContinuousButtonPressed);
@@ -85,7 +91,8 @@ public class WindowTests {
 		r.Dispose ();
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void MenuBar_And_StatusBar_Inside_Window ()
 	{
 		var menu = new MenuBar (new MenuBarItem [] {
@@ -167,7 +174,8 @@ public class WindowTests {
 └──────────────────┘", _output);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void OnCanFocusChanged_Only_Must_ContentView_Forces_SetFocus_After_IsInitialized_Is_True ()
 	{
 		var win1 = new Window { Id = "win1", Width = 10, Height = 1 };
@@ -185,7 +193,8 @@ public class WindowTests {
 		Assert.False (view2.HasFocus);
 	}
 
-	[Fact] [AutoInitShutdown]
+	[Fact]
+	[AutoInitShutdown]
 	public void Activating_MenuBar_By_Alt_Key_Does_Not_Throw ()
 	{
 		var menu = new MenuBar (new MenuBarItem [] {
@@ -201,38 +210,4 @@ public class WindowTests {
 		var exception = Record.Exception (() => win.NewKeyDownEvent (new Key (KeyCode.AltMask)));
 		Assert.Null (exception);
 	}
-
-	public static TheoryData<Toplevel> ButtonContainers =>
-		new () {
-			{ new Window () },
-			{ new Dialog () }
-		};
-
-
-	[Theory, AutoInitShutdown]
-	[MemberData (nameof (ButtonContainers))]
-	public void With_Default_Button_Enter_Invokes_Accept_Action (Toplevel container)
-	{
-		var view = new View () { CanFocus = true };
-		var btnOk = new Button ("Accept") { IsDefault = true };
-		btnOk.Clicked += (s, e) => view.Text = "Test";
-		var btnCancel = new Button ("Cancel");
-		btnCancel.Clicked += (s, e) => view.Text = "";
-
-		container.Add (view, btnOk, btnCancel);
-		var rs = Application.Begin (container);
-
-		Assert.True (view.HasFocus);
-		Assert.Equal ("", view.Text);
-		Assert.True (Application.OnKeyDown (new Key (KeyCode.Enter)));
-		Assert.True (view.HasFocus);
-		Assert.Equal ("Test", view.Text);
-
-		btnOk.IsDefault = false;
-		btnCancel.IsDefault = true;
-		Assert.True (Application.OnKeyDown (new Key (KeyCode.Enter)));
-		Assert.True (view.HasFocus);
-		Assert.Equal ("", view.Text);
-		Application.End (rs);
-	}
 }