Dialog works

Terminal.Gui/View/Layout/DimAuto.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using System.Diagnostics;
 using System.Drawing;
 
 namespace Terminal.Gui;
@@ -159,7 +160,18 @@ public class DimAuto () : Dim
                 {
                     View v = notDependentSubViews [i];
 
-                    int size = dimension == Dimension.Width ? v.X.GetAnchor (maxCalculatedSize) + v.Width.GetAnchor (maxCalculatedSize) : v.Y.GetAnchor (maxCalculatedSize) + v.Height.GetAnchor (maxCalculatedSize);
+                    int size = 0;
+
+                    if (dimension == Dimension.Width)
+                    {
+                        int width = v.Width!.Calculate (0, 0, v, dimension);
+                        size = v.X.GetAnchor (0) + width;
+                    }
+                    else
+                    {
+                        int height = v.Height!.Calculate (0, 0, v, dimension);
+                        size = v.Y.GetAnchor (0) + height;
+                    }
 
                     if (size > maxCalculatedSize)
                     {
@@ -169,7 +181,7 @@ public class DimAuto () : Dim
 
                 // ************** We now have some idea of `us.ContentSize` ***************
 
-
+                #region Centered
                 // [ ] PosCenter    - Position is dependent `us.ContentSize` AND `subview.Frame`
                 List<View> centeredSubViews;
                 if (dimension == Dimension.Width)
@@ -181,18 +193,111 @@ public class DimAuto () : Dim
                     centeredSubViews = us.Subviews.Where (v => v.Y.Has (typeof (PosCenter), out _)).ToList ();
                 }
 
+                int maxCentered = 0;
+
                 for (var i = 0; i < centeredSubViews.Count; i++)
                 {
                     View v = centeredSubViews [i];
 
-                    int maxCentered = dimension == Dimension.Width ?/* v.X.GetAnchor (maxCalculatedSize) +*/ v.Width.GetAnchor (maxCalculatedSize) : /*v.Y.GetAnchor (maxCalculatedSize) + */v.Height.GetAnchor(maxCalculatedSize);
+                    if (dimension == Dimension.Width)
+                    {
+                        int width = v.Width!.Calculate (0, 0, v, dimension);
+                        maxCentered = (v.X.GetAnchor (0) + width) * 2;
+                    }
+                    else
+                    {
+                        int height = v.Height!.Calculate (0, 0, v, dimension);
+                        maxCentered = (v.Y.GetAnchor (0) + height) * 2;
+                    }
+                }
+                maxCalculatedSize = int.Max (maxCalculatedSize, maxCentered);
+                #endregion Centered
+
+                #region Percent
+                // [ ] DimPercent   - Dimension is dependent on `us.ContentSize`
+                List<View> percentSubViews;
+                if (dimension == Dimension.Width)
+                {
+                    percentSubViews = us.Subviews.Where (v => v.Width.Has (typeof (DimPercent), out _)).ToList ();
+                }
+                else
+                {
+                    percentSubViews = us.Subviews.Where (v => v.Height.Has (typeof (DimPercent), out _)).ToList ();
+                }
+
+                int maxPercent = 0;
 
-                    if (maxCentered > maxCalculatedSize)
+                for (var i = 0; i < percentSubViews.Count; i++)
+                {
+                    View v = percentSubViews [i];
+
+                    if (dimension == Dimension.Width)
                     {
-                        maxCalculatedSize = maxCentered;
+                        int width = v.Width!.Calculate (0, 0, v, dimension);
+                        maxPercent = (v.X.GetAnchor (0) + width);
                     }
+                    else
+                    {
+                        int height = v.Height!.Calculate (0, 0, v, dimension);
+                        maxPercent = (v.Y.GetAnchor (0) + height);
+                    }
+                }
+                maxCalculatedSize = int.Max (maxCalculatedSize, maxPercent);
+                #endregion Percent
+
+
+                #region Aligned
+                // [ ] PosAlign     - Position is dependent on other views with `GroupId` AND `us.ContentSize`
+                int maxAlign = 0;
+                // Use Linq to get a list of distinct GroupIds from the subviews
+                List<int> groupIds = includedSubviews.Select (
+                                                              v =>
+                                                              {
+                                                                  if (dimension == Dimension.Width)
+                                                                  {
+                                                                      if (v.X.Has (typeof (PosAlign), out Pos posAlign))
+                                                                      {
+                                                                          return ((PosAlign)posAlign).GroupId;
+                                                                      }
+                                                                  }
+                                                                  else
+                                                                  {
+                                                                      if (v.Y.Has (typeof (PosAlign), out Pos posAlign))
+                                                                      {
+                                                                          return ((PosAlign)posAlign).GroupId;
+                                                                      }
+                                                                  }
+                                                                  return -1;
+                                                              }).Distinct ().ToList ();
+
+                foreach (var groupId in groupIds.Where (g => g != -1))
+                {
+                    // PERF: If this proves a perf issue, consider caching a ref to this list in each item
+                    List<PosAlign?> posAlignsInGroup = includedSubviews.Where (
+                        v =>
+                        {
+                            return dimension switch
+                            {
+                                Dimension.Width when v.X is PosAlign alignX => alignX.GroupId == groupId,
+                                Dimension.Height when v.Y is PosAlign alignY => alignY.GroupId == groupId,
+                                _ => false
+                            };
+                        })
+                        .Select (v => dimension == Dimension.Width ? v.X as PosAlign : v.Y as PosAlign)
+                        .ToList ();
+
+                    if (posAlignsInGroup.Count == 0)
+                    {
+                        continue;
+                    }
+
+                    maxAlign = PosAlign.CalculateMinDimension (groupId, includedSubviews, dimension);
                 }
 
+                maxCalculatedSize = int.Max (maxCalculatedSize, maxAlign);
+                #endregion Aligned
+
+
 
                 #region Anchored
                 // [x] PosAnchorEnd - Position is dependent on `us.ContentSize` AND `subview.Frame` 
@@ -226,7 +331,6 @@ public class DimAuto () : Dim
                 maxCalculatedSize = Math.Max (maxCalculatedSize, maxAnchorEnd);
                 #endregion Anchored
 
-
                 #region PosView
                 // [x] PosView      - Position is dependent on `subview.Target` - it can cause a change in `us.ContentSize`
                 List<View> posViewSubViews;
@@ -405,51 +509,6 @@ public class DimAuto () : Dim
                 //        #endregion Not Anchored and Are Not Dependent
 
 
-                //        //#region Aligned
-
-                //        //// Now, handle subviews that are aligned
-                //        //// [x] PosAlign
-                //        //int maxAlign = 0;
-                //        //if (dimension == Dimension.Width)
-                //        //{
-                //        //    // Use Linq to get a list of distinct GroupIds from the subviews
-                //        //    List<int> groupIds = includedSubviews.Select (v => v.X is PosAlign posAlign ? posAlign.GroupId : -1).Distinct ().ToList ();
-
-                //        //    foreach (var groupId in groupIds)
-                //        //    {
-                //        //        List<int> dimensionsList = new ();
-
-                //        //        // PERF: If this proves a perf issue, consider caching a ref to this list in each item
-                //        //        List<PosAlign?> posAlignsInGroup = includedSubviews.Where (
-                //        //            v =>
-                //        //            {
-                //        //                return dimension switch
-                //        //                {
-                //        //                    Dimension.Width when v.X is PosAlign alignX => alignX.GroupId == groupId,
-                //        //                    Dimension.Height when v.Y is PosAlign alignY => alignY.GroupId == groupId,
-                //        //                    _ => false
-                //        //                };
-                //        //            })
-                //        //            .Select (v => dimension == Dimension.Width ? v.X as PosAlign : v.Y as PosAlign)
-                //        //            .ToList ();
-
-                //        //        if (posAlignsInGroup.Count == 0)
-                //        //        {
-                //        //            continue;
-                //        //        }
-                //        // BUGBUG: ignores adornments
-
-                //        //        maxAlign = PosAlign.CalculateMinDimension (groupId, includedSubviews, dimension);
-                //        //    }
-                //        //}
-                //        //else
-                //        //{
-                //        //    subviews = includedSubviews.Where (v => v.Y is PosAlign).ToList ();
-                //        //}
-
-                //        //subviewsSize = int.Max (subviewsSize, maxAlign);
-                //        //#endregion Aligned
-
 
                 //        #region Auto
 

Terminal.Gui/Views/Dialog.cs

@@ -78,9 +78,9 @@ public class Dialog : Window
 
         X = Pos.Center ();
         Y = Pos.Center ();
-
         Width = Dim.Auto (DimAutoStyle.Auto, Dim.Percent (DefaultMinimumWidth), Dim.Percent (90));
         Height = Dim.Auto (DimAutoStyle.Auto, Dim.Percent (DefaultMinimumHeight), Dim.Percent (90));
+
         ColorScheme = Colors.ColorSchemes ["Dialog"];
 
         Modal = true;

Terminal.Gui/Views/FileDialog.cs

@@ -60,6 +60,9 @@ public class FileDialog : Dialog
     /// <remarks>This overload is mainly useful for testing.</remarks>
     internal FileDialog (IFileSystem fileSystem)
     {
+        Height = Dim.Percent (80);
+        Width = Dim.Percent (80);
+
         // Assume canceled
         Canceled = true;
 

UICatalog/KeyBindingsDialog.cs

@@ -19,8 +19,8 @@ internal class KeyBindingsDialog : Dialog
     {
         Title = "Keybindings";
 
-        //Height = 50;
-        //Width = 10;
+        Height = Dim.Percent(80);
+        Width = Dim.Percent(80);
         if (ViewTracker.Instance == null)
         {
             ViewTracker.Initialize ();
@@ -32,7 +32,7 @@ internal class KeyBindingsDialog : Dialog
         _commandsListView = new ListView
         {
             Width = Dim.Percent (50),
-            Height = Dim.Percent (100) - 1,
+            Height = Dim.Fill () - 1,
             Source = new ListWrapper<Command> (_commands),
             SelectedItem = 0
         };

UICatalog/Scenarios/Dialogs.cs

@@ -312,7 +312,7 @@ public class Dialogs : Scenario
             var addChar = new Button
             {
                 X = Pos.Center (),
-                Y = Pos.Center () + 1,
+                Y = Pos.Center () + 2,
                 Text = $"A_dd a {char.ConvertFromUtf32 (CODE_POINT)} to each button. This text is really long for a reason."
             };
 
@@ -325,8 +325,9 @@ public class Dialogs : Scenario
 
                                   dialog.LayoutSubviews ();
                               };
-            dialog.Closed += (s, e) => { buttonPressedLabel.Text = $"{clicked}"; };
             dialog.Add (addChar);
+
+            dialog.Closed += (s, e) => { buttonPressedLabel.Text = $"{clicked}"; };
         }
         catch (FormatException)
         {

UICatalog/Scenarios/ListColumns.cs

@@ -284,7 +284,7 @@ public class ListColumns : Scenario
         cancel.Accept += (s, e) => { Application.RequestStop (); };
         var d = new Dialog { Title = prompt, Buttons = [ok, cancel] };
 
-        var tf = new TextField { Text = getter (_listColView).ToString (), X = 0, Y = 1, Width = Dim.Fill () };
+        var tf = new TextField { Text = getter (_listColView).ToString (), X = 0, Y = 0, Width = Dim.Fill () };
 
         d.Add (tf);
         tf.SetFocus ();

UICatalog/Scenarios/TableEditor.cs

@@ -1083,13 +1083,16 @@ public class TableEditor : Scenario
                      };
         var cancel = new Button { Text = "Cancel" };
         cancel.Accept += (s, e) => { Application.RequestStop (); };
-        var d = new Dialog { Title = prompt, Buttons = [ok, cancel] };
+        var d = new Dialog
+        {
+            Title = prompt,
+            Buttons = [ok, cancel]
+        };
 
         ColumnStyle style = _tableView.Style.GetOrCreateColumnStyle (col.Value);
 
-        var lbl = new Label { X = 0, Y = 1, Text = _tableView.Table.ColumnNames [col.Value] };
-
-        var tf = new TextField { Text = getter (style).ToString (), X = 0, Y = 2, Width = Dim.Fill () };
+        var lbl = new Label { X = 0, Y = 0, Text = $"{_tableView.Table.ColumnNames [col.Value]}: " };
+        var tf = new TextField { Text = getter (style).ToString (), X = Pos.Right (lbl), Y = 0, Width = 20 };
 
         d.Add (lbl, tf);
         tf.SetFocus ();
@@ -1461,7 +1464,8 @@ public class TableEditor : Scenario
                                                                              treeSource,
                                                                              _checkedFileSystemInfos.Contains,
                                                                              CheckOrUncheckFile
-                                                                            ) { UseRadioButtons = radio };
+                                                                            )
+            { UseRadioButtons = radio };
         }
         else
         {