Partial fix

Terminal.Gui/Text/TextFormatter.cs

@@ -51,7 +51,7 @@ public class TextFormatter
         }
     }
 
-    private Size GetAutoSize ()
+    internal Size GetAutoSize ()
     {
         Size size = CalcRect (0, 0, Text, Direction, TabWidth).Size;
         return size with

Terminal.Gui/View/ViewContent.cs

@@ -307,24 +307,43 @@ public partial class View
                 return new (_viewportLocation, Frame.Size);
             }
 
-            // BUGBUG: This is a hack. Viewport_get should not have side effects.
-            if (Frame.Size == Size.Empty)
-            {
-                // The Frame has not been set yet (e.g. the view has not been added to a SuperView yet).
-                // 
-                if ((Width is Dim.DimAuto widthAuto && widthAuto._style.HasFlag(Dim.DimAutoStyle.Text))
-                    || (Height is Dim.DimAuto heightAuto && heightAuto._style.HasFlag (Dim.DimAutoStyle.Text)))
-                {
-                    if (TextFormatter.NeedsFormat)
-                    {
-                        // This updates TextFormatter.Size to the text size
-                        TextFormatter.AutoSize = true;
-
-                        // Whenever DimAutoStyle.Text is set, ContentSize will match TextFormatter.Size.
-                        ContentSize = TextFormatter.Size == Size.Empty ? null : TextFormatter.Size;
-                    }
-                }
-            }
+            //// BUGBUG: This is a hack. Viewport_get should not have side effects.
+            //if (Frame.Size == Size.Empty)
+            //{
+            //    // The Frame has not been set yet (e.g. the view has not been added to a SuperView yet).
+            //    // 
+            //    // Use _width & _height instead of Width & Height to avoid debug spew
+            //    Dim.DimAuto widthAuto = _width as Dim.DimAuto;
+            //    Dim.DimAuto heightAuto = _height as Dim.DimAuto;
+
+            //    if ((widthAuto is { } && widthAuto._style.HasFlag (Dim.DimAutoStyle.Text))
+            //        || (heightAuto is { } && heightAuto._style.HasFlag (Dim.DimAutoStyle.Text)))
+            //    {
+            //        //if (TextFormatter.NeedsFormat)
+            //        {
+            //            // We always use TF in autosize = false mode
+            //            TextFormatter.AutoSize = false;
+
+            //            var size = TextFormatter.GetAutoSize ();
+            //            if (widthAuto is null || !widthAuto._style.HasFlag (Dim.DimAutoStyle.Text))
+            //            {
+            //                size.Width = _width.Anchor (0);
+            //            }
+
+            //            if (heightAuto is null || !heightAuto._style.HasFlag (Dim.DimAutoStyle.Text))
+            //            {
+            //                size.Height = _height.Anchor (0);
+            //            }
+
+            //            // Whenever DimAutoStyle.Text is set, ContentSize will match TextFormatter.Size.
+            //            //ContentSize = size;//TextFormatter.Size == Size.Empty ? null : TextFormatter.Size;
+            //            TextFormatter.Size = size; ;
+
+            //            // Whenever DimAutoStyle.Text is set, ContentSize will match TextFormatter.Size.
+            //            ContentSize = TextFormatter.Size == Size.Empty ? null : TextFormatter.Size;
+            //        }
+            //    }
+            //}
 
             Thickness thickness = GetAdornmentsThickness ();
             return new (

Terminal.Gui/View/ViewText.cs

@@ -179,17 +179,33 @@ public partial class View
 
         // TODO: This is a hack. Figure out how to move this into DimDimAuto
         // Use _width & _height instead of Width & Height to avoid debug spew
-        if ((_width is Dim.DimAuto widthAuto && widthAuto._style.HasFlag (Dim.DimAutoStyle.Text))
-            || (_height is Dim.DimAuto heightAuto && heightAuto._style.HasFlag (Dim.DimAutoStyle.Text)))
+        Dim.DimAuto widthAuto = _width as Dim.DimAuto;
+        Dim.DimAuto heightAuto = _height as Dim.DimAuto;
+        if ((widthAuto is {} && widthAuto._style.HasFlag (Dim.DimAutoStyle.Text))
+            || (heightAuto is {} && heightAuto._style.HasFlag (Dim.DimAutoStyle.Text)))
         {
-            // This updates TextFormatter.Size to the text size
-            TextFormatter.AutoSize = true;
+            // We always use TF in autosize = false mode
+            TextFormatter.AutoSize = false;
+
+            var size = TextFormatter.GetAutoSize ();
+
+            if (widthAuto is null || !widthAuto._style.HasFlag (Dim.DimAutoStyle.Text))
+            {
+                size.Width = _width.Anchor (0);
+            }
+
+            if (heightAuto is null || !heightAuto._style.HasFlag (Dim.DimAutoStyle.Text))
+            {
+                size.Height = _height.Anchor (0);
+            }
 
             // Whenever DimAutoStyle.Text is set, ContentSize will match TextFormatter.Size.
-            ContentSize = TextFormatter.Size == Size.Empty ? null : TextFormatter.Size;
+            //ContentSize = size;//TextFormatter.Size == Size.Empty ? null : TextFormatter.Size;
+            TextFormatter.Size = size;
             return;
         }
 
+        // We always use TF in autosize = false mode
         TextFormatter.AutoSize = false;
         TextFormatter.Size = new Size (ContentSize.GetValueOrDefault ().Width, ContentSize.GetValueOrDefault ().Height);
     }

UnitTests/View/Layout/Dim.AutoTests.cs

@@ -734,11 +734,11 @@ public class DimAutoTests (ITestOutputHelper output)
             Text = "_1234",
             Width = Dim.Auto ()
         };
-        Assert.True (view.TextFormatter.AutoSize);
+        Assert.False (view.TextFormatter.AutoSize);
         Assert.NotEqual (Size.Empty, view.Frame.Size);
 
         view.TextAlignment = Alignment.Justified;
-        Assert.True (view.TextFormatter.AutoSize);
+        Assert.False (view.TextFormatter.AutoSize);
         Assert.NotEqual (Size.Empty, view.Frame.Size);
 
         view = new ()
@@ -747,7 +747,7 @@ public class DimAutoTests (ITestOutputHelper output)
             Width = Dim.Auto ()
         };
         view.VerticalTextAlignment = Alignment.Centered;
-        Assert.True (view.TextFormatter.AutoSize);
+        Assert.False (view.TextFormatter.AutoSize);
         Assert.NotEqual (Size.Empty, view.Frame.Size);
 
         view = new ()
@@ -756,7 +756,7 @@ public class DimAutoTests (ITestOutputHelper output)
             Width = Dim.Auto ()
         };
         view.HotKeySpecifier = (Rune)'*';
-        Assert.True (view.TextFormatter.AutoSize);
+        Assert.False (view.TextFormatter.AutoSize);
         Assert.NotEqual (Size.Empty, view.Frame.Size);
 
         view = new ()
@@ -765,23 +765,23 @@ public class DimAutoTests (ITestOutputHelper output)
             Width = Dim.Auto ()
         };
         view.Text = "*ABC";
-        Assert.True (view.TextFormatter.AutoSize);
+        Assert.False (view.TextFormatter.AutoSize);
         Assert.NotEqual (Size.Empty, view.Frame.Size);
     }
 
-    [Fact]
-    public void DimAuto_TextFormatter_Is_Auto ()
-    {
-        View view = new ();
-        Assert.False (view.TextFormatter.AutoSize);
-        view.Width = Dim.Auto ();
-        Assert.True (view.TextFormatter.AutoSize);
-
-        view = new ();
-        Assert.False (view.TextFormatter.AutoSize);
-        view.Height = Dim.Auto ();
-        Assert.True (view.TextFormatter.AutoSize);
-    }
+    //[Fact]
+    //public void DimAuto_TextFormatter_Is_Auto ()
+    //{
+    //    View view = new ();
+    //    Assert.False (view.TextFormatter.AutoSize);
+    //    view.Width = Dim.Auto ();
+    //    Assert.True (view.TextFormatter.AutoSize);
+
+    //    view = new ();
+    //    Assert.False (view.TextFormatter.AutoSize);
+    //    view.Height = Dim.Auto ();
+    //    Assert.True (view.TextFormatter.AutoSize);
+    //}
 
     [Theory]
     [InlineData ("1234", 4)]

UnitTests/View/Text/AutoSizeTrueTests.cs

@@ -1855,11 +1855,6 @@ Y
         Application.Begin (top);
         ((FakeDriver)Application.Driver).SetBufferSize (width + 2, 6);
 
-        Assert.True (lblLeft.TextFormatter.AutoSize == autoSize);
-        Assert.True (lblCenter.TextFormatter.AutoSize == autoSize);
-        Assert.True (lblRight.TextFormatter.AutoSize == autoSize);
-        Assert.True (lblJust.TextFormatter.AutoSize == autoSize);
-
         if (autoSize)
         {
             Size expectedSize = new (11, 1);
@@ -1983,11 +1978,6 @@ Y
         Application.Begin (top);
         ((FakeDriver)Application.Driver).SetBufferSize (9, height + 2);
 
-        Assert.True (lblLeft.TextFormatter.AutoSize == autoSize);
-        Assert.True (lblCenter.TextFormatter.AutoSize == autoSize);
-        Assert.True (lblRight.TextFormatter.AutoSize == autoSize);
-        Assert.True (lblJust.TextFormatter.AutoSize == autoSize);
-
         if (autoSize)
         {
             Assert.Equal (new (1, 11), lblLeft.TextFormatter.Size);

UnitTests/View/Text/TextTests.cs

@@ -147,7 +147,7 @@ public class TextTests (ITestOutputHelper output)
         Assert.Equal (new Rectangle (0, 0, 10, 1), view.Frame);
         Assert.Equal (new Rectangle (0, 0, 10, 1), view.Viewport);
 
-        Assert.Equal (new (5, 1), view.TextFormatter.Size);  // BUGBUG: should be 10, 1
+        Assert.Equal (new (10, 1), view.TextFormatter.Size);  
     }
 
     [Fact]