Partial on #2975 - Replaces Menu v1 in many places with v2

Terminal.Gui/Application/Application.Keyboard.cs

@@ -13,6 +13,17 @@ public static partial class Application // Keyboard handling
     /// <returns><see langword="true"/> if the key was handled.</returns>
     public static bool RaiseKeyDownEvent (Key key)
     {
+        Logging.Debug ($"{key}");
+
+        // TODO: Add a way to ignore certain keys, esp for debugging.
+        //#if DEBUG
+        //        if (key == Key.Empty.WithAlt || key == Key.Empty.WithCtrl)
+        //        {
+        //            Logging.Debug ($"Ignoring {key}");
+        //            return false;
+        //        }
+        //#endif
+
         // TODO: This should match standard event patterns
         KeyDown?.Invoke (null, key);
 

Terminal.Gui/Application/Application.Mouse.cs

@@ -63,7 +63,7 @@ public static void UngrabMouse ()
         }
 
 #if DEBUG_IDISPOSABLE
-        if (View.DebugIDisposable)
+        if (View.EnableDebugIDisposableAsserts)
         {
             ObjectDisposedException.ThrowIf (MouseGrabView.WasDisposed, MouseGrabView);
         }
@@ -154,7 +154,7 @@ internal static void RaiseMouseEvent (MouseEventArgs mouseEvent)
         if (deepestViewUnderMouse is { })
         {
 #if DEBUG_IDISPOSABLE
-            if (View.DebugIDisposable && deepestViewUnderMouse.WasDisposed)
+            if (View.EnableDebugIDisposableAsserts && deepestViewUnderMouse.WasDisposed)
             {
                 throw new ObjectDisposedException (deepestViewUnderMouse.GetType ().FullName);
             }
@@ -174,8 +174,11 @@ internal static void RaiseMouseEvent (MouseEventArgs mouseEvent)
             && Popover?.GetActivePopover () as View is { Visible: true } visiblePopover
             && View.IsInHierarchy (visiblePopover, deepestViewUnderMouse, includeAdornments: true) is false)
         {
-
-            visiblePopover.Visible = false;
+            // TODO: Build a use/test case for the popover not handling Quit
+            if (visiblePopover.InvokeCommand (Command.Quit) is true && visiblePopover.Visible)
+            {
+                visiblePopover.Visible = false;
+            }
 
             // Recurse once so the event can be handled below the popover
             RaiseMouseEvent (mouseEvent);
@@ -297,7 +300,7 @@ internal static bool HandleMouseGrab (View? deepestViewUnderMouse, MouseEventArg
         if (MouseGrabView is { })
         {
 #if DEBUG_IDISPOSABLE
-            if (View.DebugIDisposable && MouseGrabView.WasDisposed)
+            if (View.EnableDebugIDisposableAsserts && MouseGrabView.WasDisposed)
             {
                 throw new ObjectDisposedException (MouseGrabView.GetType ().FullName);
             }

Terminal.Gui/Application/Application.Run.cs

@@ -98,7 +98,7 @@ public static RunState Begin (Toplevel toplevel)
         var rs = new RunState (toplevel);
 
 #if DEBUG_IDISPOSABLE
-        if (View.DebugIDisposable && Top is { } && toplevel != Top && !TopLevels.Contains (Top))
+        if (View.EnableDebugIDisposableAsserts && Top is { } && toplevel != Top && !TopLevels.Contains (Top))
         {
             // This assertion confirm if the Top was already disposed
             Debug.Assert (Top.WasDisposed);
@@ -193,6 +193,11 @@ public static RunState Begin (Toplevel toplevel)
             toplevel.EndInit (); // Calls Layout
         }
 
+        // Call ConfigurationManager Apply here to ensure all subscribers to ConfigurationManager.Applied
+        // can update their state appropriately.
+        // BUGBUG: DO NOT DO THIS. Leave this commented out until we can figure out how to do this right
+        //Apply ();
+
         // Try to set initial focus to any TabStop
         if (!toplevel.HasFocus)
         {
@@ -426,7 +431,7 @@ public static T Run<T> (Func<Exception, bool>? errorHandler = null, IConsoleDriv
 
     internal static void LayoutAndDrawImpl (bool forceDraw = false)
     {
-        List<View> tops = [..TopLevels];
+        List<View> tops = [.. TopLevels];
 
         if (Popover?.GetActivePopover () as View is { Visible: true } visiblePopover)
         {
@@ -479,7 +484,10 @@ public static void RunLoop (RunState state)
 
         for (state.Toplevel.Running = true; state.Toplevel?.Running == true;)
         {
-            MainLoop!.Running = true;
+            if (MainLoop is { })
+            {
+                MainLoop.Running = true;
+            }
 
             if (EndAfterFirstIteration && !firstIteration)
             {
@@ -489,7 +497,10 @@ public static void RunLoop (RunState state)
             firstIteration = RunIteration (ref state, firstIteration);
         }
 
-        MainLoop!.Running = false;
+        if (MainLoop is { })
+        {
+            MainLoop.Running = false;
+        }
 
         // Run one last iteration to consume any outstanding input events from Driver
         // This is important for remaining OnKeyUp events.
@@ -505,7 +516,7 @@ public static void RunLoop (RunState state)
     public static bool RunIteration (ref RunState state, bool firstIteration = false)
     {
         // If the driver has events pending do an iteration of the driver MainLoop
-        if (MainLoop!.Running && MainLoop.EventsPending ())
+        if (MainLoop is { Running: true } && MainLoop.EventsPending ())
         {
             // Notify Toplevel it's ready
             if (firstIteration)
@@ -529,7 +540,7 @@ public static bool RunIteration (ref RunState state, bool firstIteration = false
 
         if (PositionCursor ())
         {
-            Driver!.UpdateCursor ();
+            Driver?.UpdateCursor ();
         }
 
         return firstIteration;
@@ -564,7 +575,14 @@ public static void End (RunState runState)
     {
         ArgumentNullException.ThrowIfNull (runState);
 
-        Popover?.Hide (Popover?.GetActivePopover ());
+        if (Popover?.GetActivePopover () as View is { Visible: true } visiblePopover)
+        {
+            // TODO: Build a use/test case for the popover not handling Quit
+            if (visiblePopover.InvokeCommand (Command.Quit) is true && visiblePopover.Visible)
+            {
+                visiblePopover.Visible = false;
+            }
+        }
 
         runState.Toplevel.OnUnloaded ();
 

Terminal.Gui/Application/Application.cs

@@ -53,6 +53,7 @@ public static string ToString (IConsoleDriver? driver)
         {
             return string.Empty;
         }
+
         var sb = new StringBuilder ();
 
         Cell [,] contents = driver?.Contents!;
@@ -139,7 +140,7 @@ internal static List<CultureInfo> GetSupportedCultures ()
     // starts running and after Shutdown returns.
     internal static void ResetState (bool ignoreDisposed = false)
     {
-        Application.Navigation = new ApplicationNavigation ();
+        Navigation = new ();
 
         // Shutdown is the bookend for Init. As such it needs to clean up all resources
         // Init created. Apps that do any threading will need to code defensively for this.
@@ -151,18 +152,21 @@ internal static void ResetState (bool ignoreDisposed = false)
 
         if (Popover?.GetActivePopover () is View popover)
         {
+            // This forcefully closes the popover; invoking Command.Quit would be more graceful
+            // but since this is shutdown, doing this is ok.
             popover.Visible = false;
         }
+
         Popover?.Dispose ();
         Popover = null;
 
         TopLevels.Clear ();
 #if DEBUG_IDISPOSABLE
 
         // Don't dispose the Top. It's up to caller dispose it
-        if (View.DebugIDisposable && !ignoreDisposed && Top is { })
+        if (View.EnableDebugIDisposableAsserts && !ignoreDisposed && Top is { })
         {
-            Debug.Assert (Top.WasDisposed);
+            Debug.Assert (Top.WasDisposed, $"Title = {Top.Title}, Id = {Top.Id}");
 
             // If End wasn't called _cachedRunStateToplevel may be null
             if (_cachedRunStateToplevel is { })
@@ -223,7 +227,6 @@ internal static void ResetState (bool ignoreDisposed = false)
 
         Navigation = null;
 
-
         KeyBindings.Clear ();
         AddKeyBindings ();
 
@@ -234,10 +237,9 @@ internal static void ResetState (bool ignoreDisposed = false)
         SynchronizationContext.SetSynchronizationContext (null);
     }
 
-
     /// <summary>
     ///     Adds specified idle handler function to main iteration processing. The handler function will be called
     ///     once per iteration of the main loop after other events have been handled.
     /// </summary>
-    public static void AddIdle (Func<bool> func) => ApplicationImpl.Instance.AddIdle (func);
+    public static void AddIdle (Func<bool> func) { ApplicationImpl.Instance.AddIdle (func); }
 }

Terminal.Gui/Application/ApplicationImpl.cs

@@ -34,7 +34,7 @@ public static void ChangeInstance (IApplication newApplication)
     [RequiresDynamicCode ("AOT")]
     public virtual void Init (IConsoleDriver? driver = null, string? driverName = null)
     {
-            Application.InternalInit (driver, driverName);
+        Application.InternalInit (driver, driverName);
     }
 
     /// <summary>
@@ -166,34 +166,35 @@ public virtual void Run (Toplevel view, Func<Exception, bool>? errorHandler = nu
             try
             {
 #endif
-            resume = false;
-            RunState runState = Application.Begin (view);
+                resume = false;
+                RunState runState = Application.Begin (view);
 
-            // If EndAfterFirstIteration is true then the user must dispose of the runToken
-            // by using NotifyStopRunState event.
-            Application.RunLoop (runState);
+                // If EndAfterFirstIteration is true then the user must dispose of the runToken
+                // by using NotifyStopRunState event.
+                Application.RunLoop (runState);
 
-            if (runState.Toplevel is null)
-            {
+                if (runState.Toplevel is null)
+                {
 #if DEBUG_IDISPOSABLE
-                if (View.DebugIDisposable)
+                if (View.EnableDebugIDisposableAsserts)
                 {
                     Debug.Assert (Application.TopLevels.Count == 0);
                 }
 #endif
-                runState.Dispose ();
+                    runState.Dispose ();
 
-                return;
-            }
+                    return;
+                }
 
-            if (!Application.EndAfterFirstIteration)
-            {
-                Application.End (runState);
-            }
+                if (!Application.EndAfterFirstIteration)
+                {
+                    Application.End (runState);
+                }
 #if !DEBUG
             }
             catch (Exception error)
             {
+                Logging.Warning ($"Release Build Exception: {error}");
                 if (errorHandler is null)
                 {
                     throw;
@@ -225,7 +226,7 @@ public virtual void Shutdown ()
         {
             bool init = Application.Initialized;
 
-            Application.OnInitializedChanged(this, new (in init));
+            Application.OnInitializedChanged (this, new (in init));
         }
     }
 
@@ -270,7 +271,7 @@ public virtual void Invoke (Action action)
     /// <inheritdoc />
     public virtual void AddIdle (Func<bool> func)
     {
-        if(Application.MainLoop is null)
+        if (Application.MainLoop is null)
         {
             throw new NotInitializedException ("Cannot add idle before main loop is initialized");
         }
@@ -294,7 +295,7 @@ public virtual object AddTimeout (TimeSpan time, Func<bool> callback)
 
     /// <inheritdoc />
     public virtual bool RemoveTimeout (object token)
-    { 
+    {
         return Application.MainLoop?.TimedEvents.RemoveTimeout (token) ?? false;
     }
 

Terminal.Gui/Application/ApplicationPopover.cs

@@ -103,6 +103,7 @@ public void Show (IPopover? popover)
 
         if (popover is View newPopover)
         {
+            Register (popover);
             if (!newPopover.IsInitialized)
             {
                 newPopover.BeginInit ();
@@ -145,6 +146,7 @@ internal bool DispatchKeyDown (Key key)
 
         if (activePopover is { Visible: true })
         {
+            Logging.Debug ($"Active - Calling NewKeyDownEvent ({key}) on {activePopover.Title}");
             if (activePopover.NewKeyDownEvent (key))
             {
                 return true;
@@ -163,6 +165,7 @@ internal bool DispatchKeyDown (Key key)
             }
 
             // hotKeyHandled = popoverView.InvokeCommandsBoundToHotKey (key);
+            Logging.Debug ($"Inactive - Calling NewKeyDownEvent ({key}) on {popoverView.Title}");
             hotKeyHandled = popoverView.NewKeyDownEvent (key);
 
             if (hotKeyHandled is true)

Terminal.Gui/Application/PopoverBaseImpl.cs

@@ -41,7 +41,7 @@ protected PopoverBaseImpl ()
         {
             if (!Visible)
             {
-                return null;
+                return false;
             }
 
             Visible = false;
@@ -54,11 +54,22 @@ protected PopoverBaseImpl ()
     protected override bool OnVisibleChanging ()
     {
         bool ret = base.OnVisibleChanging ();
-        if (!ret && !Visible)
+        if (ret is not true)
         {
-            // Whenever visible is changing to true, we need to resize;
-            // it's our only chance because we don't get laid out until we're visible
-            Layout (Application.Screen.Size);
+            if (!Visible)
+            {
+                // Whenever visible is changing to true, we need to resize;
+                // it's our only chance because we don't get laid out until we're visible
+                Layout (Application.Screen.Size);
+            }
+            else
+            {
+                // Whenever visible is changing to false, we need to reset the focus
+                if (ApplicationNavigation.IsInHierarchy(this, Application.Navigation?.GetFocused ()))
+                {
+                   Application.Navigation?.SetFocused (Application.Top?.MostFocused);
+                }
+            }
         }
 
         return ret;