Update ContextMenu to instead use PopoverMenu

Author: tznind

Showcase/Showcase.csproj

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

src/ContextMenuExtensions.cs

@@ -20,7 +20,7 @@
 		<PackageOutputPath>./nupkg</PackageOutputPath>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<PackageId>TerminalGuiDesigner</PackageId>
-		<Version>2.0.0-develop.4401</Version>
+		<Version>2.0.0-develop.4405</Version>
 		<Authors>Thomas Nind</Authors>
 		<Nullable>enable</Nullable>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -155,7 +155,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.4401" />
+		<PackageReference Include="Terminal.Gui" Version="2.0.0-develop.4405" />
 		<PackageReference Include="nlog" Version="5.3.3" />
 		<PackageReference Include="Basic.Reference.Assemblies.Net80" Version="1.7.7" />
 		<PackageReference Include="System.CodeDom" Version="8.0.0" />

src/TerminalGuiDesigner.csproj

@@ -939,20 +939,22 @@ private void CreateAndShowContextMenu(MouseEventArgs? m, Design? rightClicked)
         var setPropsItems = setProps.Select(ToMenuItem).ToArray();
         bool hasPropsItems = setPropsItems.Any();
 
-        var all = new List<MenuItem>();
+        var all = new List<MenuItemv2>();
 
         // only add the set properties category if there are some
         if (hasPropsItems)
         {
-            all.Add(new MenuBarItem(name, setPropsItems)
+            all.Add(new MenuItemv2()
             {
+                Title = name,
                 Action = () =>
                 {
                     if (selected.Length == 1 || rightClicked != null)
                     {
                         this.ShowEditProperties(rightClicked ?? selected[0]);
                     }
                 },
+                SubMenu = new Menuv2(setPropsItems)
             });
         }
 
@@ -970,7 +972,7 @@ private void CreateAndShowContextMenu(MouseEventArgs? m, Design? rightClicked)
                 // Add categories first
                 all.Insert(
                     hasPropsItems ? 1 : 0,
-                    new MenuBarItem(g.Key, g.ToArray()));
+                    new MenuBarItemv2(g.Key, g.ToArray()));
             }
         }
 
@@ -980,18 +982,17 @@ private void CreateAndShowContextMenu(MouseEventArgs? m, Design? rightClicked)
             return;
         }
 
-        var menu = new ContextMenu();
-        menu.SetMenuItems(new MenuBarItem(all.ToArray()));
-
+        var menu = new PopoverMenu(all.ToArray());
+        Point position;
         if (m != null)
         {
-            menu.Position = m.Position;
+            position = m.Position;
         }
         else
         {
             var d = SelectionManager.Instance.Selected.FirstOrDefault() ?? this.viewBeingEdited;
             var pt = d.View.ContentToScreen(new Point(0, 0));
-            menu.Position = new Point(pt.X, pt.Y);
+            position = new Point(pt.X, pt.Y);
         }
 
         this.menuOpen = true;
@@ -1002,18 +1003,19 @@ private void CreateAndShowContextMenu(MouseEventArgs? m, Design? rightClicked)
             m.Handled = true;
         }
 
+        
         // TODO: rly? you have to pass it its own menu items!?
-        menu.Show(menu.MenuItems);
-        menu.MenuBar.MenuAllClosed += (_, _) =>
+        menu.MakeVisible(position);
+        menu.Accepted += (_, _) =>
         {
             this.menuOpen = false;
             SelectionManager.Instance.LockSelection = false;
         };
     }
 
-    private static MenuItem ToMenuItem(IOperation operation)
+    private static MenuItemv2 ToMenuItem(IOperation operation)
     {
-        return new MenuItem(operation.ToString(), string.Empty, () => Try(() => OperationManager.Instance.Do(operation)));
+        return new MenuItemv2(operation.ToString(), string.Empty, () => Try(() => OperationManager.Instance.Do(operation)));
 
         static void Try(Action action)
         {