Support for selecting and resizing 'View' basic class

README.md

@@ -112,13 +112,14 @@ You can create a menu separator by typing `---`
 ### Features
 -------------------------------
 
-The following feature list shows the current capabilities and the roadmap
+The following feature list shows the current capabilities and the roadmap.  Features in
+italics are experimental and require passing the `-e` flag when starting application.
 
 - [x] Design classes 
     - [x] Window
     - [x] Dialog
-    - [ ] View
-    - [ ] Top level (with statusbar and or menu)
+    - [x] _View_
+    - [x] _Top level_
 - [x] Configure root properties (e.g. Window.Width, Title etc)
 - [x] Configure subview properties
     - [x] (Name)
@@ -203,7 +204,7 @@ The following feature list shows the current capabilities and the roadmap
   - [x] TextView
   - [x] TimeField
   - [x] TreeView
-  - [ ] View
+  - [x] View
 
 ### Class Diagram
 -------------------------------

src/DesignState.cs

@@ -0,0 +1,58 @@
+using Terminal.Gui;
+using TerminalGuiDesigner.UI;
+
+namespace TerminalGuiDesigner;
+
+/// <summary>
+/// Describes state based changes and custom callbacks on a <see cref="Design"/>
+/// e.g. <see cref="OriginalScheme"/>
+/// </summary>
+public class DesignState
+{
+    public ColorScheme? OriginalScheme { get; set; }
+	public Design Design{ get; }
+
+	public DesignState(Design design)
+	{
+        Design = design;
+        OriginalScheme = Design.View.GetExplicitColorScheme();
+        Design.View.DrawContent += DrawContent;
+        Design.View.Enter += Enter;
+    }
+
+    private void Enter(View.FocusEventArgs obj)
+    {
+        SelectionManager.Instance.SetSelection(Design);
+    }
+
+    private void DrawContent(Rect r)
+	{ 
+        if(Design.View.IsBorderlessContainerView() && Editor.ShowBorders)
+        {
+            DrawBorderlessViewFrame(r);
+        }
+    }
+
+	private void DrawBorderlessViewFrame(Rect r)
+    {
+        bool isSelected = SelectionManager.Instance.Selected.Contains(Design);
+
+        var color =  isSelected ?
+            SelectionManager.Instance.SelectedScheme.Normal :
+            Design.View.ColorScheme.Normal;
+
+        Application.Driver.SetAttribute(color);
+
+        var v = Design.View;
+
+        for (int x = 0; x < r.Width ; x++)
+            for (int y = 0; y < r.Height; y++)
+            {
+                if (y == 0 || y == r.Height - 1 || x == 0 || x == r.Width - 1)
+                {
+                    var rune = (y == r.Height - 1 && x == r.Width - 1 && isSelected) ? '╬' : '.';
+                    v.AddRune(x,y,rune);
+                }
+            }
+    }
+}

src/Keys.yaml

@@ -12,6 +12,7 @@ Delete: DeleteChar
 ToggleDragging: F3
 AddView: F2
 ToggleShowFocused: L, CtrlMask
+ToggleShowBorders: B, CtrlMask
 RightClick: Button3Clicked
 Copy: C, CtrlMask
 Paste: V, CtrlMask

src/Operations/DragOperation.cs

@@ -16,14 +16,14 @@ private class DragMemento
         public Pos OriginalX {get;}
         public Pos OriginalY {get;}
 
-        public View OriginalSuperView {get;}
+        public View? OriginalSuperView {get;}
 
         public DragMemento(Design design)
         {
             Design = design;
             OriginalX = design.View.X;
             OriginalY = design.View.Y;
-            OriginalSuperView = design.View.SuperView;
+            OriginalSuperView = design.View.SuperView?.GetNearestDesign()?.View;
         }
     }
 
@@ -108,7 +108,7 @@ private bool Do(DragMemento mem)
             // if changing to a new container
             if (DropInto != mem.OriginalSuperView && mem.OriginalSuperView != null)
             {
-                mem.OriginalSuperView.Remove(mem.Design.View);
+                mem.Design.View.SuperView.Remove(mem.Design.View);
                 DropInto.Add(mem.Design.View);
             }
         }

src/Options.cs

@@ -21,7 +21,10 @@ public class Options
 
         [Option( HelpText = "Enables UseSystemConsole, an alternative console display driver")]
         public bool Usc { get;set; }
-
+
+        [Option( 'e', HelpText = "Enables experimental features")]
+        public bool Experimental { get;set; }
+
         #nullable enable warnings
 
         [Usage(ApplicationAlias = "TerminalGuiDesigner")]

src/Program.cs

@@ -14,6 +14,7 @@ public static void Main(string[] args)
                    .WithParsed<Options>(o =>
                    {
                        Application.UseSystemConsole = o.Usc;
+                       Editor.Experimental = o.Experimental;
 
                        Application.Init();
                        var editor = new Editor();

src/SelectionManager.cs

@@ -17,8 +17,6 @@ public class SelectionManager
     /// </summary>
     public IReadOnlyCollection<Design> Selected => selection.AsReadOnly();
 
-    Dictionary<Design, ColorScheme?> oldSchemes = new();
-
     /// <summary>
     /// Set to true to prevent changes to the current <see cref="Selected"/>
     /// collection (e.g. if running a modal dialog / context menu).
@@ -57,16 +55,8 @@ public ColorScheme SelectedScheme
 
 
     public static SelectionManager Instance = new();
-    private ColorScheme selectedScheme;
-
-
-    public ColorScheme? GetOriginalExplicitColorScheme(Design design)
-    {
-        if (oldSchemes.ContainsKey(design))
-            return oldSchemes[design];
+    private ColorScheme? selectedScheme;
 
-        return null;
-    }
 
     /// <summary>
     /// Changes the selection without respecting <see cref="LockSelection"/>
@@ -99,40 +89,25 @@ private void SetSelection(bool respectLock, Design[] designs)
 
         foreach (var d in selection)
         {
-            // record the old color scheme so we can get reset it
-            // later when it is no longer selected
-            oldSchemes.Add(d, d.View.GetExplicitColorScheme());
-
             // since the view is selected mark it so
             d.View.ColorScheme = SelectedScheme;
         }
     }
 
-    /// <summary>
-    /// Updates the cached known ColorScheme (prior to selection).  Use this method
-    /// if you are making changes to the ColorScheme of an actively selected object
-    /// </summary>
-    public void UpdateKnownScheme(Design design, ColorScheme? colorScheme)
-    {
-        if(oldSchemes.ContainsKey(design))
-        {
-            oldSchemes[design] = colorScheme;
-        }
-    }
-
     public void Clear(bool respectLock = true)
     {
         if (LockSelection && respectLock)
             return;
 
+        var selected = selection.ToArray();
+
         selection.Clear();
 
         // reset old color schemes so views don't still look selected
-        foreach (var kvp in oldSchemes)
+        foreach (var d in selected)
         {
-            kvp.Key.View.ColorScheme = kvp.Value;
+            d.View.ColorScheme = d.State.OriginalScheme;
         }
-        oldSchemes.Clear();
     }
 
     /// <summary>

src/ToCode/ColorSchemeProperty.cs

@@ -38,10 +38,7 @@ public override CodeExpression GetRhs()
     }
     public override object? GetValue()
     {
-        if (SelectionManager.Instance.Selected.Contains(Design))
-            return SelectionManager.Instance.GetOriginalExplicitColorScheme(Design);
-
-        return Design.View.GetExplicitColorScheme();
+        return Design.State.OriginalScheme ?? Design.View.GetExplicitColorScheme();
     }
     protected override string GetHumanReadableValue()
     {
@@ -62,6 +59,6 @@ public override void SetValue(object? value)
     {
         base.SetValue(value);
 
-        SelectionManager.Instance.UpdateKnownScheme(Design,value as ColorScheme);
+        Design.State.OriginalScheme = value as ColorScheme;
     }
 }

src/ToCode/ViewToCode.cs

@@ -31,22 +31,25 @@ public Design GenerateNewView(FileInfo csFilePath, string namespaceName,Type vie
         var csharpCode = GetGenerateNewViewCode(className, namespaceName);
         File.WriteAllText(sourceFile.CsFile.FullName, csharpCode);
 
-        var view = (View)(Activator.CreateInstance(viewType) ?? throw new Exception($"Could not create instance of Type '{viewType}' ('Activator.CreateInstance' returned null)"));
+        var prototype = (View)(Activator.CreateInstance(viewType) ?? throw new Exception($"Could not create instance of Type '{viewType}' ('Activator.CreateInstance' returned null)"));
 
         // Unlike Window and Dialog the default constructor on
         // View will be a size 0 view.  Make it big so it can be 
         // edited
         if(viewType == typeof(View))
         {
-            view.Width = Dim.Fill();
-            view.Height = Dim.Fill();
+            prototype.Width = Dim.Fill();
+            prototype.Height = Dim.Fill();
         }
 
-        var design = new Design(sourceFile, Design.RootDesignName, view);
+        // use the prototype to create a designer cs file
+        var design = new Design(sourceFile, Design.RootDesignName, prototype);
         design.CreateSubControlDesigns();
 
         GenerateDesignerCs(design, sourceFile,viewType);
 
+        // Reload the designer cs file to create a new instance (which is returned).
+        // NOTE: prototype is not the same instance that is returned;
 
         var decompiler = new CodeToView(sourceFile);
         return decompiler.CreateInstance();