WIP of tiled-mode

Terminal.Gui/View/Adornment/Border.cs

@@ -1222,7 +1222,7 @@ public class Border : Adornment
             if (arrangement == ViewArrangement.Fixed)
             {
                 // Keyboard mode - enable nav
-
+                _arranging = (ViewArrangement)(Focused?.Data ?? ViewArrangement.Fixed);
             }
 
             return true;

Terminal.Gui/Views/DatePicker.cs

@@ -184,7 +184,6 @@ public class DatePicker : View
     private void SetInitialProperties (DateTime date)
     {
         _date = date;
-        Title = "Date Picker";
         BorderStyle = LineStyle.Single;
         Date = date;
         _dateLabel = new Label { X = 0, Y = 0, Text = "Date: " };

UICatalog/Scenarios/AdornmentsEditor.cs

@@ -24,6 +24,11 @@ public class AdornmentsEditor : View
 
         TabStop = TabBehavior.TabGroup;
 
+        _expandButton = new ()
+        {
+            Orientation = Orientation.Horizontal
+        };
+
         Initialized += AdornmentsEditor_Initialized;
     }
 
@@ -138,15 +143,15 @@ public class AdornmentsEditor : View
         base.Dispose (disposing);
     }
 
+    private ExpanderButton? _expandButton;
+
+    public ExpanderButton? ExpandButton => _expandButton;
+
     private void AdornmentsEditor_Initialized (object? sender, EventArgs e)
     {
         BorderStyle = LineStyle.Dotted;
 
-        var expandButton = new ExpanderButton
-        {
-            Orientation = Orientation.Horizontal
-        };
-        Border.Add (expandButton);
+        Border.Add (_expandButton);
 
         _lblView = new ()
         {

UICatalog/Scenarios/Arrangement.cs

@@ -0,0 +1,242 @@
+using System.Threading;
+using System.Timers;
+using Terminal.Gui;
+using Timer = System.Timers.Timer;
+
+namespace UICatalog.Scenarios;
+
+[ScenarioMetadata ("Arrangement", "Arrangement Tester")]
+[ScenarioCategory ("Mouse and Keyboard")]
+[ScenarioCategory ("Layout")]
+[ScenarioCategory ("Overlapped")]
+public class Arrangement : Scenario
+{
+    private int _hotkeyCount;
+
+    public override void Main ()
+    {
+        Application.Init ();
+
+        Window app = new ()
+        {
+            Title = GetQuitKeyAndName (),
+            TabStop = TabBehavior.TabGroup
+        };
+
+        var adornmentsEditor = new AdornmentsEditor
+        {
+            X = 0,
+            Y = 0,
+            AutoSelectViewToEdit = true,
+            TabStop = TabBehavior.NoStop,
+        };
+
+        app.Add (adornmentsEditor);
+        adornmentsEditor.ExpandButton!.Collapsed = true;
+
+        var arrangementEditor = new ArrangementEditor ()
+        {
+            X = Pos.Right (adornmentsEditor),
+            Y = 0,
+            AutoSelectViewToEdit = true,
+            TabStop = TabBehavior.NoStop
+        };
+        app.Add (arrangementEditor);
+
+        FrameView testFrame = new ()
+        {
+            Title = "_1 Test Frame",
+            X = Pos.Right (arrangementEditor),
+            Y = 0,
+            Width = Dim.Fill (),
+            Height = Dim.Fill ()
+        };
+
+        app.Add (testFrame);
+
+        View tiledView1 = CreateTiledView (0, 2, 1);
+        View tiledView2 = CreateTiledView (1, Pos.Right (tiledView1) - 1, Pos.Top (tiledView1));
+        tiledView2.Height = Dim.Height (tiledView1);
+        View tiledView3 = CreateTiledView (2, Pos.Right (tiledView2) - 1, Pos.Top (tiledView2));
+        tiledView3.Height = Dim.Height (tiledView1);
+        View tiledView4 = CreateTiledView (3, Pos.Left (tiledView1), Pos.Bottom (tiledView1) - 1);
+        tiledView4.Width = Dim.Func (() => tiledView3.Frame.Width + tiledView2.Frame.Width + tiledView1.Frame.Width - 2);
+        testFrame.Add (tiledView4, tiledView3, tiledView2, tiledView1);
+
+        View overlappedView1 = CreateOverlappedView (2, 0, 13);
+        overlappedView1.Title = "Movable _& Sizable";
+        View tiledSubView = CreateTiledView (4, 0, 2);
+        overlappedView1.Add (tiledSubView);
+        tiledSubView = CreateTiledView (5, Pos.Right (tiledSubView), Pos.Top (tiledSubView));
+        overlappedView1.Add (tiledSubView);
+
+        ProgressBar progressBar = new ()
+        {
+            Y = Pos.AnchorEnd (),
+            Width = Dim.Fill (),
+            Id = "progressBar"
+        };
+        overlappedView1.Add (progressBar);
+
+        Timer timer = new (10)
+        {
+            AutoReset = true
+        };
+
+        timer.Elapsed += (o, args) =>
+                         {
+                             if (progressBar!.Fraction == 1.0)
+                             {
+                                 progressBar.Fraction = 0;
+                             }
+
+                             progressBar.Fraction += 0.01f;
+
+                             Application.Wakeup ();
+
+                             progressBar.SetNeedsDisplay ();
+                         };
+        timer.Start ();
+
+        View overlappedView2 = CreateOverlappedView (3, 4, 15);
+        overlappedView2.Title = "_Not Movable";
+        overlappedView2.Arrangement = ViewArrangement.Overlapped | ViewArrangement.Resizable;
+
+        View overlappedInOverlapped1 = CreateOverlappedView (4, 1, 4);
+        overlappedView2.Add (overlappedInOverlapped1);
+
+        View overlappedInOverlapped2 = CreateOverlappedView (5, 10, 7);
+        overlappedView2.Add (overlappedInOverlapped2);
+
+        StatusBar statusBar = new ();
+
+        statusBar.Add (
+                       new Shortcut
+                       {
+                           Title = "Hide",
+                           Text = "Hotkey",
+                           Key = Key.F4,
+                           Action = () =>
+                                    {
+                                        // TODO: move this logic into `View.ShowHide()` or similar
+                                        overlappedView2.Visible = false;
+                                        overlappedView2.Enabled = overlappedView2.Visible;
+                                    }
+                       });
+
+        statusBar.Add (
+                       new Shortcut
+                       {
+                           Title = "Toggle Hide",
+                           Text = "App",
+                           KeyBindingScope = KeyBindingScope.Application,
+                           Key = Key.F4.WithCtrl,
+                           Action = () =>
+                                    {
+                                        // TODO: move this logic into `View.ShowHide()` or similar
+                                        overlappedView2.Visible = !overlappedView2.Visible;
+                                        overlappedView2.Enabled = overlappedView2.Visible;
+
+                                        if (overlappedView2.Visible)
+                                        {
+                                            overlappedView2.SetFocus ();
+                                        }
+                                    }
+                       });
+        overlappedView2.Add (statusBar);
+
+        ColorPicker colorPicker = new ()
+        {
+            Y = 12,
+            Width = Dim.Fill (),
+            Id = "colorPicker",
+            Style = new ()
+            {
+                ShowTextFields = true,
+                ShowColorName = true
+            }
+        };
+        colorPicker.ApplyStyleChanges ();
+
+        colorPicker.SelectedColor = testFrame.ColorScheme!.Normal.Background;
+        colorPicker.ColorChanged += ColorPicker_ColorChanged;
+        overlappedView2.Add (colorPicker);
+        overlappedView2.Width = 50;
+
+        testFrame.Add (overlappedView1);
+        testFrame.Add (overlappedView2);
+
+        DatePicker datePicker = new ()
+        {
+            X = 30,
+            Y = 17,
+            Id = "datePicker",
+            Title = "Not _Sizeable",
+            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            ShadowStyle = ShadowStyle.Transparent,
+            BorderStyle = LineStyle.Double,
+            TabStop = TabBehavior.TabGroup,
+            Arrangement = ViewArrangement.Movable | ViewArrangement.Overlapped
+        };
+        testFrame.Add (datePicker);
+
+        adornmentsEditor.AutoSelectSuperView = testFrame;
+        arrangementEditor.AutoSelectSuperView = testFrame;
+
+        testFrame.SetFocus ();
+        Application.Run (app);
+        timer.Close ();
+        app.Dispose ();
+        Application.Shutdown ();
+
+        return;
+
+        void ColorPicker_ColorChanged (object sender, ColorEventArgs e)
+        {
+            testFrame.ColorScheme = testFrame.ColorScheme! with { Normal = new (testFrame.ColorScheme.Normal.Foreground, e.CurrentValue) };
+        }
+    }
+
+    private View CreateOverlappedView (int id, Pos x, Pos y)
+    {
+        var overlapped = new View
+        {
+            X = x,
+            Y = y,
+            Width = Dim.Auto (minimumContentDim: 15),
+            Height = Dim.Auto (minimumContentDim: 3),
+            Title = $"Overlapped{id} _{GetNextHotKey ()}",
+            ColorScheme = Colors.ColorSchemes ["Toplevel"],
+            Id = $"Overlapped{id}",
+            ShadowStyle = ShadowStyle.Transparent,
+            BorderStyle = LineStyle.Double,
+            CanFocus = true,
+            TabStop = TabBehavior.TabGroup,
+            Arrangement = ViewArrangement.Movable | ViewArrangement.Overlapped | ViewArrangement.Resizable
+        };
+
+        return overlapped;
+    }
+
+    private View CreateTiledView (int id, Pos x, Pos y)
+    {
+        var tiled = new View
+        {
+            X = x,
+            Y = y,
+            Width = Dim.Auto (minimumContentDim: 15),
+            Height = Dim.Auto (minimumContentDim: 3),
+            Title = $"Tiled{id} _{GetNextHotKey ()}",
+            Id = $"Tiled{id}",
+            BorderStyle = LineStyle.Single,
+            CanFocus = true,
+            TabStop = TabBehavior.TabStop,
+            Arrangement = ViewArrangement.Resizable,
+//            SuperViewRendersLineCanvas = true
+        };
+
+        return tiled;
+    }
+
+    private char GetNextHotKey () { return (char)('A' + _hotkeyCount++); }
+}

UICatalog/Scenarios/ExpanderButton.cs

@@ -47,10 +47,7 @@ public class ExpanderButton : Button
         Initialized += ExpanderButton_Initialized;
     }
 
-    private void ExpanderButton_Initialized (object sender, EventArgs e)
-    {
-        ExpandOrCollapse (Collapsed);
-    }
+    private void ExpanderButton_Initialized (object sender, EventArgs e) { ExpandOrCollapse (Collapsed); }
 
     private Orientation _orientation = Orientation.Horizontal;
 
@@ -74,7 +71,7 @@ public class ExpanderButton : Button
     /// <returns>True of the event was cancelled.</returns>
     protected virtual bool OnOrientationChanging (Orientation newOrientation)
     {
-        var args = new CancelEventArgs<Orientation> (in _orientation, ref newOrientation);
+        CancelEventArgs<Orientation> args = new CancelEventArgs<Orientation> (in _orientation, ref newOrientation);
         OrientationChanging?.Invoke (this, args);
 
         if (!args.Cancel)
@@ -129,7 +126,6 @@ public class ExpanderButton : Button
     }
 
     /// <summary>Called when the orientation is changing. Invokes the <see cref="OrientationChanging"/> event.</summary>
-    /// <param name="newOrientation"></param>
     /// <param name="newValue"></param>
     /// <returns>True of the event was cancelled.</returns>
     protected virtual bool OnCollapsedChanging (bool newValue)
@@ -142,18 +138,6 @@ public class ExpanderButton : Button
             _collapsed = args.NewValue;
 
             ExpandOrCollapse (_collapsed);
-
-            View superView = SuperView;
-            if (superView is Adornment adornment)
-            {
-                superView = adornment.Parent;
-            }
-
-            foreach (View subview in superView.Subviews)
-            {
-                subview.Visible = !Collapsed;
-                subview.Enabled = !Collapsed;
-            }
         }
 
         return args.Cancel;
@@ -183,6 +167,7 @@ public class ExpanderButton : Button
         Text = $"{(Collapsed ? CollapsedGlyph : ExpandedGlyph)}";
 
         View superView = SuperView;
+
         if (superView is Adornment adornment)
         {
             superView = adornment.Parent;
@@ -224,5 +209,11 @@ public class ExpanderButton : Button
                 superView.Width = _previousDim;
             }
         }
+
+        foreach (View subview in superView.Subviews)
+        {
+            subview.Visible = !Collapsed;
+            subview.Enabled = !Collapsed;
+        }
     }
 }