Update to latest packages and don't show F1 help if menu is open or context menu popped.

Author: tznind

README.md

@@ -171,7 +171,7 @@ italics are experimental and require passing the `-e` flag when starting applica
   - [x] Container views (e.g. TabView)
   - [ ] To OS clipboard (e.g. open one Designer.cs View and copy to another)
   - [x] Retain PosRelative mappings in pasted views (e.g. `A` LeftOf `B`)
-- [x] Move views to subviews
+- [x] Move views to SubViews
   - [x] With mouse
   - [ ] With keyboard
 - [ ] Read and present xmldoc comments when editing properties

Showcase/Menu.Designer.cs

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Terminal.Gui" Version="2.0.0-develop.4363" />
+    <PackageReference Include="Terminal.Gui" Version="2.0.0-develop.4372" />
   </ItemGroup>
 
 </Project>

Showcase/Showcase.csproj

@@ -458,7 +458,7 @@ public IEnumerable<Design> GetSiblings()
             yield break;
         }
 
-        foreach (var v in this.View.SuperView.Subviews)
+        foreach (var v in this.View.SuperView.SubViews)
         {
             if (v == this.View)
             {

src/Design.cs

@@ -38,7 +38,7 @@ public static class StatusBarExtensions
         int distance = initialWhitespace;
         Dictionary<int, Shortcut?> xLocations = new();
 
-        foreach (var si in statusBar.Subviews.OfType<Shortcut>())
+        foreach (var si in statusBar.SubViews.OfType<Shortcut>())
         {
             xLocations.Add(distance, si);
             distance += si.Title.GetColumns() + afterEachItemWhitespace;
@@ -65,7 +65,7 @@ public static class StatusBarExtensions
     /// <returns></returns>
     public static int CountShortcuts(this StatusBar bar)
     {
-        return bar.Subviews.OfType<Shortcut>().Count();
+        return bar.SubViews.OfType<Shortcut>().Count();
     }
 
     /// <summary>
@@ -76,7 +76,7 @@ public static int CountShortcuts(this StatusBar bar)
     /// <returns></returns>
     public static Shortcut[] GetShortcuts(this StatusBar bar)
     {
-        return bar.Subviews.OfType<Shortcut>().ToArray();
+        return bar.SubViews.OfType<Shortcut>().ToArray();
     }
 
     /// <summary>

src/StatusBarExtensions.cs

@@ -129,7 +129,7 @@
 			* Right click context menu support
 			* Increased mouse resizing click hit box
 			* Added progress indicator for creating new Views
-			* Fixed mouse dragging/resizing of views in subviews (e.g. TabViews)
+			* Fixed mouse dragging/resizing of views in SubViews (e.g. TabViews)
 		</PackageReleaseNotes>
 	</PropertyGroup>
 	<ItemGroup>
@@ -143,8 +143,6 @@
 	<ItemGroup>
 		<PackageReference Include="Basic.Reference.Assemblies.Net70" Version="1.7.7" />
 		<PackageReference Include="CommandLineParser" Version="2.9.1" />
-		<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
@@ -153,7 +151,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.4363" />
+		<PackageReference Include="Terminal.Gui" Version="2.0.0-develop.4372 " />
 		<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

@@ -206,7 +206,7 @@ public void GenerateDesignerCs(Design rootDesign, Type viewType)
     public void AddSubViewsToDesignerCs(View forView, CodeDomArgs args, CodeExpression? parentViewExpression = null)
     {
         // order the controls top left to lower right so that tab order is good
-        foreach (var sub in ViewExtensions.OrderViewsByScreenPosition(forView.Subviews))
+        foreach (var sub in ViewExtensions.OrderViewsByScreenPosition(forView.SubViews))
         {
             // If the sub child has a Design (and is not an public part of another control,
             // For example ContentView sub-view of Window

src/ToCode/ViewToCode.cs

@@ -1066,6 +1066,18 @@ private void ShowViewSpecificOperations()
 
     private void ShowHelp()
     {
+        if (menuOpen)
+        {
+            return;
+        }
+        var menuItem = MenuTracker.Instance.CurrentlyOpenMenuItem;
+
+        // if we are in a menu
+        if (menuItem != null)
+        {
+            return;
+        }
+        
         ChoicesDialog.Query("Help", this.GetHelp(), "Ok");
     }
 

src/UI/Editor.cs

@@ -63,7 +63,7 @@ public ChoicesDialog(string title, string message, params string[] options) {
             };
         }
 
-        buttonPanel.LayoutSubviews();
+        buttonPanel.LayoutSubViews();
 
         // hide other buttons
         for(int i=options.Length;i<buttons.Length;i++)
@@ -77,7 +77,7 @@ public ChoicesDialog(string title, string message, params string[] options) {
         int buttonWidth;
 
         // align buttons bottom of dialog 
-        buttonPanel.Width = buttonWidth = buttons.Sum(b=>buttonPanel.Subviews.Contains(b) ? b.Frame.Width : 0) + 1;
+        buttonPanel.Width = buttonWidth = buttons.Sum(b=>buttonPanel.SubViews.Contains(b) ? b.Frame.Width : 0) + 1;
 
         int maxWidthLine = TextFormatter.GetSumMaxCharWidth(message);
         if (maxWidthLine > Application.Driver.Cols)

src/UI/Windows/ChoicesDialog.cs

@@ -23,14 +23,14 @@ public static class ViewExtensions
     /// <param name="v"><see cref="View"/> whose children you want to find.</param>
     /// <returns>All <see cref="View"/> that user perceives as within <paramref name="v"/> skipping over
     /// any Terminal.Gui artifacts (e.g. ContentView).</returns>
-    public static IList<View> GetActualSubviews(this View v)
+    public static IReadOnlyCollection<View> GetActualSubviews(this View v)
     {
         if (v is TabView t)
         {
             return t.Tabs.Select(tab => tab.View).Where(v => v != null).ToList();
         }
 
-        return v.Subviews;
+        return v.SubViews;
     }
 
     /// <summary>
@@ -401,8 +401,8 @@ public static IEnumerable<View> OrderViewsByScreenPosition(IEnumerable<View> vie
     }
 
     /// <summary>
-    /// Returns all subviews that are not Designable.  Beware that designs can be nested
-    /// e.g. calling this on a root view with return subviews that belong to other designed
+    /// Returns all SubViews that are not Designable.  Beware that designs can be nested
+    /// e.g. calling this on a root view with return SubViews that belong to other designed
     /// components that were added to the root designed window.
     /// </summary>
     /// <param name="view"></param>
@@ -415,7 +415,7 @@ public static IEnumerable<View> GetAllNonDesignableSubviews(this View view)
     }
     private static void RecursivelyIgnoreAllNonDesignableSubviews(View view, List<View> alsoIgnore)
     {
-        foreach (var sub in view.Subviews)
+        foreach (var sub in view.SubViews)
         {
             // If Data is string then it is likely a View that is going to
             // end up having a Design but we haven't gotten to it yet (i.e. method is being called mid-load)