Update to latest changes to TableView to have to use Cursor instead of Row

Author: tznind

Showcase/Showcase.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Terminal.Gui" Version="2.0.0-develop.5281 " />
+    <PackageReference Include="Terminal.Gui" Version="2.0.0-develop.5373 " />
   </ItemGroup>
 
 </Project>

src/Design.cs

@@ -1,9 +1,9 @@
+using NLog;
 using System.Data;
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
 using System.Reflection;
 using System.Xml.Linq;
-using NLog;
 using Terminal.Gui;
 using Terminal.Gui.App;
 using Terminal.Gui.Configuration;
@@ -16,6 +16,7 @@
 using TerminalGuiDesigner.Operations.StatusBarOperations;
 using TerminalGuiDesigner.Operations.TableViewOperations;
 using TerminalGuiDesigner.ToCode;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace TerminalGuiDesigner;
 
@@ -239,22 +240,23 @@ public Design CreateSubControlDesign(string name, View subView)
 
         if (subView is TreeView tree)
         {
-            tree.AddObject(new TreeNode("Example Branch 1")
-            {
-                Children = new[] { new TreeNode("Child 1") },
+            tree.AddObject(new TreeNode() {
+                Text = "Example Branch 1",
+                Children = new[] { new TreeNode() { Text = "Child 1" } },
             });
-            tree.AddObject(new TreeNode("Example Branch 2")
+            tree.AddObject(new TreeNode()
             {
+                Text = "Example Branch 2",
                 Children = new[]
                 {
-                    new TreeNode("Child 1"),
-                    new TreeNode("Child 2"),
+                    new TreeNode() { Text = "Child 1" },
+                    new TreeNode() { Text = "Child 2" },
                 },
             });
 
             for (int l = 0; l < 20; l++)
             {
-                tree.AddObject(new TreeNode($"Example Leaf {l}"));
+                tree.AddObject(new TreeNode() { Text = $"Example Leaf {l}" });
             }
         }
 
@@ -312,9 +314,9 @@ public IEnumerable<IOperation> GetExtraOperations(Mouse? mouse = null)
             }
 
             // if no column was right clicked then provide commands for the selected column
-            if (col == null && tv.SelectedColumn >= 0)
+            if (col == null && tv.Cursor.Position.Value.X >= 0)
             {
-                col = dt.Columns[tv.SelectedColumn];
+                col = dt.Columns[tv.Cursor.Position.Value.X];
             }
 
             yield return new AddColumnOperation(App, this, null);
@@ -756,7 +758,6 @@ private IEnumerable<Property> LoadDesignableProperties()
             yield return this.CreateSubProperty(nameof(TreeStyle.ColorExpandSymbol), nameof(TreeView<ITreeNode>.Style), tree.Style);
             yield return this.CreateSubProperty(nameof(TreeStyle.ExpandableSymbol), nameof(TreeView<ITreeNode>.Style), tree.Style);
             yield return this.CreateSubProperty(nameof(TreeStyle.InvertExpandSymbolColors), nameof(TreeView<ITreeNode>.Style), tree.Style);
-            yield return this.CreateSubProperty(nameof(TreeStyle.LeaveLastRow), nameof(TreeView<ITreeNode>.Style), tree.Style);
             yield return this.CreateSubProperty(nameof(TreeStyle.ShowBranchLines), nameof(TreeView<ITreeNode>.Style), tree.Style);
         }
 

src/TerminalGuiDesigner.csproj

@@ -20,7 +20,7 @@
 		<PackageOutputPath>./nupkg</PackageOutputPath>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<PackageId>TerminalGuiDesigner</PackageId>
-		<Version>2.0.0-develop.5281</Version>
+		<Version>2.0.0-develop.5373</Version>
 		<Authors>Thomas Nind</Authors>
 		<Nullable>enable</Nullable>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -33,7 +33,7 @@
 		<PackageIcon>logo.png</PackageIcon>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageReleaseNotes>
-			2.0.0-alpha.5281
+			2.0.0-alpha.5373
 			* Update to latest nuget package
 			* Fix crash caused moving PosRelative view without its pair into different container View
 			2.0.0-alpha.4519
@@ -165,7 +165,7 @@
 		<PackageReference Include="Serilog" Version="4.2.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-		<PackageReference Include="Terminal.Gui" Version="2.0.0-develop.5281" />
+		<PackageReference Include="Terminal.Gui" Version="2.0.0-develop.5373" />
 		<PackageReference Include="nlog" Version="5.3.3" />
 		<PackageReference Include="Basic.Reference.Assemblies.Net100" Version="1.7.7" />
 		<PackageReference Include="System.CodeDom" Version="10.0.0" />

src/UI/Windows/KeyBindingsUI.cs

@@ -60,9 +60,9 @@ public KeyBindingsUI(IApplication app, KeyMap keyMap) {
                 return null;
             };
 
-            tableView.CellActivated += (s, e) =>
+            tableView.Activated += (s, e) =>
             {
-                var prop = _props[e.Row];
+                var prop = _props[tableView.Cursor.Position.Value.Y];
                 var k = Modals.GetShortcut(app);
                 prop.SetValue(this.keyMap,k.ToString());
                 this.SetNeedsDraw();

src/ViewFactory.cs

@@ -278,7 +278,7 @@ public static T Create<T>(int? width = null, int? height = null, string? text =
                     {
                         return Enumerable.Empty<FileSystemInfo>();
                     }
-                });
+                },(f)=>f is DirectoryInfo);
 
                 SetDefaultDimensions(newView, width ?? 16, height ?? 5);
                 break;