Phase 1: Core API rename - Application.Top→Current, TopLevels→SessionStack

Co-authored-by: tig <[email protected]>

Examples/CommunityToolkitExample/Program.cs

@@ -16,7 +16,7 @@ public static class Program
         Services = ConfigureServices ();
         Application.Init ();
         Application.Run (Services.GetRequiredService<LoginView> ());
-        Application.Top?.Dispose ();
+        Application.Current?.Dispose ();
         Application.Shutdown ();
     }
 

Examples/ReactiveExample/Program.cs

@@ -16,7 +16,7 @@ public static class Program
         RxApp.MainThreadScheduler = TerminalScheduler.Default;
         RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
         Application.Run (new LoginView (new LoginViewModel ()));
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.Shutdown ();
     }
 }

Examples/UICatalog/Scenario.cs

@@ -221,7 +221,7 @@ public class Scenario : IDisposable
 
     private void OnApplicationSessionBegun (object? sender, SessionTokenEventArgs e)
     {
-        SubscribeAllSubViews (Application.Top!);
+        SubscribeAllSubViews (Application.Current!);
 
         _demoKeys = GetDemoKeyStrokes ();
 
@@ -241,7 +241,7 @@ public class Scenario : IDisposable
 
         return;
 
-        // Get a list of all subviews under Application.Top (and their subviews, etc.)
+        // Get a list of all subviews under Application.Current (and their subviews, etc.)
         // and subscribe to their DrawComplete event
         void SubscribeAllSubViews (View view)
         {

Examples/UICatalog/Scenarios/AllViewsTester.cs

@@ -28,7 +28,7 @@ public class AllViewsTester : Scenario
 
     public override void Main ()
     {
-        // Don't create a sub-win (Scenario.Win); just use Application.Top
+        // Don't create a sub-win (Scenario.Win); just use Application.Current
         Application.Init ();
 
         var app = new Window

Examples/UICatalog/Scenarios/Bars.cs

@@ -28,7 +28,7 @@ public class Bars : Scenario
     // QuitKey and it only sticks if changed after init
     private void App_Loaded (object sender, EventArgs e)
     {
-        Application.Top!.Title = GetQuitKeyAndName ();
+        Application.Current!.Title = GetQuitKeyAndName ();
 
         ObservableCollection<string> eventSource = new ();
         ListView eventLog = new ListView ()
@@ -41,7 +41,7 @@ public class Bars : Scenario
             Source = new ListWrapper<string> (eventSource)
         };
         eventLog.Border!.Thickness = new (0, 1, 0, 0);
-        Application.Top.Add (eventLog);
+        Application.Current.Add (eventLog);
 
         FrameView menuBarLikeExamples = new ()
         {
@@ -51,7 +51,7 @@ public class Bars : Scenario
             Width = Dim.Fill () - Dim.Width (eventLog),
             Height = Dim.Percent(33),
         };
-        Application.Top.Add (menuBarLikeExamples);
+        Application.Current.Add (menuBarLikeExamples);
 
         Label label = new Label ()
         {
@@ -98,7 +98,7 @@ public class Bars : Scenario
             Width = Dim.Fill () - Dim.Width (eventLog),
             Height = Dim.Percent (33),
         };
-        Application.Top.Add (menuLikeExamples);
+        Application.Current.Add (menuLikeExamples);
 
         label = new Label ()
         {
@@ -212,7 +212,7 @@ public class Bars : Scenario
             Width = Dim.Width (menuLikeExamples),
             Height = Dim.Percent (33),
         };
-        Application.Top.Add (statusBarLikeExamples);
+        Application.Current.Add (statusBarLikeExamples);
 
         label = new Label ()
         {
@@ -249,7 +249,7 @@ public class Bars : Scenario
         ConfigStatusBar (bar);
         statusBarLikeExamples.Add (bar);
 
-        foreach (FrameView frameView in Application.Top.SubViews.Where (f => f is FrameView)!)
+        foreach (FrameView frameView in Application.Current.SubViews.Where (f => f is FrameView)!)
         {
             foreach (Bar barView in frameView.SubViews.Where (b => b is Bar)!)
             {
@@ -269,8 +269,8 @@ public class Bars : Scenario
 
     //private void SetupContentMenu ()
     //{
-    //    Application.Top.Add (new Label { Text = "Right Click for Context Menu", X = Pos.Center (), Y = 4 });
-    //    Application.Top.MouseClick += ShowContextMenu;
+    //    Application.Current.Add (new Label { Text = "Right Click for Context Menu", X = Pos.Center (), Y = 4 });
+    //    Application.Current.MouseClick += ShowContextMenu;
     //}
 
     //private void ShowContextMenu (object s, MouseEventEventArgs e)

Examples/UICatalog/Scenarios/CombiningMarks.cs

@@ -13,7 +13,7 @@ public class CombiningMarks : Scenario
         top.DrawComplete += (s, e) =>
         {
             // Forces reset _lineColsOffset because we're dealing with direct draw
-            Application.Top!.SetNeedsDraw ();
+            Application.Current!.SetNeedsDraw ();
 
             var i = -1;
             top.AddStr ("Terminal.Gui only supports combining marks that normalize. See Issue #2616.");

Examples/UICatalog/Scenarios/ConfigurationEditor.cs

@@ -75,7 +75,7 @@ public class ConfigurationEditor : Scenario
 
         void ConfigurationManagerOnApplied (object? sender, ConfigurationManagerEventArgs e)
         {
-            Application.Top?.SetNeedsDraw ();
+            Application.Current?.SetNeedsDraw ();
         }
     }
     public void Save ()

Examples/UICatalog/Scenarios/CsvEditor.cs

@@ -502,7 +502,7 @@ public class CsvEditor : Scenario
             // Only set the current filename if we successfully loaded the entire file
             _currentFile = filename;
             _selectedCellTextField.SuperView.Enabled = true;
-            Application.Top.Title = $"{GetName ()} - {Path.GetFileName (_currentFile)}";
+            Application.Current.Title = $"{GetName ()} - {Path.GetFileName (_currentFile)}";
         }
         catch (Exception ex)
         {

Examples/UICatalog/Scenarios/Mazing.cs

@@ -171,7 +171,7 @@ public class Mazing : Scenario
                 if (_m.PlayerHp <= 0)
                 {
                     _message = "You died!";
-                    Application.Top!.SetNeedsDraw (); // trigger redraw
+                    Application.Current!.SetNeedsDraw (); // trigger redraw
                     _dead = true;
 
                     return; // Stop further action if dead
@@ -190,7 +190,7 @@ public class Mazing : Scenario
                 _message = string.Empty;
             }
 
-            Application.Top!.SetNeedsDraw (); // trigger redraw
+            Application.Current!.SetNeedsDraw (); // trigger redraw
         }
 
         // Optional win condition:
@@ -200,7 +200,7 @@ public class Mazing : Scenario
             _m = new (); // Generate a new maze
             _m.PlayerHp = hp;
             GenerateNpcs ();
-            Application.Top!.SetNeedsDraw (); // trigger redraw
+            Application.Current!.SetNeedsDraw (); // trigger redraw
         }
     }
 }

Examples/UICatalog/Scenarios/Shortcuts.cs

@@ -28,7 +28,7 @@ public class Shortcuts : Scenario
     private void App_Loaded (object? sender, EventArgs e)
     {
         Application.QuitKey = Key.F4.WithCtrl;
-        Application.Top!.Title = GetQuitKeyAndName ();
+        Application.Current!.Title = GetQuitKeyAndName ();
 
         ObservableCollection<string> eventSource = new ();
 
@@ -46,14 +46,14 @@ public class Shortcuts : Scenario
 
         eventLog.Width = Dim.Func (
                                    _ => Math.Min (
-                                                  Application.Top.Viewport.Width / 2,
+                                                  Application.Current.Viewport.Width / 2,
                                                   eventLog?.MaxLength + eventLog!.GetAdornmentsThickness ().Horizontal ?? 0));
 
         eventLog.Width = Dim.Func (
                                    _ => Math.Min (
                                                   eventLog.SuperView!.Viewport.Width / 2,
                                                   eventLog?.MaxLength + eventLog!.GetAdornmentsThickness ().Horizontal ?? 0));
-        Application.Top.Add (eventLog);
+        Application.Current.Add (eventLog);
 
         var alignKeysShortcut = new Shortcut
         {
@@ -86,7 +86,7 @@ public class Shortcuts : Scenario
                                                                           };
 
 
-        Application.Top.Add (alignKeysShortcut);
+        Application.Current.Add (alignKeysShortcut);
 
         var commandFirstShortcut = new Shortcut
         {
@@ -115,7 +115,7 @@ public class Shortcuts : Scenario
                                                                                                       $"{commandFirstShortcut.Id}.CommandView.CheckedStateChanging: {cb.Text}");
                                                                                      eventLog.MoveDown ();
 
-                                                                                     IEnumerable<View> toAlign = Application.Top.SubViews.OfType<Shortcut> ();
+                                                                                     IEnumerable<View> toAlign = Application.Current.SubViews.OfType<Shortcut> ();
                                                                                      IEnumerable<View> enumerable = toAlign as View [] ?? toAlign.ToArray ();
 
                                                                                      foreach (View view in enumerable)
@@ -134,7 +134,7 @@ public class Shortcuts : Scenario
                                                                                  }
                                                                              };
 
-        Application.Top.Add (commandFirstShortcut);
+        Application.Current.Add (commandFirstShortcut);
 
         var canFocusShortcut = new Shortcut
         {
@@ -159,7 +159,7 @@ public class Shortcuts : Scenario
                                                                                  SetCanFocus (e.Result == CheckState.Checked);
                                                                              }
                                                                          };
-        Application.Top.Add (canFocusShortcut);
+        Application.Current.Add (canFocusShortcut);
 
         var appShortcut = new Shortcut
         {
@@ -173,7 +173,7 @@ public class Shortcuts : Scenario
             BindKeyToApplication = true
         };
 
-        Application.Top.Add (appShortcut);
+        Application.Current.Add (appShortcut);
 
         var buttonShortcut = new Shortcut
         {
@@ -193,7 +193,7 @@ public class Shortcuts : Scenario
         var button = (Button)buttonShortcut.CommandView;
         buttonShortcut.Accepting += Button_Clicked;
 
-        Application.Top.Add (buttonShortcut);
+        Application.Current.Add (buttonShortcut);
 
         var optionSelectorShortcut = new Shortcut
         {
@@ -221,7 +221,7 @@ public class Shortcuts : Scenario
                                                                                     }
                                                                                 };
 
-        Application.Top.Add (optionSelectorShortcut);
+        Application.Current.Add (optionSelectorShortcut);
 
         var sliderShortcut = new Shortcut
         {
@@ -248,7 +248,7 @@ public class Shortcuts : Scenario
                                                                            eventLog.MoveDown ();
                                                                        };
 
-        Application.Top.Add (sliderShortcut);
+        Application.Current.Add (sliderShortcut);
 
         ListView listView = new ListView ()
         {
@@ -270,7 +270,7 @@ public class Shortcuts : Scenario
             Key = Key.F5.WithCtrl,
         };
 
-        Application.Top.Add (listViewShortcut);
+        Application.Current.Add (listViewShortcut);
 
         var noCommandShortcut = new Shortcut
         {
@@ -282,7 +282,7 @@ public class Shortcuts : Scenario
             Key = Key.D0
         };
 
-        Application.Top.Add (noCommandShortcut);
+        Application.Current.Add (noCommandShortcut);
 
         var noKeyShortcut = new Shortcut
         {
@@ -295,7 +295,7 @@ public class Shortcuts : Scenario
             HelpText = "Keyless"
         };
 
-        Application.Top.Add (noKeyShortcut);
+        Application.Current.Add (noKeyShortcut);
 
         var noHelpShortcut = new Shortcut
         {
@@ -308,7 +308,7 @@ public class Shortcuts : Scenario
             HelpText = ""
         };
 
-        Application.Top.Add (noHelpShortcut);
+        Application.Current.Add (noHelpShortcut);
         noHelpShortcut.SetFocus ();
 
         var framedShortcut = new Shortcut
@@ -340,7 +340,7 @@ public class Shortcuts : Scenario
         }
 
         framedShortcut.SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Toplevel);
-        Application.Top.Add (framedShortcut);
+        Application.Current.Add (framedShortcut);
 
         // Horizontal
         var progressShortcut = new Shortcut
@@ -387,7 +387,7 @@ public class Shortcuts : Scenario
                          };
         timer.Start ();
 
-        Application.Top.Add (progressShortcut);
+        Application.Current.Add (progressShortcut);
 
         var textField = new TextField
         {
@@ -408,7 +408,7 @@ public class Shortcuts : Scenario
         };
         textField.CanFocus = true;
 
-        Application.Top.Add (textFieldShortcut);
+        Application.Current.Add (textFieldShortcut);
 
         var bgColorShortcut = new Shortcut
         {
@@ -450,19 +450,19 @@ public class Shortcuts : Scenario
                                         eventSource.Add ($"ColorChanged: {o.GetType ().Name} - {args.Result}");
                                         eventLog.MoveDown ();
 
-                                        Application.Top.SetScheme (
-                                                                   new (Application.Top.GetScheme ())
+                                        Application.Current.SetScheme (
+                                                                   new (Application.Current.GetScheme ())
                                                                    {
                                                                        Normal = new (
-                                                                                     Application.Top!.GetAttributeForRole (VisualRole.Normal).Foreground,
+                                                                                     Application.Current!.GetAttributeForRole (VisualRole.Normal).Foreground,
                                                                                      args.Result,
-                                                                                     Application.Top!.GetAttributeForRole (VisualRole.Normal).Style)
+                                                                                     Application.Current!.GetAttributeForRole (VisualRole.Normal).Style)
                                                                    });
                                     }
                                 };
         bgColorShortcut.CommandView = bgColor;
 
-        Application.Top.Add (bgColorShortcut);
+        Application.Current.Add (bgColorShortcut);
 
         var appQuitShortcut = new Shortcut
         {
@@ -476,9 +476,9 @@ public class Shortcuts : Scenario
         };
         appQuitShortcut.Accepting += (o, args) => { Application.RequestStop (); };
 
-        Application.Top.Add (appQuitShortcut);
+        Application.Current.Add (appQuitShortcut);
 
-        foreach (Shortcut shortcut in Application.Top.SubViews.OfType<Shortcut> ())
+        foreach (Shortcut shortcut in Application.Current.SubViews.OfType<Shortcut> ())
         {
             shortcut.Selecting += (o, args) =>
                                   {
@@ -529,7 +529,7 @@ public class Shortcuts : Scenario
 
         void SetCanFocus (bool canFocus)
         {
-            foreach (Shortcut peer in Application.Top!.SubViews.OfType<Shortcut> ())
+            foreach (Shortcut peer in Application.Current!.SubViews.OfType<Shortcut> ())
             {
                 if (peer.CanFocus)
                 {
@@ -542,7 +542,7 @@ public class Shortcuts : Scenario
         {
             var max = 0;
 
-            IEnumerable<Shortcut> toAlign = Application.Top!.SubViews.OfType<Shortcut> ().Where(s => !s.Y.Has<PosAnchorEnd>(out _)).Cast<Shortcut>();
+            IEnumerable<Shortcut> toAlign = Application.Current!.SubViews.OfType<Shortcut> ().Where(s => !s.Y.Has<PosAnchorEnd>(out _)).Cast<Shortcut>();
             IEnumerable<Shortcut> enumerable = toAlign as Shortcut [] ?? toAlign.ToArray ();
 
             if (align)

Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs

@@ -179,9 +179,9 @@ public class SingleBackgroundWorker : Scenario
 
                                                   var builderUI =
                                                       new StagingUIController (_startStaging, e.Result as ObservableCollection<string>);
-                                                  Toplevel top = Application.Top;
+                                                  Toplevel top = Application.Current;
                                                   top.Visible = false;
-                                                  Application.Top.Visible = false;
+                                                  Application.Current.Visible = false;
                                                   builderUI.Load ();
                                                   builderUI.Dispose ();
                                                   top.Visible = true;

Examples/UICatalog/Scenarios/Themes.cs

@@ -129,7 +129,7 @@ public sealed class Themes : Scenario
                                           {
                                               if (_view is { })
                                               {
-                                                  Application.Top!.SchemeName = args.NewValue;
+                                                  Application.Current!.SchemeName = args.NewValue;
 
                                                   if (_view.HasScheme)
                                                   {

Examples/UICatalog/Scenarios/TreeUseCases.cs

@@ -77,7 +77,7 @@ public class TreeUseCases : Scenario
 
         if (_currentTree != null)
         {
-            Application.Top.Remove (_currentTree);
+            Application.Current.Remove (_currentTree);
             _currentTree.Dispose ();
         }
 
@@ -97,7 +97,7 @@ public class TreeUseCases : Scenario
             tree.TreeBuilder = new GameObjectTreeBuilder ();
         }
 
-        Application.Top.Add (tree);
+        Application.Current.Add (tree);
 
         tree.AddObject (army1);
 
@@ -117,13 +117,13 @@ public class TreeUseCases : Scenario
 
         if (_currentTree != null)
         {
-            Application.Top.Remove (_currentTree);
+            Application.Current.Remove (_currentTree);
             _currentTree.Dispose ();
         }
 
         var tree = new TreeView { X = 0, Y = 1, Width = Dim.Fill(), Height = Dim.Fill (1) };
 
-        Application.Top.Add (tree);
+        Application.Current.Add (tree);
 
         tree.AddObject (myHouse);
 
@@ -134,13 +134,13 @@ public class TreeUseCases : Scenario
     {
         if (_currentTree != null)
         {
-            Application.Top.Remove (_currentTree);
+            Application.Current.Remove (_currentTree);
             _currentTree.Dispose ();
         }
 
         var tree = new TreeView { X = 0, Y = 1, Width = Dim.Fill (), Height = Dim.Fill (1) };
 
-        Application.Top.Add (tree);
+        Application.Current.Add (tree);
 
         var root1 = new TreeNode ("Root1");
         root1.Children.Add (new TreeNode ("Child1.1"));

Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs

@@ -69,7 +69,7 @@ public class WindowsAndFrameViews : Scenario
         // add it to our list
         listWin.Add (win);
 
-        // create 3 more Windows in a loop, adding them Application.Top
+        // create 3 more Windows in a loop, adding them Application.Current
         // Each with a
         //	button
         //  sub Window with

Examples/UICatalog/UICatalog.cs

@@ -242,7 +242,7 @@ public class UICatalog
 
     /// <summary>
     ///     Shows the UI Catalog selection UI. When the user selects a Scenario to run, the UI Catalog main app UI is
-    ///     killed and the Scenario is run as though it were Application.Top. When the Scenario exits, this function exits.
+    ///     killed and the Scenario is run as though it were Application.Current. When the Scenario exits, this function exits.
     /// </summary>
     /// <returns></returns>
     private static Scenario RunUICatalogTopLevel ()
@@ -332,7 +332,7 @@ public class UICatalog
 
     private static void ConfigFileChanged (object sender, FileSystemEventArgs e)
     {
-        if (Application.Top == null)
+        if (Application.Current == null)
         {
             return;
         }

Examples/UICatalog/UICatalogTop.cs

@@ -691,7 +691,7 @@ public class UICatalogTop : Toplevel
         _disableMouseCb!.CheckedState = Application.IsMouseDisabled ? CheckState.Checked : CheckState.UnChecked;
         _force16ColorsShortcutCb!.CheckedState = Application.Force16Colors ? CheckState.Checked : CheckState.UnChecked;
 
-        Application.Top?.SetNeedsDraw ();
+        Application.Current?.SetNeedsDraw ();
     }
 
     private void ConfigAppliedHandler (object? sender, ConfigurationManagerEventArgs? a) { ConfigApplied (); }

Terminal.Gui/App/Application.Lifecycle.cs

@@ -16,7 +16,7 @@ public static partial class Application // Lifecycle (Init/Shutdown)
     /// <para>Call this method once per instance (or after <see cref="Shutdown"/> has been called).</para>
     /// <para>
     ///     This function loads the right <see cref="IDriver"/> for the platform, Creates a <see cref="Toplevel"/>. and
-    ///     assigns it to <see cref="Top"/>
+    ///     assigns it to <see cref="Current"/>
     /// </para>
     /// <para>
     ///     <see cref="Shutdown"/> must be called when the application is closing (typically after

Terminal.Gui/App/Application.Toplevel.cs

@@ -5,14 +5,14 @@ namespace Terminal.Gui.App;
 
 public static partial class Application // Toplevel handling
 {
-    /// <inheritdoc cref="IApplication.TopLevels"/>
-    public static ConcurrentStack<Toplevel> TopLevels => ApplicationImpl.Instance.TopLevels;
+    /// <inheritdoc cref="IApplication.SessionStack"/>
+    public static ConcurrentStack<Toplevel> SessionStack => ApplicationImpl.Instance.SessionStack;
 
     /// <summary>The <see cref="Toplevel"/> that is currently active.</summary>
-    /// <value>The top.</value>
-    public static Toplevel? Top
+    /// <value>The current toplevel.</value>
+    public static Toplevel? Current
     {
-        get => ApplicationImpl.Instance.Top;
-        internal set => ApplicationImpl.Instance.Top = value;
+        get => ApplicationImpl.Instance.Current;
+        internal set => ApplicationImpl.Instance.Current = value;
     }
 }

Terminal.Gui/App/ApplicationImpl.Lifecycle.cs

@@ -157,7 +157,7 @@ public partial class ApplicationImpl
         // e.g. see Issue #537
 
         // === 1. Stop all running toplevels ===
-        foreach (Toplevel? t in TopLevels)
+        foreach (Toplevel? t in SessionStack)
         {
             t!.Running = false;
         }
@@ -174,25 +174,25 @@ public partial class ApplicationImpl
         Popover = null;
 
         // === 3. Clean up toplevels ===
-        TopLevels.Clear ();
+        SessionStack.Clear ();
 
 #if DEBUG_IDISPOSABLE
 
-        // Don't dispose the Top. It's up to caller dispose it
-        if (View.EnableDebugIDisposableAsserts && !ignoreDisposed && Top is { })
+        // Don't dispose the Current. It's up to caller dispose it
+        if (View.EnableDebugIDisposableAsserts && !ignoreDisposed && Current is { })
         {
-            Debug.Assert (Top.WasDisposed, $"Title = {Top.Title}, Id = {Top.Id}");
+            Debug.Assert (Current.WasDisposed, $"Title = {Current.Title}, Id = {Current.Id}");
 
             // If End wasn't called _CachedSessionTokenToplevel may be null
             if (CachedSessionTokenToplevel is { })
             {
                 Debug.Assert (CachedSessionTokenToplevel.WasDisposed);
-                Debug.Assert (CachedSessionTokenToplevel == Top);
+                Debug.Assert (CachedSessionTokenToplevel == Current);
             }
         }
 #endif
 
-        Top = null;
+        Current = null;
         CachedSessionTokenToplevel = null;
 
         // === 4. Clean up driver ===

Terminal.Gui/App/ApplicationImpl.Run.cs

@@ -37,28 +37,28 @@ public partial class ApplicationImpl
         var rs = new SessionToken (toplevel);
 
 #if DEBUG_IDISPOSABLE
-        if (View.EnableDebugIDisposableAsserts && Top is { } && toplevel != Top && !TopLevels.Contains (Top))
+        if (View.EnableDebugIDisposableAsserts && Current is { } && toplevel != Current && !SessionStack.Contains (Current))
         {
-            // This assertion confirm if the Top was already disposed
-            Debug.Assert (Top.WasDisposed);
-            Debug.Assert (Top == CachedSessionTokenToplevel);
+            // This assertion confirm if the Current was already disposed
+            Debug.Assert (Current.WasDisposed);
+            Debug.Assert (Current == CachedSessionTokenToplevel);
         }
 #endif
 
-        lock (TopLevels)
+        lock (SessionStack)
         {
-            if (Top is { } && toplevel != Top && !TopLevels.Contains (Top))
+            if (Current is { } && toplevel != Current && !SessionStack.Contains (Current))
             {
-                // If Top was already disposed and isn't on the Toplevels Stack,
+                // If Current was already disposed and isn't on the Toplevels Stack,
                 // clean it up here if is the same as _CachedSessionTokenToplevel
-                if (Top == CachedSessionTokenToplevel)
+                if (Current == CachedSessionTokenToplevel)
                 {
-                    Top = null;
+                    Current = null;
                 }
                 else
                 {
                     // Probably this will never hit
-                    throw new ObjectDisposedException (Top.GetType ().FullName);
+                    throw new ObjectDisposedException (Current.GetType ().FullName);
                 }
             }
 
@@ -67,56 +67,56 @@ public partial class ApplicationImpl
             if (string.IsNullOrEmpty (toplevel.Id))
             {
                 var count = 1;
-                var id = (TopLevels.Count + count).ToString ();
+                var id = (SessionStack.Count + count).ToString ();
 
-                while (TopLevels.Count > 0 && TopLevels.FirstOrDefault (x => x.Id == id) is { })
+                while (SessionStack.Count > 0 && SessionStack.FirstOrDefault (x => x.Id == id) is { })
                 {
                     count++;
-                    id = (TopLevels.Count + count).ToString ();
+                    id = (SessionStack.Count + count).ToString ();
                 }
 
-                toplevel.Id = (TopLevels.Count + count).ToString ();
+                toplevel.Id = (SessionStack.Count + count).ToString ();
 
-                TopLevels.Push (toplevel);
+                SessionStack.Push (toplevel);
             }
             else
             {
-                Toplevel? dup = TopLevels.FirstOrDefault (x => x.Id == toplevel.Id);
+                Toplevel? dup = SessionStack.FirstOrDefault (x => x.Id == toplevel.Id);
 
                 if (dup is null)
                 {
-                    TopLevels.Push (toplevel);
+                    SessionStack.Push (toplevel);
                 }
             }
         }
 
-        if (Top is null)
+        if (Current is null)
         {
-            Top = toplevel;
+            Current = toplevel;
         }
 
-        if ((Top?.Modal == false && toplevel.Modal)
-            || (Top?.Modal == false && !toplevel.Modal)
-            || (Top?.Modal == true && toplevel.Modal))
+        if ((Current?.Modal == false && toplevel.Modal)
+            || (Current?.Modal == false && !toplevel.Modal)
+            || (Current?.Modal == true && toplevel.Modal))
         {
             if (toplevel.Visible)
             {
-                if (Top is { HasFocus: true })
+                if (Current is { HasFocus: true })
                 {
-                    Top.HasFocus = false;
+                    Current.HasFocus = false;
                 }
 
-                // Force leave events for any entered views in the old Top
+                // Force leave events for any entered views in the old Current
                 if (Mouse.GetLastMousePosition () is { })
                 {
                     Mouse.RaiseMouseEnterLeaveEvents (Mouse.GetLastMousePosition ()!.Value, new ());
                 }
 
-                Top?.OnDeactivate (toplevel);
-                Toplevel previousTop = Top!;
+                Current?.OnDeactivate (toplevel);
+                Toplevel previousTop = Current!;
 
-                Top = toplevel;
-                Top.OnActivate (previousTop);
+                Current = toplevel;
+                Current.OnActivate (previousTop);
             }
         }
 
@@ -193,15 +193,15 @@ public partial class ApplicationImpl
             throw new InvalidOperationException ("Driver was inexplicably null when trying to Run view");
         }
 
-        Top = view;
+        Current = view;
 
         SessionToken rs = Application.Begin (view);
 
-        Top.Running = true;
+        Current.Running = true;
 
         var firstIteration = true;
 
-        while (TopLevels.TryPeek (out Toplevel? found) && found == view && view.Running)
+        while (SessionStack.TryPeek (out Toplevel? found) && found == view && view.Running)
         {
             if (Coordinator is null)
             {
@@ -237,7 +237,7 @@ public partial class ApplicationImpl
 
         // End the Session
         // First, take it off the Toplevel Stack
-        if (TopLevels.TryPop (out Toplevel? topOfStack))
+        if (SessionStack.TryPop (out Toplevel? topOfStack))
         {
             if (topOfStack != sessionToken.Toplevel)
             {
@@ -250,10 +250,10 @@ public partial class ApplicationImpl
         // Notify that it is closing
         sessionToken.Toplevel?.OnClosed (sessionToken.Toplevel);
 
-        if (TopLevels.TryPeek (out Toplevel? newTop))
+        if (SessionStack.TryPeek (out Toplevel? newTop))
         {
-            Top = newTop;
-            Top?.SetNeedsDraw ();
+            Current = newTop;
+            Current?.SetNeedsDraw ();
         }
 
         if (sessionToken.Toplevel is { HasFocus: true })
@@ -261,9 +261,9 @@ public partial class ApplicationImpl
             sessionToken.Toplevel.HasFocus = false;
         }
 
-        if (Top is { HasFocus: false })
+        if (Current is { HasFocus: false })
         {
-            Top.SetFocus ();
+            Current.SetFocus ();
         }
 
         CachedSessionTokenToplevel = sessionToken.Toplevel;
@@ -283,9 +283,9 @@ public partial class ApplicationImpl
     /// <inheritdoc/>
     public void RequestStop (Toplevel? top)
     {
-        Logging.Trace ($"Top: '{(top is { } ? top : "null")}'");
+        Logging.Trace ($"Current: '{(top is { } ? top : "null")}'");
 
-        top ??= Top;
+        top ??= Current;
 
         if (top == null)
         {
@@ -325,7 +325,7 @@ public partial class ApplicationImpl
     public void Invoke (Action action)
     {
         // If we are already on the main UI thread
-        if (Top is { Running: true } && MainThreadId == Thread.CurrentThread.ManagedThreadId)
+        if (Current is { Running: true } && MainThreadId == Thread.CurrentThread.ManagedThreadId)
         {
             action ();
 

Terminal.Gui/App/ApplicationImpl.Screen.cs

@@ -133,7 +133,7 @@ public partial class ApplicationImpl
 
         ScreenChanged?.Invoke (this, new (screen));
 
-        foreach (Toplevel t in TopLevels)
+        foreach (Toplevel t in SessionStack)
         {
             t.OnSizeChanging (new (screen.Size));
             t.SetNeedsLayout ();
@@ -147,7 +147,7 @@ public partial class ApplicationImpl
     /// <inheritdoc/>
     public void LayoutAndDraw (bool forceRedraw = false)
     {
-        List<View> tops = [.. TopLevels];
+        List<View> tops = [.. SessionStack];
 
         if (Popover?.GetActivePopover () as View is { Visible: true } visiblePopover)
         {

Terminal.Gui/App/ApplicationImpl.cs

@@ -96,12 +96,12 @@ public partial class ApplicationImpl : IApplication
     public ApplicationNavigation? Navigation { get; set; }
 
     /// <inheritdoc/>
-    public Toplevel? Top { get; set; }
+    public Toplevel? Current { get; set; }
 
-    // BUGBUG: Technically, this is not the full lst of TopLevels. There be dragons here, e.g. see how Toplevel.Id is used. What
+    // BUGBUG: Technically, this is not the full lst of sessions. There be dragons here, e.g. see how Toplevel.Id is used. What
 
     /// <inheritdoc/>
-    public ConcurrentStack<Toplevel> TopLevels { get; } = new ();
+    public ConcurrentStack<Toplevel> SessionStack { get; } = new ();
 
     /// <inheritdoc/>
     public Toplevel? CachedSessionTokenToplevel { get; set; }

Terminal.Gui/App/ApplicationNavigation.cs

@@ -109,6 +109,6 @@ public class ApplicationNavigation
         {
             return visiblePopover.AdvanceFocus (direction, behavior);
         }
-        return Application.Top is { } && Application.Top.AdvanceFocus (direction, behavior);
+        return Application.Current is { } && Application.Current.AdvanceFocus (direction, behavior);
     }
 }

Terminal.Gui/App/ApplicationPopover.cs

@@ -37,8 +37,8 @@ public sealed class ApplicationPopover : IDisposable
     {
         if (popover is { } && !_popovers.Contains (popover))
         {
-            // When created, set IPopover.Toplevel to the current Application.Top
-            popover.Toplevel ??= Application.Top;
+            // When created, set IPopover.Toplevel to the current Application.Current
+            popover.Toplevel ??= Application.Current;
 
             _popovers.Add (popover);
         }
@@ -148,7 +148,7 @@ public sealed class ApplicationPopover : IDisposable
         {
             _activePopover = null;
             popoverView.Visible = false;
-            Application.Top?.SetNeedsDraw ();
+            Application.Current?.SetNeedsDraw ();
         }
     }
 
@@ -197,7 +197,7 @@ public sealed class ApplicationPopover : IDisposable
         {
             if (popover == activePopover
                 || popover is not View popoverView
-                || (popover.Toplevel is { } && popover.Toplevel != Application.Top))
+                || (popover.Toplevel is { } && popover.Toplevel != Application.Current))
             {
                 continue;
             }

Terminal.Gui/App/IApplication.cs

@@ -296,14 +296,14 @@ public interface IApplication
     /// <remarks>
     ///     <para>This will cause <see cref="Run(Toplevel, Func{Exception, bool})"/> to return.</para>
     ///     <para>
-    ///         This is equivalent to calling <see cref="RequestStop(Toplevel)"/> with <see cref="Top"/> as the parameter.
+    ///         This is equivalent to calling <see cref="RequestStop(Toplevel)"/> with <see cref="Current"/> as the parameter.
     ///     </para>
     /// </remarks>
     void RequestStop ();
 
     /// <summary>Requests that the currently running Session stop. The Session will stop after the current iteration completes.</summary>
     /// <param name="top">
-    ///     The <see cref="Toplevel"/> to stop. If <see langword="null"/>, stops the currently running <see cref="Top"/>.
+    ///     The <see cref="Toplevel"/> to stop. If <see langword="null"/>, stops the currently running <see cref="Current"/>.
     /// </param>
     /// <remarks>
     ///     <para>This will cause <see cref="Run(Toplevel, Func{Exception, bool})"/> to return.</para>
@@ -351,22 +351,22 @@ public interface IApplication
 
     #region Toplevel Management
 
-    /// <summary>Gets or sets the current Toplevel.</summary>
+    /// <summary>Gets or sets the currently active Toplevel.</summary>
     /// <remarks>
     ///     <para>
     ///         This is set by <see cref="Begin(Toplevel)"/> and cleared by <see cref="End(SessionToken)"/>.
     ///     </para>
     /// </remarks>
-    Toplevel? Top { get; set; }
+    Toplevel? Current { get; set; }
 
-    /// <summary>Gets the stack of all Toplevels.</summary>
+    /// <summary>Gets the stack of all active Toplevel sessions.</summary>
     /// <remarks>
     ///     <para>
     ///         Toplevels are added to this stack by <see cref="Begin(Toplevel)"/> and removed by
     ///         <see cref="End(SessionToken)"/>.
     ///     </para>
     /// </remarks>
-    ConcurrentStack<Toplevel> TopLevels { get; }
+    ConcurrentStack<Toplevel> SessionStack { get; }
 
     /// <summary>
     ///     Caches the Toplevel associated with the current Session.
@@ -428,7 +428,7 @@ public interface IApplication
     /// <remarks>
     ///     <para>
     ///         This is typically set to <see langword="true"/> when a View's <see cref="View.Frame"/> changes and that view
-    ///         has no SuperView (e.g. when <see cref="Top"/> is moved or resized).
+    ///         has no SuperView (e.g. when <see cref="Current"/> is moved or resized).
     ///     </para>
     ///     <para>
     ///         Automatically reset to <see langword="false"/> after <see cref="LayoutAndDraw"/> processes it.

Terminal.Gui/App/IPopover.cs

@@ -56,7 +56,7 @@ public interface IPopover
     ///     events from the <see cref="Application"/>. If set, it will only receive keyboard events the Toplevel would normally
     ///     receive.
     ///     When <see cref="ApplicationPopover.Register"/> is called, the <see cref="Toplevel"/> is set to the current
-    ///     <see cref="Application.Top"/> if not already set.
+    ///     <see cref="Application.Current"/> if not already set.
     /// </summary>
     Toplevel? Toplevel { get; set; }
 }

Terminal.Gui/App/Keyboard/KeyboardImpl.cs

@@ -141,11 +141,11 @@ internal class KeyboardImpl : IKeyboard
             return true;
         }
 
-        if (Application?.Top is null)
+        if (Application?.Current is null)
         {
-            if (Application?.TopLevels is { })
+            if (Application?.SessionStack is { })
             {
-                foreach (Toplevel topLevel in Application.TopLevels.ToList ())
+                foreach (Toplevel topLevel in Application.SessionStack.ToList ())
                 {
                     if (topLevel.NewKeyDownEvent (key))
                     {
@@ -161,7 +161,7 @@ internal class KeyboardImpl : IKeyboard
         }
         else
         {
-            if (Application.Top.NewKeyDownEvent (key))
+            if (Application.Current.NewKeyDownEvent (key))
             {
                 return true;
             }
@@ -194,9 +194,9 @@ internal class KeyboardImpl : IKeyboard
 
         // TODO: Add Popover support
 
-        if (Application?.TopLevels is { })
+        if (Application?.SessionStack is { })
         {
-            foreach (Toplevel topLevel in Application.TopLevels.ToList ())
+            foreach (Toplevel topLevel in Application.SessionStack.ToList ())
             {
                 if (topLevel.NewKeyUpEvent (key))
                 {

Terminal.Gui/App/MainLoop/ApplicationMainLoop.cs

@@ -82,7 +82,7 @@ public class ApplicationMainLoop<TInputRecord> : IApplicationMainLoop<TInputReco
     }
 
     /// <summary>
-    ///     Handles raising events and setting required draw status etc when <see cref="Application.Top"/> changes
+    ///     Handles raising events and setting required draw status etc when <see cref="Application.Current"/> changes
     /// </summary>
     public IToplevelTransitionManager ToplevelTransitionManager = new ToplevelTransitionManager ();
 
@@ -142,10 +142,10 @@ public class ApplicationMainLoop<TInputRecord> : IApplicationMainLoop<TInputReco
         ToplevelTransitionManager.RaiseReadyEventIfNeeded ();
         ToplevelTransitionManager.HandleTopMaybeChanging ();
 
-        if (Application.Top != null)
+        if (Application.Current != null)
         {
             bool needsDrawOrLayout = AnySubViewsNeedDrawn (Application.Popover?.GetActivePopover () as View)
-                                     || AnySubViewsNeedDrawn (Application.Top)
+                                     || AnySubViewsNeedDrawn (Application.Current)
                                      || (Application.Mouse.MouseGrabView != null && AnySubViewsNeedDrawn (Application.Mouse.MouseGrabView));
 
             bool sizeChanged = SizeMonitor.Poll ();
@@ -173,7 +173,7 @@ public class ApplicationMainLoop<TInputRecord> : IApplicationMainLoop<TInputReco
 
     private void SetCursor ()
     {
-        View? mostFocused = Application.Top!.MostFocused;
+        View? mostFocused = Application.Current!.MostFocused;
 
         if (mostFocused == null)
         {

Terminal.Gui/App/Mouse/MouseImpl.cs

@@ -119,9 +119,9 @@ internal class MouseImpl : IMouse
             return;
         }
 
-        // if the mouse is outside the Application.Top or Application.Popover hierarchy, we don't want to
+        // if the mouse is outside the Application.Current or Application.Popover hierarchy, we don't want to
         // send the mouse event to the deepest view under the mouse.
-        if (!View.IsInHierarchy (Application?.Top, deepestViewUnderMouse, true) && !View.IsInHierarchy (Application?.Popover?.GetActivePopover () as View, deepestViewUnderMouse, true))
+        if (!View.IsInHierarchy (Application?.Current, deepestViewUnderMouse, true) && !View.IsInHierarchy (Application?.Popover?.GetActivePopover () as View, deepestViewUnderMouse, true))
         {
             return;
         }

Terminal.Gui/App/PopoverBaseImpl.cs

@@ -107,7 +107,7 @@ public abstract class PopoverBaseImpl : View, IPopover
             // 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);
+                Application.Navigation?.SetFocused (Application.Current?.MostFocused);
             }
         }
 

Terminal.Gui/App/Toplevel/ToplevelTransitionManager.cs

@@ -15,7 +15,7 @@ public class ToplevelTransitionManager : IToplevelTransitionManager
     /// <inheritdoc/>
     public void RaiseReadyEventIfNeeded ()
     {
-        Toplevel? top = Application.Top;
+        Toplevel? top = Application.Current;
 
         if (top != null && !_readiedTopLevels.Contains (top))
         {
@@ -30,13 +30,13 @@ public class ToplevelTransitionManager : IToplevelTransitionManager
     /// <inheritdoc/>
     public void HandleTopMaybeChanging ()
     {
-        Toplevel? newTop = Application.Top;
+        Toplevel? newTop = Application.Current;
 
         if (_lastTop != null && _lastTop != newTop && newTop != null)
         {
             newTop.SetNeedsDraw ();
         }
 
-        _lastTop = Application.Top;
+        _lastTop = Application.Current;
     }
 }

Terminal.Gui/ViewBase/Adornment/Border.Arrangment.cs

@@ -652,7 +652,7 @@ public partial class Border
         if (Parent!.SuperView is null)
         {
             // Redraw the entire app window.
-            Application.Top!.SetNeedsDraw ();
+            Application.Current!.SetNeedsDraw ();
         }
         else
         {

Terminal.Gui/ViewBase/View.Hierarchy.cs

@@ -363,12 +363,12 @@ public partial class View // SuperView/SubView hierarchy management (SuperView,
 
     #endregion AddRemove
 
-    // TODO: This drives a weird coupling of Application.Top and View. It's not clear why this is needed.
+    // TODO: This drives a weird coupling of Application.Current and View. It's not clear why this is needed.
     /// <summary>Get the top superview of a given <see cref="View"/>.</summary>
     /// <returns>The superview view.</returns>
     internal View? GetTopSuperView (View? view = null, View? superview = null)
     {
-        View? top = superview ?? Application.Top;
+        View? top = superview ?? Application.Current;
 
         for (View? v = view?.SuperView ?? this?.SuperView; v != null; v = v.SuperView)
         {

Terminal.Gui/ViewBase/View.Layout.cs

@@ -438,7 +438,7 @@ public partial class View // Layout APIs
 
     private void NeedsClearScreenNextIteration ()
     {
-        if (Application.Top is { } && Application.Top == this && Application.TopLevels.Count == 1)
+        if (Application.Current is { } && Application.Current == this && Application.SessionStack.Count == 1)
         {
             // If this is the only TopLevel, we need to redraw the screen
             Application.ClearScreenNextIteration = true;
@@ -1114,8 +1114,8 @@ public partial class View // Layout APIs
     {
         // TODO: Get rid of refs to Top
         Size superViewContentSize = SuperView?.GetContentSize ()
-                                    ?? (Application.Top is { } && Application.Top != this && Application.Top.IsInitialized
-                                            ? Application.Top.GetContentSize ()
+                                    ?? (Application.Current is { } && Application.Current != this && Application.Current.IsInitialized
+                                            ? Application.Current.GetContentSize ()
                                             : Application.Screen.Size);
 
         return superViewContentSize;
@@ -1130,7 +1130,7 @@ public partial class View // Layout APIs
     /// </summary>
     /// <remarks>
     ///     If <paramref name="viewToMove"/> does not have a <see cref="View.SuperView"/> or it's SuperView is not
-    ///     <see cref="Application.Top"/> the position will be bound by  <see cref="Application.Screen"/>.
+    ///     <see cref="Application.Current"/> the position will be bound by  <see cref="Application.Screen"/>.
     /// </remarks>
     /// <param name="viewToMove">The View that is to be moved.</param>
     /// <param name="targetX">The target x location.</param>
@@ -1138,7 +1138,7 @@ public partial class View // Layout APIs
     /// <param name="nx">The new x location that will ensure <paramref name="viewToMove"/> will be fully visible.</param>
     /// <param name="ny">The new y location that will ensure <paramref name="viewToMove"/> will be fully visible.</param>
     /// <returns>
-    ///     Either <see cref="Application.Top"/> (if <paramref name="viewToMove"/> does not have a Super View) or
+    ///     Either <see cref="Application.Current"/> (if <paramref name="viewToMove"/> does not have a Super View) or
     ///     <paramref name="viewToMove"/>'s SuperView. This can be used to ensure LayoutSubViews is called on the correct View.
     /// </returns>
     internal static View? GetLocationEnsuringFullVisibility (
@@ -1152,10 +1152,10 @@ public partial class View // Layout APIs
         int maxDimension;
         View? superView;
 
-        if (viewToMove?.SuperView is null || viewToMove == Application.Top || viewToMove?.SuperView == Application.Top)
+        if (viewToMove?.SuperView is null || viewToMove == Application.Current || viewToMove?.SuperView == Application.Current)
         {
             maxDimension = Application.Screen.Width;
-            superView = Application.Top;
+            superView = Application.Current;
         }
         else
         {
@@ -1188,9 +1188,9 @@ public partial class View // Layout APIs
         var menuVisible = false;
         var statusVisible = false;
 
-        if (viewToMove?.SuperView is null || viewToMove == Application.Top || viewToMove?.SuperView == Application.Top)
+        if (viewToMove?.SuperView is null || viewToMove == Application.Current || viewToMove?.SuperView == Application.Current)
         {
-            menuVisible = Application.Top?.MenuBar?.Visible == true;
+            menuVisible = Application.Current?.MenuBar?.Visible == true;
         }
         else
         {
@@ -1207,7 +1207,7 @@ public partial class View // Layout APIs
             }
         }
 
-        if (viewToMove?.SuperView is null || viewToMove == Application.Top || viewToMove?.SuperView == Application.Top)
+        if (viewToMove?.SuperView is null || viewToMove == Application.Current || viewToMove?.SuperView == Application.Current)
         {
             maxDimension = menuVisible ? 1 : 0;
         }
@@ -1218,7 +1218,7 @@ public partial class View // Layout APIs
 
         ny = Math.Max (targetY, maxDimension);
 
-        if (viewToMove?.SuperView is null || viewToMove == Application.Top || viewToMove?.SuperView == Application.Top)
+        if (viewToMove?.SuperView is null || viewToMove == Application.Current || viewToMove?.SuperView == Application.Current)
         {
             maxDimension = statusVisible ? Application.Screen.Height - 1 : Application.Screen.Height;
         }
@@ -1286,9 +1286,9 @@ public partial class View // Layout APIs
         var checkedTop = false;
 
         // Traverse all visible toplevels, topmost first (reverse stack order)
-        if (Application.TopLevels.Count > 0)
+        if (Application.SessionStack.Count > 0)
         {
-            foreach (Toplevel toplevel in Application.TopLevels)
+            foreach (Toplevel toplevel in Application.SessionStack)
             {
                 if (toplevel.Visible && toplevel.Contains (screenLocation))
                 {
@@ -1301,7 +1301,7 @@ public partial class View // Layout APIs
                     }
                 }
 
-                if (toplevel == Application.Top)
+                if (toplevel == Application.Current)
                 {
                     checkedTop = true;
                 }
@@ -1309,7 +1309,7 @@ public partial class View // Layout APIs
         }
 
         // Fallback: If TopLevels is empty or Top is not in TopLevels, check Top directly (for test compatibility)
-        if (!checkedTop && Application.Top is { Visible: true } top)
+        if (!checkedTop && Application.Current is { Visible: true } top)
         {
             // For root toplevels, allow hit-testing even if location is outside bounds (for drag/move)
             List<View?> result = GetViewsUnderLocation (top, screenLocation, excludeViewportSettingsFlags);

Terminal.Gui/ViewBase/View.Navigation.cs

@@ -396,7 +396,7 @@ public partial class View // Focus and cross-view navigation management (TabStop
     public event EventHandler<HasFocusEventArgs>? FocusedChanged;
 
     /// <summary>Returns a value indicating if this View is currently on Top (Active)</summary>
-    public bool IsCurrentTop => Application.Top == this;
+    public bool IsCurrentTop => Application.Current == this;
 
     /// <summary>
     ///     Returns the most focused SubView down the subview-hierarchy.
@@ -854,18 +854,18 @@ public partial class View // Focus and cross-view navigation management (TabStop
                 }
             }
 
-            // Application.Top?
-            if (newFocusedView is null && Application.Top is { CanFocus: true, HasFocus: false })
+            // Application.Current?
+            if (newFocusedView is null && Application.Current is { CanFocus: true, HasFocus: false })
             {
                 // Temporarily ensure this view can't get focus
                 bool prevCanFocus = _canFocus;
                 _canFocus = false;
-                bool restoredFocus = Application.Top.RestoreFocus ();
+                bool restoredFocus = Application.Current.RestoreFocus ();
                 _canFocus = prevCanFocus;
 
-                if (Application.Top is { CanFocus: true, HasFocus: true })
+                if (Application.Current is { CanFocus: true, HasFocus: true })
                 {
-                    newFocusedView = Application.Top;
+                    newFocusedView = Application.Current;
                 }
                 else if (restoredFocus)
                 {

Terminal.Gui/Views/Dialog.cs

@@ -21,7 +21,7 @@ public class Dialog : Window
     /// <remarks>
     ///     By default, <see cref="View.X"/>, <see cref="View.Y"/>, <see cref="View.Width"/>, and <see cref="View.Height"/> are
     ///     set
-    ///     such that the <see cref="Dialog"/> will be centered in, and no larger than 90% of <see cref="Application.Top"/>, if
+    ///     such that the <see cref="Dialog"/> will be centered in, and no larger than 90% of <see cref="Application.Current"/>, if
     ///     there is one. Otherwise,
     ///     it will be bound by the screen dimensions.
     /// </remarks>

Terminal.Gui/Views/Menuv1/Menu.cs

@@ -13,10 +13,10 @@ internal sealed class Menu : View
 {
     public Menu ()
     {
-        if (Application.Top is { })
+        if (Application.Current is { })
         {
-            Application.Top.DrawComplete += Top_DrawComplete;
-            Application.Top.SizeChanging += Current_TerminalResized;
+            Application.Current.DrawComplete += Top_DrawComplete;
+            Application.Current.SizeChanging += Current_TerminalResized;
         }
 
         Application.MouseEvent += Application_RootMouseEvent;
@@ -232,10 +232,10 @@ internal sealed class Menu : View
     {
         RemoveKeyBindingsHotKey (_barItems);
 
-        if (Application.Top is { })
+        if (Application.Current is { })
         {
-            Application.Top.DrawComplete -= Top_DrawComplete;
-            Application.Top.SizeChanging -= Current_TerminalResized;
+            Application.Current.DrawComplete -= Top_DrawComplete;
+            Application.Current.SizeChanging -= Current_TerminalResized;
         }
 
         Application.MouseEvent -= Application_RootMouseEvent;

Terminal.Gui/Views/Menuv1/MenuBar.cs

@@ -422,7 +422,7 @@ public class MenuBar : View, IDesignable
         _selected = 0;
         SetNeedsDraw ();
 
-        _previousFocused = (SuperView is null ? Application.Top?.Focused : SuperView.Focused)!;
+        _previousFocused = (SuperView is null ? Application.Current?.Focused : SuperView.Focused)!;
         OpenMenu (_selected);
 
         if (!SelectEnabledItem (
@@ -491,7 +491,7 @@ public class MenuBar : View, IDesignable
 
         if (_openMenu is null)
         {
-            _previousFocused = (SuperView is null ? Application.Top?.Focused ?? null : SuperView.Focused)!;
+            _previousFocused = (SuperView is null ? Application.Current?.Focused ?? null : SuperView.Focused)!;
         }
 
         OpenMenu (idx, sIdx, subMenu);
@@ -703,7 +703,7 @@ public class MenuBar : View, IDesignable
         }
 
         Rectangle superViewFrame = SuperView?.Frame ?? Application.Screen;
-        View? sv = SuperView ?? Application.Top;
+        View? sv = SuperView ?? Application.Current;
 
         if (sv is null)
         {
@@ -835,7 +835,7 @@ public class MenuBar : View, IDesignable
         {
             case null:
                 // Open a submenu below a MenuBar
-                _lastFocused ??= SuperView is null ? Application.Top?.MostFocused : SuperView.MostFocused;
+                _lastFocused ??= SuperView is null ? Application.Current?.MostFocused : SuperView.MostFocused;
 
                 if (_openSubMenu is { } && !CloseMenu (false, true))
                 {

Terminal.Gui/Views/Toplevel.cs

@@ -15,7 +15,7 @@ namespace Terminal.Gui.Views;
 ///     </para>
 ///     <para>
 ///         A Toplevel is created when an application initializes Terminal.Gui by calling <see cref="Application.Init"/>.
-///         The application Toplevel can be accessed via <see cref="Application.Top"/>. Additional Toplevels can be created
+///         The application Toplevel can be accessed via <see cref="Application.Current"/>. Additional Toplevels can be created
 ///         and run (e.g. <see cref="Dialog"/>s). To run a Toplevel, create the <see cref="Toplevel"/> and call
 ///         <see cref="Application.Run(Toplevel, Func{Exception, bool})"/>.
 ///     </para>
@@ -154,7 +154,7 @@ public partial class Toplevel : View
     /// </summary>
     public virtual void RequestStop ()
     {
-        Application.RequestStop (Application.Top);
+        Application.RequestStop (Application.Current);
     }
 
     /// <summary>
@@ -246,7 +246,7 @@ public partial class Toplevel : View
         }
 
         // BUGBUG: The && true is a temp hack
-        if ((superView != top || top?.SuperView is { } || (top != Application.Top && top!.Modal) || (top == Application.Top && top?.SuperView is null))
+        if ((superView != top || top?.SuperView is { } || (top != Application.Current && top!.Modal) || (top == Application.Current && top?.SuperView is null))
             && (top!.Frame.X + top.Frame.Width > maxWidth || ny > top.Frame.Y))
 
         {

Terminal.Gui/Views/Wizard/Wizard.cs

@@ -44,7 +44,7 @@ namespace Terminal.Gui.Views;
 ///     Application.RequestStop();
 /// };
 /// 
-/// Application.Top.Add (wizard);
+/// Application.Current.Add (wizard);
 /// Application.Run ();
 /// Application.Shutdown ();
 /// </code>

Tests/IntegrationTests/FluentTests/GuiTestContextKeyEventTests.cs

@@ -16,9 +16,9 @@ public class GuiTestContextKeyEventTests (ITestOutputHelper outputHelper)
     public void QuitKey_ViaApplication_Stops (TestDriver d)
     {
         using GuiTestContext context = With.A<Window> (40, 10, d);
-        Assert.True (Application.Top!.Running);
+        Assert.True (Application.Current!.Running);
 
-        Toplevel top = Application.Top;
+        Toplevel top = Application.Current;
         context.Then (() => Application.RaiseKeyDownEvent (Application.QuitKey));
         Assert.False (top!.Running);
     }
@@ -28,9 +28,9 @@ public class GuiTestContextKeyEventTests (ITestOutputHelper outputHelper)
     public void QuitKey_ViaEnqueueKey_Stops (TestDriver d)
     {
         using GuiTestContext context = With.A<Window> (40, 10, d, _out);
-        Assert.True (Application.Top!.Running);
+        Assert.True (Application.Current!.Running);
 
-        Toplevel top = Application.Top;
+        Toplevel top = Application.Current;
         context.EnqueueKeyEvent (Application.QuitKey);
 
         Assert.False (top!.Running);

Tests/IntegrationTests/FluentTests/GuiTestContextTests.cs

@@ -43,7 +43,7 @@ public class GuiTestContextTests (ITestOutputHelper outputHelper)
     public void With_New_A_Runs (TestDriver d)
     {
         using GuiTestContext context = With.A<Window> (40, 10, d, _out);
-        Assert.True (Application.Top!.Running);
+        Assert.True (Application.Current!.Running);
         Assert.NotEqual (Rectangle.Empty, Application.Screen);
     }
 

Tests/IntegrationTests/FluentTests/MenuBarv2Tests.cs

@@ -142,7 +142,7 @@ public class MenuBarv2Tests
                                      .Then (() =>
                                             {
                                                 menuBar = new MenuBarv2 ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
 
                                                 top.Add (
                                                          new View ()
@@ -152,7 +152,7 @@ public class MenuBarv2Tests
 
                                                          });
                                                 menuBar.EnableForDesign (ref top);
-                                                Application.Top!.Add (menuBar);
+                                                Application.Current!.Add (menuBar);
                                             })
                                      .WaitIteration ()
                                      .AssertIsNotType<MenuItemv2> (Application.Navigation!.GetFocused ())
@@ -176,7 +176,7 @@ public class MenuBarv2Tests
                                      .Then (() =>
                                             {
                                                 menuBar = new MenuBarv2 ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
 
                                                 top.Add (
                                                          new View ()
@@ -186,7 +186,7 @@ public class MenuBarv2Tests
 
                                                          });
                                                 menuBar.EnableForDesign (ref top);
-                                                Application.Top!.Add (menuBar);
+                                                Application.Current!.Add (menuBar);
                                             })
                                      .WaitIteration ()
                                      .AssertIsNotType<MenuItemv2> (Application.Navigation!.GetFocused ())
@@ -262,10 +262,10 @@ public class MenuBarv2Tests
                                      .Then (() =>
                                             {
                                                 var menuBar = new MenuBarv2 ();
-                                                Application.Top!.Add (menuBar);
+                                                Application.Current!.Add (menuBar);
 
                                                 // Call EnableForDesign
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
                                                 bool result = menuBar.EnableForDesign (ref top);
 
                                                 // Should return true
@@ -296,9 +296,9 @@ public class MenuBarv2Tests
                                      .Then (() =>
                                             {
                                                 menuBar = new MenuBarv2 ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
                                                 menuBar.EnableForDesign (ref top);
-                                                Application.Top!.Add (menuBar);
+                                                Application.Current!.Add (menuBar);
                                             })
                                      .WaitIteration ()
                                      .ScreenShot ("MenuBar initial state", _out)
@@ -334,7 +334,7 @@ public class MenuBarv2Tests
                                      .Then (() =>
                                             {
                                                 menuBar = new MenuBarv2 ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
 
                                                 top.Add (
                                                          new View ()
@@ -344,7 +344,7 @@ public class MenuBarv2Tests
 
                                                          });
                                                 menuBar.EnableForDesign (ref top);
-                                                Application.Top!.Add (menuBar);
+                                                Application.Current!.Add (menuBar);
                                             })
                                      .AssertIsNotType<MenuItemv2> (Application.Navigation!.GetFocused ())
                                      .ScreenShot ("MenuBar initial state", _out)
@@ -376,9 +376,9 @@ public class MenuBarv2Tests
                                      .Then (() =>
                                             {
                                                 menuBar = new MenuBarv2 ();
-                                                Toplevel? toplevel = Application.Top;
+                                                Toplevel? toplevel = Application.Current;
                                                 menuBar.EnableForDesign (ref toplevel!);
-                                                Application.Top!.Add (menuBar);
+                                                Application.Current!.Add (menuBar);
                                             })
                                      .WaitIteration ()
                                      .AssertIsNotType<MenuItemv2> (Application.Navigation!.GetFocused ())
@@ -405,7 +405,7 @@ public class MenuBarv2Tests
                                      .Then (() =>
                                             {
                                                 menuBar = new MenuBarv2 ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
 
                                                 top.Add (
                                                          new View ()
@@ -415,18 +415,18 @@ public class MenuBarv2Tests
 
                                                          });
                                                 menuBar.EnableForDesign (ref top);
-                                                Application.Top!.Add (menuBar);
+                                                Application.Current!.Add (menuBar);
                                             })
                                      .WaitIteration ()
                                      .AssertIsNotType<MenuItemv2> (Application.Navigation!.GetFocused ())
                                      .ScreenShot ("MenuBar initial state", _out)
                                      .EnqueueKeyEvent (MenuBarv2.DefaultKey)
                                      .AssertEqual ("_New file", Application.Navigation!.GetFocused ()!.Title)
-                                     .AssertTrue (Application.Top!.Running)
+                                     .AssertTrue (Application.Current!.Running)
                                      .ScreenShot ($"After {MenuBarv2.DefaultKey}", _out)
                                      .EnqueueKeyEvent (Application.QuitKey)
                                      .AssertFalse (Application.Popover?.GetActivePopover () is PopoverMenu)
-                                     .AssertTrue (Application.Top!.Running);
+                                     .AssertTrue (Application.Current!.Running);
     }
 
     [Theory]
@@ -439,7 +439,7 @@ public class MenuBarv2Tests
                                      .Then (() =>
                                             {
                                                 menuBar = new MenuBarv2 ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
 
                                                 top.Add (
                                                          new View ()
@@ -456,7 +456,7 @@ public class MenuBarv2Tests
                                                     item.Key = Key.Empty;
                                                 }
 
-                                                Application.Top!.Add (menuBar);
+                                                Application.Current!.Add (menuBar);
                                             })
                                      .WaitIteration ()
                                      .AssertIsNotType<MenuItemv2> (Application.Navigation!.GetFocused ())
@@ -466,7 +466,7 @@ public class MenuBarv2Tests
                                      .ScreenShot ($"After {MenuBarv2.DefaultKey}", _out)
                                      .EnqueueKeyEvent (Application.QuitKey)
                                      .AssertFalse (Application.Popover?.GetActivePopover () is PopoverMenu)
-                                     .AssertTrue (Application.Top!.Running);
+                                     .AssertTrue (Application.Current!.Running);
     }
 
     [Theory]
@@ -492,9 +492,9 @@ public class MenuBarv2Tests
                                      .Then (() =>
                                             {
                                                 var menuBar = new MenuBarv2 ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
                                                 menuBar.EnableForDesign (ref top);
-                                                Application.Top!.Add (menuBar);
+                                                Application.Current!.Add (menuBar);
                                             })
                                      .Add (testView)
                                      .WaitIteration ()
@@ -526,9 +526,9 @@ public class MenuBarv2Tests
                                      .Then (() =>
                                             {
                                                 var menuBar = new MenuBarv2 ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
                                                 menuBar.EnableForDesign (ref top);
-                                                Application.Top!.Add (menuBar);
+                                                Application.Current!.Add (menuBar);
                                             })
                                      .Add (testView)
                                      .WaitIteration ()

Tests/IntegrationTests/FluentTests/NavigationTests.cs

@@ -29,8 +29,8 @@ public class NavigationTests (ITestOutputHelper outputHelper)
                                                 w2.Add (v3, v4);
                                                 var w3 = new Window { Id = "w3" };
                                                 w3.Add (v5, v6);
-                                                Toplevel top = Application.Top!;
-                                                Application.Top!.Add (w1, w2, w3);
+                                                Toplevel top = Application.Current!;
+                                                Application.Current!.Add (w1, w2, w3);
                                             })
                                      .AssertTrue (v5.HasFocus)
                                      .EnqueueKeyEvent (Key.F6)

Tests/IntegrationTests/FluentTests/PopverMenuTests.cs

@@ -26,10 +26,10 @@ public class PopoverMenuTests
                                      .Then (() =>
                                             {
                                                 PopoverMenu popoverMenu = new ();
-                                                Application.Top!.Add (popoverMenu);
+                                                Application.Current!.Add (popoverMenu);
 
                                                 // Call EnableForDesign
-                                                Toplevel top = Application.Top;
+                                                Toplevel top = Application.Current;
                                                 bool result = popoverMenu.EnableForDesign (ref top);
 
                                                 // Should return true
@@ -60,7 +60,7 @@ public class PopoverMenuTests
                                                     PopoverMenu popoverMenu = new ();
 
                                                     // Call EnableForDesign
-                                                    Toplevel top = Application.Top!;
+                                                    Toplevel top = Application.Current!;
                                                     popoverMenu.EnableForDesign (ref top);
 
                                                     var view = new View
@@ -71,7 +71,7 @@ public class PopoverMenuTests
                                                         Id = "focusableView",
                                                         Text = "View"
                                                     };
-                                                    Application.Top!.Add (view);
+                                                    Application.Current!.Add (view);
 
                                                     // EnableForDesign sets to true; undo that
                                                     popoverMenu.Visible = false;
@@ -100,7 +100,7 @@ public class PopoverMenuTests
                                                 PopoverMenu popoverMenu = new ();
 
                                                 // Call EnableForDesign
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
                                                 bool result = popoverMenu.EnableForDesign (ref top);
 
                                                 var view = new View
@@ -111,7 +111,7 @@ public class PopoverMenuTests
                                                     Id = "focusableView",
                                                     Text = "View"
                                                 };
-                                                Application.Top!.Add (view);
+                                                Application.Current!.Add (view);
 
                                                 // EnableForDesign sets to true; undo that
                                                 popoverMenu.Visible = false;
@@ -129,7 +129,7 @@ public class PopoverMenuTests
                                      .ScreenShot ($"After {Application.QuitKey}", _out)
                                      .AssertFalse (Application.Popover!.Popovers.Cast<PopoverMenu> ().FirstOrDefault ()!.Visible)
                                      .AssertNull (Application.Popover!.GetActivePopover ())
-                                     .AssertTrue (Application.Top!.Running);
+                                     .AssertTrue (Application.Current!.Running);
     }
 
     [Theory]
@@ -142,7 +142,7 @@ public class PopoverMenuTests
                                                 PopoverMenu popoverMenu = new ();
 
                                                 // Call EnableForDesign
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
                                                 bool result = popoverMenu.EnableForDesign (ref top);
 
                                                 var view = new View
@@ -153,7 +153,7 @@ public class PopoverMenuTests
                                                     Id = "focusableView",
                                                     Text = "View"
                                                 };
-                                                Application.Top!.Add (view);
+                                                Application.Current!.Add (view);
 
                                                 // EnableForDesign sets to true; undo that
                                                 popoverMenu.Visible = false;
@@ -185,7 +185,7 @@ public class PopoverMenuTests
                                                 PopoverMenu popoverMenu = new ();
 
                                                 // Call EnableForDesign
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
                                                 bool result = popoverMenu.EnableForDesign (ref top);
 
                                                 var view = new View
@@ -196,7 +196,7 @@ public class PopoverMenuTests
                                                     Id = "focusableView",
                                                     Text = "View"
                                                 };
-                                                Application.Top!.Add (view);
+                                                Application.Current!.Add (view);
 
                                                 // EnableForDesign sets to true; undo that
                                                 popoverMenu.Visible = false;
@@ -210,11 +210,11 @@ public class PopoverMenuTests
                                      .Then (() => Application.Popover!.Show (Application.Popover.Popovers.First ()))
                                      .ScreenShot ("PopoverMenu after Show", _out)
                                      .AssertEqual ("Cu_t", Application.Navigation!.GetFocused ()!.Title)
-                                     .AssertTrue (Application.Top!.Running)
+                                     .AssertTrue (Application.Current!.Running)
                                      .EnqueueKeyEvent (Application.QuitKey)
                                      .ScreenShot ($"After {Application.QuitKey}", _out)
                                      .AssertFalse (Application.Popover?.GetActivePopover () is PopoverMenu)
-                                     .AssertTrue (Application.Top!.Running);
+                                     .AssertTrue (Application.Current!.Running);
     }
 
     [Theory]
@@ -241,7 +241,7 @@ public class PopoverMenuTests
                                      .Then (() =>
                                             {
                                                 PopoverMenu popoverMenu = new ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
                                                 popoverMenu.EnableForDesign (ref top);
                                                 Application.Popover!.Register (popoverMenu);
                                             })
@@ -275,7 +275,7 @@ public class PopoverMenuTests
                                      .Then (() =>
                                             {
                                                 PopoverMenu popoverMenu = new ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
                                                 popoverMenu.EnableForDesign (ref top);
                                                 Application.Popover!.Register (popoverMenu);
                                             })
@@ -309,7 +309,7 @@ public class PopoverMenuTests
                                      .Then (() =>
                                             {
                                                 PopoverMenu popoverMenu = new ();
-                                                Toplevel top = Application.Top!;
+                                                Toplevel top = Application.Current!;
                                                 popoverMenu.EnableForDesign (ref top);
                                                 Application.Popover!.Register (popoverMenu);
                                             })

Tests/StressTests/ApplicationStressTests.cs

@@ -71,8 +71,8 @@ public class ApplicationStressTests
                 {
                     int tbNow = _tbCounter;
 
-                    // Wait for Application.Top to be running to ensure timed events can be processed
-                    while (Application.Top is null || Application.Top is { Running: false })
+                    // Wait for Application.Current to be running to ensure timed events can be processed
+                    while (Application.Current is null || Application.Current is { Running: false })
                     {
                         Thread.Sleep (1);
                     }

Tests/StressTests/ScenariosStressTests.cs

@@ -126,7 +126,7 @@ public class ScenariosStressTests
 
         void OnApplicationSessionBegun (object? sender, SessionTokenEventArgs e)
         {
-            // Get a list of all subviews under Application.Top (and their subviews, etc.)
+            // Get a list of all subviews under Application.Current (and their subviews, etc.)
             // and subscribe to their DrawComplete event
             void SubscribeAllSubViews (View view)
             {
@@ -140,7 +140,7 @@ public class ScenariosStressTests
                 }
             }
 
-            SubscribeAllSubViews (Application.Top!);
+            SubscribeAllSubViews (Application.Current!);
         }
 
         // If the scenario doesn't close within the abort time, this will force it to quit

Tests/TerminalGuiFluentTesting/FakeDriver/FakeApplicationLifecycle.cs

@@ -14,7 +14,7 @@ internal class FakeApplicationLifecycle (IApplication origApp, CancellationToken
     {
         hardStop.Cancel ();
 
-        Application.Top?.Dispose ();
+        Application.Current?.Dispose ();
         Application.Shutdown ();
         ApplicationImpl.ChangeInstance (origApp);
     }

Tests/TerminalGuiFluentTesting/GuiTestContext.Navigation.cs

@@ -40,13 +40,13 @@ public partial class GuiTestContext
     public GuiTestContext Focus<T> (Func<T, bool>? evaluator = null) where T : View
     {
         evaluator ??= _ => true;
-        Toplevel? t = Application.Top;
+        Toplevel? t = Application.Current;
 
         HashSet<View> seen = new ();
 
         if (t == null)
         {
-            Fail ("Application.Top was null when trying to set focus");
+            Fail ("Application.Current was null when trying to set focus");
 
             return this;
         }

Tests/TerminalGuiFluentTesting/GuiTestContext.ViewBase.cs

@@ -14,7 +14,7 @@ public partial class GuiTestContext
     {
         WaitIteration (() =>
                        {
-                           Toplevel top = Application.Top ?? throw new ("Top was null so could not add view");
+                           Toplevel top = Application.Current ?? throw new ("Top was null so could not add view");
                            top.Add (v);
                            top.Layout ();
                            _lastView = v;
@@ -28,15 +28,15 @@ public partial class GuiTestContext
     /// <summary>
     ///     The last view added (e.g. with <see cref="Add"/>) or the root/current top.
     /// </summary>
-    public View LastView => _lastView ?? Application.Top ?? throw new ("Could not determine which view to add to");
+    public View LastView => _lastView ?? Application.Current ?? throw new ("Could not determine which view to add to");
 
     private T Find<T> (Func<T, bool> evaluator) where T : View
     {
-        Toplevel? t = Application.Top;
+        Toplevel? t = Application.Current;
 
         if (t == null)
         {
-            Fail ("Application.Top was null when attempting to find view");
+            Fail ("Application.Current was null when attempting to find view");
         }
 
         T? f = FindRecursive (t!, evaluator);

Tests/UnitTests/Application/Application.NavigationTests.cs

@@ -86,7 +86,7 @@ public class ApplicationNavigationTests (ITestOutputHelper output)
     {
         Application.Navigation = new ();
 
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Id = "top",
             CanFocus = true
@@ -103,18 +103,18 @@ public class ApplicationNavigationTests (ITestOutputHelper output)
             Id = "subView2",
             CanFocus = true
         };
-        Application.Top.Add (subView1, subView2);
-        Assert.False (Application.Top.HasFocus);
+        Application.Current.Add (subView1, subView2);
+        Assert.False (Application.Current.HasFocus);
 
-        Application.Top.SetFocus ();
+        Application.Current.SetFocus ();
         Assert.True (subView1.HasFocus);
         Assert.Equal (subView1, Application.Navigation.GetFocused ());
 
         Application.Navigation.AdvanceFocus (NavigationDirection.Forward, null);
         Assert.Equal (subView2, Application.Navigation.GetFocused ());
 
-        Application.Top.Dispose ();
-        Application.Top = null;
+        Application.Current.Dispose ();
+        Application.Current = null;
         Application.Navigation = null;
     }
 
@@ -123,7 +123,7 @@ public class ApplicationNavigationTests (ITestOutputHelper output)
     {
         Application.Navigation = new ();
 
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Id = "top",
             CanFocus = true
@@ -135,24 +135,24 @@ public class ApplicationNavigationTests (ITestOutputHelper output)
             CanFocus = true
         };
 
-        Application.Top.Add (subView1);
-        Assert.False (Application.Top.HasFocus);
+        Application.Current.Add (subView1);
+        Assert.False (Application.Current.HasFocus);
 
-        Application.Top.SetFocus ();
+        Application.Current.SetFocus ();
         Assert.True (subView1.HasFocus);
         Assert.Equal (subView1, Application.Navigation.GetFocused ());
 
         subView1.HasFocus = false;
         Assert.False (subView1.HasFocus);
-        Assert.True (Application.Top.HasFocus);
-        Assert.Equal (Application.Top, Application.Navigation.GetFocused ());
+        Assert.True (Application.Current.HasFocus);
+        Assert.Equal (Application.Current, Application.Navigation.GetFocused ());
 
-        Application.Top.HasFocus = false;
-        Assert.False (Application.Top.HasFocus);
+        Application.Current.HasFocus = false;
+        Assert.False (Application.Current.HasFocus);
         Assert.Null (Application.Navigation.GetFocused ());
 
-        Application.Top.Dispose ();
-        Application.Top = null;
+        Application.Current.Dispose ();
+        Application.Current = null;
         Application.Navigation = null;
     }
 }

Tests/UnitTests/Application/ApplicationImplTests.cs

@@ -194,7 +194,7 @@ public class ApplicationImplTests
                                              TimeSpan.FromMilliseconds (150),
                                              () =>
                                              {
-                                                 if (Application.Top != null)
+                                                 if (Application.Current != null)
                                                  {
                                                      Application.RequestStop ();
 
@@ -204,7 +204,7 @@ public class ApplicationImplTests
                                                  return false;
                                              }
                                             );
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         // Blocks until the timeout call is hit
 
@@ -213,10 +213,10 @@ public class ApplicationImplTests
         // We returned false above, so we should not have to remove the timeout
         Assert.False (v2.RemoveTimeout (timeoutToken));
 
-        Assert.NotNull (Application.Top);
-        Application.Top?.Dispose ();
+        Assert.NotNull (Application.Current);
+        Application.Current?.Dispose ();
         v2.Shutdown ();
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         ApplicationImpl.ChangeInstance (orig);
     }
@@ -242,7 +242,7 @@ public class ApplicationImplTests
                                              {
                                                  Assert.True (top!.Running);
 
-                                                 if (Application.Top != null)
+                                                 if (Application.Current != null)
                                                  {
                                                      Application.RequestStop ();
 
@@ -264,8 +264,8 @@ public class ApplicationImplTests
         Assert.False (top!.Running);
 
         // BUGBUG: Shutdown sets Top to null, not End.
-        //Assert.Null (Application.Top);
-        Application.Top?.Dispose ();
+        //Assert.Null (Application.Current);
+        Application.Current?.Dispose ();
         v2.Shutdown ();
 
         ApplicationImpl.ChangeInstance (orig);
@@ -280,7 +280,7 @@ public class ApplicationImplTests
         ApplicationImpl v2 = NewMockedApplicationImpl ();
         ApplicationImpl.ChangeInstance (v2);
 
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
         Assert.Null (Application.Driver);
 
         v2.Init (null, "fake");
@@ -315,7 +315,7 @@ public class ApplicationImplTests
         Assert.Equal (1, closedCount);
         Assert.Equal (1, unloadedCount);
 
-        Application.Top?.Dispose ();
+        Application.Current?.Dispose ();
         v2.Shutdown ();
         Assert.Equal (1, closedCount);
         Assert.Equal (1, unloadedCount);
@@ -332,7 +332,7 @@ public class ApplicationImplTests
         ApplicationImpl v2 = NewMockedApplicationImpl ();
         ApplicationImpl.ChangeInstance (v2);
 
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
         Assert.Null (Application.Driver);
 
         v2.Init (null, "fake");
@@ -356,7 +356,7 @@ public class ApplicationImplTests
                                              {
                                                  Assert.True (top!.Running);
 
-                                                 if (Application.Top != null)
+                                                 if (Application.Current != null)
                                                  {
                                                      Application.RequestStop ();
 
@@ -379,7 +379,7 @@ public class ApplicationImplTests
         // We returned false above, so we should not have to remove the timeout
         Assert.False (v2.RemoveTimeout (timeoutToken));
 
-        Application.Top?.Dispose ();
+        Application.Current?.Dispose ();
         v2.Shutdown ();
         Assert.Equal (1, closedCount);
         Assert.Equal (1, unloadedCount);
@@ -408,7 +408,7 @@ public class ApplicationImplTests
                                              {
                                                  Assert.True (top!.Running);
 
-                                                 if (Application.Top != null)
+                                                 if (Application.Current != null)
                                                  {
                                                      Application.RaiseKeyDownEvent (Application.QuitKey);
                                                  }
@@ -427,10 +427,10 @@ public class ApplicationImplTests
 
         Assert.False (top!.Running);
 
-        Assert.NotNull (Application.Top);
+        Assert.NotNull (Application.Current);
         top.Dispose ();
         v2.Shutdown ();
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         ApplicationImpl.ChangeInstance (orig);
     }
@@ -446,16 +446,16 @@ public class ApplicationImplTests
         v2.Init (null, "fake");
 
         v2.AddTimeout (TimeSpan.Zero, IdleExit);
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         // Blocks until the timeout call is hit
 
         v2.Run<Window> ();
 
-        Assert.NotNull (Application.Top);
-        Application.Top?.Dispose ();
+        Assert.NotNull (Application.Current);
+        Application.Current?.Dispose ();
         v2.Shutdown ();
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         ApplicationImpl.ChangeInstance (orig);
     }
@@ -500,7 +500,7 @@ public class ApplicationImplTests
 
         v2.Run (t);
 
-        Application.Top?.Dispose ();
+        Application.Current?.Dispose ();
         v2.Shutdown ();
 
         ApplicationImpl.ChangeInstance (orig);
@@ -511,7 +511,7 @@ public class ApplicationImplTests
 
     private bool IdleExit ()
     {
-        if (Application.Top != null)
+        if (Application.Current != null)
         {
             Application.RequestStop ();
 
@@ -583,7 +583,7 @@ public class ApplicationImplTests
                        () =>
                        {
                            // Run asynchronous logic inside Task.Run
-                           if (Application.Top != null)
+                           if (Application.Current != null)
                            {
                                b.NewKeyDownEvent (Key.Enter);
                                b.NewKeyUpEvent (Key.Enter);
@@ -592,7 +592,7 @@ public class ApplicationImplTests
                            return false;
                        });
 
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         var w = new Window
         {
@@ -603,10 +603,10 @@ public class ApplicationImplTests
         // Blocks until the timeout call is hit
         v2.Run (w);
 
-        Assert.NotNull (Application.Top);
-        Application.Top?.Dispose ();
+        Assert.NotNull (Application.Current);
+        Application.Current?.Dispose ();
         v2.Shutdown ();
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         ApplicationImpl.ChangeInstance (orig);
 
@@ -645,8 +645,8 @@ public class ApplicationImplTests
         Assert.Equal (v2.Initialized, Application.Initialized);
         Assert.Equal (v2.Popover, Application.Popover);
         Assert.Equal (v2.Navigation, Application.Navigation);
-        Assert.Equal (v2.Top, Application.Top);
-        Assert.Same (v2.TopLevels, Application.TopLevels);
+        Assert.Equal (v2.Top, Application.Current);
+        Assert.Same (v2.TopLevels, Application.SessionStack);
 
         // Shutdown should clean up instance fields
         v2.Shutdown ();

Tests/UnitTests/Application/ApplicationPopoverTests.cs

@@ -200,14 +200,14 @@ public class ApplicationPopoverTests
             // Arrange
             Assert.Null (Application.Popover);
             Application.Init (null, "fake");
-            Application.Top = new Toplevel ();
+            Application.Current = new Toplevel ();
             PopoverTestClass? popover = new ();
 
             // Act
             Application.Popover?.Register (popover);
 
             // Assert
-            Assert.Equal (Application.Top, popover.Toplevel);
+            Assert.Equal (Application.Current, popover.Toplevel);
         }
         finally
         {
@@ -223,7 +223,7 @@ public class ApplicationPopoverTests
             // Arrange
             Assert.Null (Application.Popover);
             Application.Init (null, "fake");
-            Application.Top = new Toplevel () { Id = "initialTop" };
+            Application.Current = new Toplevel () { Id = "initialTop" };
             PopoverTestClass? popover = new ();
             int keyDownEvents = 0;
             popover.KeyDown += (s, e) =>
@@ -237,7 +237,7 @@ public class ApplicationPopoverTests
             // Act
             Application.RaiseKeyDownEvent (Key.A); // Goes to initialTop
 
-            Application.Top = new Toplevel () { Id = "secondaryTop" };
+            Application.Current = new Toplevel () { Id = "secondaryTop" };
             Application.RaiseKeyDownEvent (Key.A); // Goes to secondaryTop
 
             // Test
@@ -270,7 +270,7 @@ public class ApplicationPopoverTests
             // Arrange
             Assert.Null (Application.Popover);
             Application.Init (null, "fake");
-            Application.Top = new ()
+            Application.Current = new ()
             {
                 Frame = new (0, 0, 10, 10),
                 Id = "top"
@@ -285,7 +285,7 @@ public class ApplicationPopoverTests
                 Height = 2,
             };
 
-            Application.Top.Add (view);
+            Application.Current.Add (view);
 
             popover = new ()
             {
@@ -318,7 +318,7 @@ public class ApplicationPopoverTests
         finally
         {
             popover?.Dispose ();
-            Application.Top?.Dispose ();
+            Application.Current?.Dispose ();
             Application.ResetState (true);
         }
     }

Tests/UnitTests/Application/ApplicationScreenTests.cs

@@ -46,35 +46,35 @@ public class ApplicationScreenTests
         Assert.Equal (0, clearedContentsRaised);
 
         // Act
-        Application.Top!.SetNeedsLayout ();
+        Application.Current!.SetNeedsLayout ();
         Application.LayoutAndDraw ();
 
         // Assert
         Assert.Equal (0, clearedContentsRaised);
 
         // Act
-        Application.Top.X = 1;
+        Application.Current.X = 1;
         Application.LayoutAndDraw ();
 
         // Assert
         Assert.Equal (1, clearedContentsRaised);
 
         // Act
-        Application.Top.Width = 10;
+        Application.Current.Width = 10;
         Application.LayoutAndDraw ();
 
         // Assert
         Assert.Equal (2, clearedContentsRaised);
 
         // Act
-        Application.Top.Y = 1;
+        Application.Current.Y = 1;
         Application.LayoutAndDraw ();
 
         // Assert
         Assert.Equal (3, clearedContentsRaised);
 
         // Act
-        Application.Top.Height = 10;
+        Application.Current.Height = 10;
         Application.LayoutAndDraw ();
 
         // Assert

Tests/UnitTests/Application/ApplicationTests.cs

@@ -149,13 +149,13 @@ public class ApplicationTests
     [SetupFakeApplication]
     public void Begin_Sets_Application_Top_To_Console_Size ()
     {
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
         Application.Driver!.SetScreenSize (80, 25);
         Toplevel top = new ();
         Application.Begin (top);
-        Assert.Equal (new (0, 0, 80, 25), Application.Top!.Frame);
+        Assert.Equal (new (0, 0, 80, 25), Application.Current!.Frame);
         Application.Driver!.SetScreenSize (5, 5);
-        Assert.Equal (new (0, 0, 5, 5), Application.Top!.Frame);
+        Assert.Equal (new (0, 0, 5, 5), Application.Current!.Frame);
         top.Dispose ();
     }
 
@@ -163,21 +163,21 @@ public class ApplicationTests
     [SetupFakeApplication]
     public void End_And_Shutdown_Should_Not_Dispose_ApplicationTop ()
     {
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         SessionToken rs = Application.Begin (new ());
-        Application.Top!.Title = "End_And_Shutdown_Should_Not_Dispose_ApplicationTop";
-        Assert.Equal (rs.Toplevel, Application.Top);
+        Application.Current!.Title = "End_And_Shutdown_Should_Not_Dispose_ApplicationTop";
+        Assert.Equal (rs.Toplevel, Application.Current);
         Application.End (rs);
 
 #if DEBUG_IDISPOSABLE
         Assert.True (rs.WasDisposed);
-        Assert.False (Application.Top!.WasDisposed); // Is true because the rs.Toplevel is the same as Application.Top
+        Assert.False (Application.Current!.WasDisposed); // Is true because the rs.Toplevel is the same as Application.Current
 #endif
 
         Assert.Null (rs.Toplevel);
 
-        Toplevel top = Application.Top;
+        Toplevel top = Application.Current;
 
 #if DEBUG_IDISPOSABLE
         Exception exception = Record.Exception (Application.Shutdown);
@@ -211,12 +211,12 @@ public class ApplicationTests
         Assert.NotNull (sessionToken);
         Assert.Equal (rs, sessionToken);
 
-        Assert.Equal (topLevel, Application.Top);
+        Assert.Equal (topLevel, Application.Current);
 
         Application.SessionBegun -= newSessionTokenFn;
         Application.End (sessionToken);
 
-        Assert.NotNull (Application.Top);
+        Assert.NotNull (Application.Current);
         Assert.NotNull (Application.Driver);
 
         topLevel.Dispose ();
@@ -327,7 +327,7 @@ public class ApplicationTests
             // Check that all fields and properties are set to their default values
 
             // Public Properties
-            Assert.Null (Application.Top);
+            Assert.Null (Application.Current);
             Assert.Null (Application.Mouse.MouseGrabView);
 
             // Don't check Application.ForceDriver
@@ -350,7 +350,7 @@ public class ApplicationTests
             Assert.Equal (Application.GetSupportedCultures (), Application.SupportedCultures);
             Assert.Equal (Application.GetAvailableCulturesFromEmbeddedResources (), Application.SupportedCultures);
             Assert.Null (Application.MainThreadId);
-            Assert.Empty (Application.TopLevels);
+            Assert.Empty (Application.SessionStack);
             Assert.Empty (Application.CachedViewsUnderMouse);
 
             // Mouse
@@ -472,18 +472,18 @@ public class ApplicationTests
         Assert.NotNull (sessionToken);
         Assert.Equal (rs, sessionToken);
 
-        Assert.Equal (topLevel, Application.Top);
+        Assert.Equal (topLevel, Application.Current);
 
         Application.SessionBegun -= newSessionTokenFn;
         Application.End (sessionToken);
 
-        Assert.NotNull (Application.Top);
+        Assert.NotNull (Application.Current);
         Assert.NotNull (Application.Driver);
 
         topLevel.Dispose ();
         Application.Shutdown ();
 
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
         Assert.Null (Application.Driver);
     }
 
@@ -492,11 +492,11 @@ public class ApplicationTests
     public void Internal_Properties_Correct ()
     {
         Assert.True (Application.Initialized);
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
         SessionToken rs = Application.Begin (new ());
-        Assert.Equal (Application.Top, rs.Toplevel);
+        Assert.Equal (Application.Current, rs.Toplevel);
         Assert.Null (Application.Mouse.MouseGrabView); // public
-        Application.Top!.Dispose ();
+        Application.Current!.Dispose ();
     }
 
     // Invoke Tests
@@ -592,9 +592,9 @@ public class ApplicationTests
         // Run<Toplevel> when already initialized or not with a Driver will not throw (because Window is derived from Toplevel)
         // Using another type not derived from Toplevel will throws at compile time
         Application.Run<Window> ();
-        Assert.True (Application.Top is Window);
+        Assert.True (Application.Current is Window);
 
-        Application.Top!.Dispose ();
+        Application.Current!.Dispose ();
     }
 
     [Fact]
@@ -605,15 +605,15 @@ public class ApplicationTests
         // Run<Toplevel> when already initialized or not with a Driver will not throw (because Window is derived from Toplevel)
         // Using another type not derived from Toplevel will throws at compile time
         Application.Run<Window> (null, "fake");
-        Assert.True (Application.Top is Window);
+        Assert.True (Application.Current is Window);
 
-        Application.Top!.Dispose ();
+        Application.Current!.Dispose ();
 
         // Run<Toplevel> when already initialized or not with a Driver will not throw (because Dialog is derived from Toplevel)
         Application.Run<Dialog> (null, "fake");
-        Assert.True (Application.Top is Dialog);
+        Assert.True (Application.Current is Dialog);
 
-        Application.Top!.Dispose ();
+        Application.Current!.Dispose ();
         Application.Shutdown ();
     }
 
@@ -621,7 +621,7 @@ public class ApplicationTests
     [SetupFakeApplication]
     public void Run_T_After_Init_Does_Not_Disposes_Application_Top ()
     {
-        // Init doesn't create a Toplevel and assigned it to Application.Top
+        // Init doesn't create a Toplevel and assigned it to Application.Current
         // but Begin does
         var initTop = new Toplevel ();
 
@@ -635,13 +635,13 @@ public class ApplicationTests
         initTop.Dispose ();
         Assert.True (initTop.WasDisposed);
 #endif
-        Application.Top!.Dispose ();
+        Application.Current!.Dispose ();
 
         return;
 
         void OnApplicationOnIteration (object s, IterationEventArgs a)
         {
-            Assert.NotEqual (initTop, Application.Top);
+            Assert.NotEqual (initTop, Application.Current);
 #if DEBUG_IDISPOSABLE
             Assert.False (initTop.WasDisposed);
 #endif
@@ -658,7 +658,7 @@ public class ApplicationTests
         // Init has been called and we're passing no driver to Run<TestTopLevel>. This is ok.
         Application.Run<Toplevel> ();
 
-        Application.Top!.Dispose ();
+        Application.Current!.Dispose ();
     }
 
     [Fact]
@@ -670,7 +670,7 @@ public class ApplicationTests
         // Init has been called, selecting FakeDriver; we're passing no driver to Run<TestTopLevel>. Should be fine.
         Application.Run<Toplevel> ();
 
-        Application.Top!.Dispose ();
+        Application.Current!.Dispose ();
     }
 
     [Fact]
@@ -701,7 +701,7 @@ public class ApplicationTests
         // Init has NOT been called and we're passing a valid driver to Run<TestTopLevel>. This is ok.
         Application.Run<Toplevel> (null, "fake");
 
-        Application.Top!.Dispose ();
+        Application.Current!.Dispose ();
     }
 
     [Fact]
@@ -825,9 +825,9 @@ public class ApplicationTests
 
         Assert.NotNull (w);
         Assert.Equal (string.Empty, w.Title); // Valid - w has not been disposed. The user may want to run it again
-        Assert.NotNull (Application.Top);
-        Assert.Equal (w, Application.Top);
-        Assert.NotEqual (top, Application.Top);
+        Assert.NotNull (Application.Current);
+        Assert.Equal (w, Application.Current);
+        Assert.NotEqual (top, Application.Current);
 
         Application.Run (w); // Valid - w has not been disposed.
 
@@ -855,14 +855,14 @@ public class ApplicationTests
     [Fact]
     public void Run_Creates_Top_Without_Init ()
     {
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
         Application.StopAfterFirstIteration = true;
 
         Application.Iteration += OnApplicationOnIteration;
         Toplevel top = Application.Run (null, "fake");
         Application.Iteration -= OnApplicationOnIteration;
 #if DEBUG_IDISPOSABLE
-        Assert.Equal (top, Application.Top);
+        Assert.Equal (top, Application.Current);
         Assert.False (top.WasDisposed);
         Exception exception = Record.Exception (Application.Shutdown);
         Assert.NotNull (exception);
@@ -875,38 +875,38 @@ public class ApplicationTests
 #if DEBUG_IDISPOSABLE
         Assert.True (top.WasDisposed);
 #endif
-        Assert.NotNull (Application.Top);
+        Assert.NotNull (Application.Current);
 
         Application.Shutdown ();
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         return;
 
-        void OnApplicationOnIteration (object s, IterationEventArgs e) { Assert.NotNull (Application.Top); }
+        void OnApplicationOnIteration (object s, IterationEventArgs e) { Assert.NotNull (Application.Current); }
     }
 
     [Fact]
     public void Run_T_Creates_Top_Without_Init ()
     {
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         Application.StopAfterFirstIteration = true;
 
         Application.Run<Toplevel> (null, "fake");
 #if DEBUG_IDISPOSABLE
-        Assert.False (Application.Top!.WasDisposed);
+        Assert.False (Application.Current!.WasDisposed);
         Exception exception = Record.Exception (Application.Shutdown);
         Assert.NotNull (exception);
-        Assert.False (Application.Top!.WasDisposed);
+        Assert.False (Application.Current!.WasDisposed);
 
         // It's up to caller to dispose it
-        Application.Top!.Dispose ();
-        Assert.True (Application.Top!.WasDisposed);
+        Application.Current!.Dispose ();
+        Assert.True (Application.Current!.WasDisposed);
 #endif
-        Assert.NotNull (Application.Top);
+        Assert.NotNull (Application.Current);
 
         Application.Shutdown ();
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
     }
 
     [Fact]
@@ -920,7 +920,7 @@ public class ApplicationTests
         // the new(Toplevel) may be a derived class that is possible using Application static
         // properties that is only available after the Application.Init was called
 
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         Assert.Throws<NotInitializedException> (() => Application.Run (new Toplevel ()));
 
@@ -930,25 +930,25 @@ public class ApplicationTests
         Application.Run (new Toplevel ());
         Application.Iteration -= OnApplicationOnIteration;
 #if DEBUG_IDISPOSABLE
-        Assert.False (Application.Top!.WasDisposed);
+        Assert.False (Application.Current!.WasDisposed);
         Exception exception = Record.Exception (Application.Shutdown);
         Assert.NotNull (exception);
-        Assert.False (Application.Top!.WasDisposed);
+        Assert.False (Application.Current!.WasDisposed);
 
         // It's up to caller to dispose it
-        Application.Top!.Dispose ();
-        Assert.True (Application.Top!.WasDisposed);
+        Application.Current!.Dispose ();
+        Assert.True (Application.Current!.WasDisposed);
 #endif
-        Assert.NotNull (Application.Top);
+        Assert.NotNull (Application.Current);
 
         Application.Shutdown ();
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         return;
 
         void OnApplicationOnIteration (object s, IterationEventArgs e)
         {
-            Assert.NotNull (Application.Top);
+            Assert.NotNull (Application.Current);
             Application.RequestStop ();
         }
     }
@@ -973,9 +973,9 @@ public class ApplicationTests
                            TaskScheduler.FromCurrentSynchronizationContext ());
         Application.Run<TestToplevel> ();
         Assert.NotNull (Application.Driver);
-        Assert.NotNull (Application.Top);
-        Assert.False (Application.Top!.Running);
-        Application.Top!.Dispose ();
+        Assert.NotNull (Application.Current);
+        Assert.False (Application.Current!.Running);
+        Application.Current!.Dispose ();
         Application.Shutdown ();
     }
 

Tests/UnitTests/Application/Mouse/ApplicationMouseEnterLeaveTests.cs

@@ -41,9 +41,9 @@ public class ApplicationMouseEnterLeaveTests
     public void RaiseMouseEnterLeaveEvents_MouseEntersView_CallsOnMouseEnter ()
     {
         // Arrange
-        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+        Application.Current = new () { Frame = new (0, 0, 10, 10) };
         var view = new TestView ();
-        Application.Top.Add (view);
+        Application.Current.Add (view);
         var mousePosition = new Point (1, 1);
         List<View> currentViewsUnderMouse = new () { view };
 
@@ -66,7 +66,7 @@ public class ApplicationMouseEnterLeaveTests
         finally
         {
             // Cleanup
-            Application.Top?.Dispose ();
+            Application.Current?.Dispose ();
             Application.ResetState ();
         }
     }
@@ -75,9 +75,9 @@ public class ApplicationMouseEnterLeaveTests
     public void RaiseMouseEnterLeaveEvents_MouseLeavesView_CallsOnMouseLeave ()
     {
         // Arrange
-        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+        Application.Current = new () { Frame = new (0, 0, 10, 10) };
         var view = new TestView ();
-        Application.Top.Add (view);
+        Application.Current.Add (view);
         var mousePosition = new Point (0, 0);
         List<View> currentViewsUnderMouse = new ();
         var mouseEvent = new MouseEventArgs ();
@@ -97,7 +97,7 @@ public class ApplicationMouseEnterLeaveTests
         finally
         {
             // Cleanup
-            Application.Top?.Dispose ();
+            Application.Current?.Dispose ();
             Application.ResetState ();
         }
     }
@@ -106,7 +106,7 @@ public class ApplicationMouseEnterLeaveTests
     public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenAdjacentViews_CallsOnMouseEnterAndLeave ()
     {
         // Arrange
-        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+        Application.Current = new () { Frame = new (0, 0, 10, 10) };
         var view1 = new TestView (); // at 1,1 to 2,2
 
         var view2 = new TestView () // at 2,2 to 3,3
@@ -114,8 +114,8 @@ public class ApplicationMouseEnterLeaveTests
             X = 2,
             Y = 2
         };
-        Application.Top.Add (view1);
-        Application.Top.Add (view2);
+        Application.Current.Add (view1);
+        Application.Current.Add (view2);
 
         Application.CachedViewsUnderMouse.Clear ();
 
@@ -189,7 +189,7 @@ public class ApplicationMouseEnterLeaveTests
         finally
         {
             // Cleanup
-            Application.Top?.Dispose ();
+            Application.Current?.Dispose ();
             Application.ResetState ();
         }
     }
@@ -198,9 +198,9 @@ public class ApplicationMouseEnterLeaveTests
     public void RaiseMouseEnterLeaveEvents_NoViewsUnderMouse_DoesNotCallOnMouseEnterOrLeave ()
     {
         // Arrange
-        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+        Application.Current = new () { Frame = new (0, 0, 10, 10) };
         var view = new TestView ();
-        Application.Top.Add (view);
+        Application.Current.Add (view);
         var mousePosition = new Point (0, 0);
         List<View> currentViewsUnderMouse = new ();
         var mouseEvent = new MouseEventArgs ();
@@ -219,7 +219,7 @@ public class ApplicationMouseEnterLeaveTests
         finally
         {
             // Cleanup
-            Application.Top?.Dispose ();
+            Application.Current?.Dispose ();
             Application.ResetState ();
         }
     }
@@ -228,7 +228,7 @@ public class ApplicationMouseEnterLeaveTests
     public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingPeerViews_CallsOnMouseEnterAndLeave ()
     {
         // Arrange
-        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+        Application.Current = new () { Frame = new (0, 0, 10, 10) };
 
         var view1 = new TestView
         {
@@ -241,8 +241,8 @@ public class ApplicationMouseEnterLeaveTests
             X = 2,
             Y = 2
         };
-        Application.Top.Add (view1);
-        Application.Top.Add (view2);
+        Application.Current.Add (view1);
+        Application.Current.Add (view2);
 
         Application.CachedViewsUnderMouse.Clear ();
 
@@ -329,7 +329,7 @@ public class ApplicationMouseEnterLeaveTests
         finally
         {
             // Cleanup
-            Application.Top?.Dispose ();
+            Application.Current?.Dispose ();
             Application.ResetState ();
         }
     }
@@ -338,7 +338,7 @@ public class ApplicationMouseEnterLeaveTests
     public void RaiseMouseEnterLeaveEvents_MouseMovesBetweenOverlappingSubViews_CallsOnMouseEnterAndLeave ()
     {
         // Arrange
-        Application.Top = new () { Frame = new (0, 0, 10, 10) };
+        Application.Current = new () { Frame = new (0, 0, 10, 10) };
 
         var view1 = new TestView
         {
@@ -358,7 +358,7 @@ public class ApplicationMouseEnterLeaveTests
             Arrangement = ViewArrangement.Overlapped
         }; // at 2,2 to 4,4 (screen)
         view1.Add (subView);
-        Application.Top.Add (view1);
+        Application.Current.Add (view1);
 
         Application.CachedViewsUnderMouse.Clear ();
 
@@ -474,7 +474,7 @@ public class ApplicationMouseEnterLeaveTests
         finally
         {
             // Cleanup
-            Application.Top?.Dispose ();
+            Application.Current?.Dispose ();
             Application.ResetState ();
         }
     }

Tests/UnitTests/Application/Mouse/ApplicationMouseTests.cs

@@ -202,15 +202,15 @@ public class ApplicationMouseTests
 
         var clicked = false;
 
-        Application.Top = new Toplevel ()
+        Application.Current = new Toplevel ()
         {
             Id = "top",
         };
-        Application.Top.X = 0;
-        Application.Top.Y = 0;
-        Application.Top.Width = size.Width * 2;
-        Application.Top.Height = size.Height * 2;
-        Application.Top.BorderStyle = LineStyle.None;
+        Application.Current.X = 0;
+        Application.Current.Y = 0;
+        Application.Current.Width = size.Width * 2;
+        Application.Current.Height = size.Height * 2;
+        Application.Current.BorderStyle = LineStyle.None;
 
         var view = new View { Id = "view", X = pos.X, Y = pos.Y, Width = size.Width, Height = size.Height };
 
@@ -218,7 +218,7 @@ public class ApplicationMouseTests
         view.BorderStyle = LineStyle.Single;
         view.CanFocus = true;
 
-        Application.Top.Add (view);
+        Application.Current.Add (view);
 
         var mouseEvent = new MouseEventArgs { Position = new (clickX, clickY), ScreenPosition = new (clickX, clickY), Flags = MouseFlags.Button1Clicked };
 
@@ -231,7 +231,7 @@ public class ApplicationMouseTests
 
         Application.RaiseMouseEvent (mouseEvent);
         Assert.Equal (expectedClicked, clicked);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (ignoreDisposed: true);
 
     }

Tests/UnitTests/Application/SessionTokenTests.cs

@@ -26,7 +26,7 @@ public class SessionTokenTests
         Assert.NotNull (rs);
         Application.End (rs);
 
-        Assert.NotNull (Application.Top);
+        Assert.NotNull (Application.Current);
 
         // v2 does not use main loop, it uses MainLoop<T> and its internal
         //Assert.NotNull (Application.MainLoop);

Tests/UnitTests/Application/SynchronizatonContextTests.cs

@@ -39,7 +39,7 @@ public class SyncrhonizationContextTests
 
             Task.Run (() =>
                       {
-                          while (Application.Top is null || Application.Top is { Running: false })
+                          while (Application.Current is null || Application.Current is { Running: false })
                           {
                               Thread.Sleep (500);
                           }
@@ -56,7 +56,7 @@ public class SyncrhonizationContextTests
                                         null
                                        );
 
-                          if (Application.Top is { Running: true })
+                          if (Application.Current is { Running: true })
                           {
                               Assert.False (success);
                           }

Tests/UnitTests/Dialogs/DialogTests.cs

@@ -902,8 +902,8 @@ public class DialogTests (ITestOutputHelper output)
 
 #if DEBUG_IDISPOSABLE
         Assert.False (dlg.WasDisposed);
-        Assert.False (Application.Top!.WasDisposed);
-        Assert.Equal (dlg, Application.Top);
+        Assert.False (Application.Current!.WasDisposed);
+        Assert.Equal (dlg, Application.Current);
 #endif
 
         Assert.True (dlg.Canceled);
@@ -925,8 +925,8 @@ public class DialogTests (ITestOutputHelper output)
         Application.Run (dlg2);
 
         Assert.True (dlg.WasDisposed);
-        Assert.False (Application.Top.WasDisposed);
-        Assert.Equal (dlg2, Application.Top);
+        Assert.False (Application.Current.WasDisposed);
+        Assert.Equal (dlg2, Application.Current);
         Assert.False (dlg2.WasDisposed);
 
         dlg2.Dispose ();
@@ -937,10 +937,10 @@ public class DialogTests (ITestOutputHelper output)
         //Assert.NotNull (exception);
         //Assert.StartsWith ("Cannot access a disposed object.", exception.Message);
 
-        Assert.True (Application.Top.WasDisposed);
+        Assert.True (Application.Current.WasDisposed);
         Application.Shutdown ();
         Assert.True (dlg2.WasDisposed);
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 #endif
 
         return;
@@ -1174,8 +1174,8 @@ public class DialogTests (ITestOutputHelper output)
             switch (iterations)
             {
                 case 0:
-                    Application.Top!.SetNeedsLayout ();
-                    Application.Top.SetNeedsDraw ();
+                    Application.Current!.SetNeedsLayout ();
+                    Application.Current.SetNeedsDraw ();
 
                     break;
 
@@ -1216,7 +1216,7 @@ public class DialogTests (ITestOutputHelper output)
   └───────────────────────┘",
                                                                    output);
 
-                    Assert.False (Application.Top!.NewKeyDownEvent (Key.Enter));
+                    Assert.False (Application.Current!.NewKeyDownEvent (Key.Enter));
 
                     break;
                 case 7:
@@ -1410,9 +1410,9 @@ public class DialogTests (ITestOutputHelper output)
 
 #if DEBUG_IDISPOSABLE
         Assert.False (dlg.WasDisposed);
-        Assert.False (Application.Top!.WasDisposed);
-        Assert.NotEqual (top, Application.Top);
-        Assert.Equal (dlg, Application.Top);
+        Assert.False (Application.Current!.WasDisposed);
+        Assert.NotEqual (top, Application.Current);
+        Assert.Equal (dlg, Application.Current);
 #endif
 
         // dlg wasn't disposed yet and it's possible to access to his properties
@@ -1426,11 +1426,11 @@ public class DialogTests (ITestOutputHelper output)
         top.Dispose ();
 #if DEBUG_IDISPOSABLE
         Assert.True (dlg.WasDisposed);
-        Assert.True (Application.Top.WasDisposed);
-        Assert.NotNull (Application.Top);
+        Assert.True (Application.Current.WasDisposed);
+        Assert.NotNull (Application.Current);
 #endif
         Application.Shutdown ();
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
 
         return;
 

Tests/UnitTests/Dialogs/MessageBoxTests.cs

@@ -193,7 +193,7 @@ public class MessageBoxTests (ITestOutputHelper output)
             }
             else if (iterations == 1)
             {
-                mbFrame = Application.Top!.Frame;
+                mbFrame = Application.Current!.Frame;
                 Application.RequestStop ();
             }
         }
@@ -378,8 +378,8 @@ public class MessageBoxTests (ITestOutputHelper output)
                                      {
                                          AutoInitShutdownAttribute.RunIteration ();
 
-                                         Assert.IsType<Dialog> (Application.Top);
-                                         Assert.Equal (new (height, width), Application.Top.Frame.Size);
+                                         Assert.IsType<Dialog> (Application.Current);
+                                         Assert.Equal (new (height, width), Application.Current.Frame.Size);
 
                                          Application.RequestStop ();
                                      }
@@ -415,8 +415,8 @@ public class MessageBoxTests (ITestOutputHelper output)
                                      {
                                          AutoInitShutdownAttribute.RunIteration ();
 
-                                         Assert.IsType<Dialog> (Application.Top);
-                                         Assert.Equal (new (height, width), Application.Top.Frame.Size);
+                                         Assert.IsType<Dialog> (Application.Current);
+                                         Assert.Equal (new (height, width), Application.Current.Frame.Size);
 
                                          Application.RequestStop ();
                                      }
@@ -448,8 +448,8 @@ public class MessageBoxTests (ITestOutputHelper output)
                                      {
                                          AutoInitShutdownAttribute.RunIteration ();
 
-                                         Assert.IsType<Dialog> (Application.Top);
-                                         Assert.Equal (new (height, width), Application.Top.Frame.Size);
+                                         Assert.IsType<Dialog> (Application.Current);
+                                         Assert.Equal (new (height, width), Application.Current.Frame.Size);
 
                                          Application.RequestStop ();
                                      }

Tests/UnitTests/View/Adornment/AdornmentSubViewTests.cs

@@ -14,14 +14,14 @@ public class AdornmentSubViewTests (ITestOutputHelper output)
     [InlineData (2, 1, true)]
     public void Adornment_WithSubView_Finds (int viewMargin, int subViewMargin, bool expectedFound)
     {
-        Application.Top = new Toplevel()
+        Application.Current = new Toplevel()
         {
             Width = 10,
             Height = 10
         };
-        Application.Top.Margin!.Thickness = new Thickness (viewMargin);
+        Application.Current.Margin!.Thickness = new Thickness (viewMargin);
         // Turn of TransparentMouse for the test
-        Application.Top.Margin!.ViewportSettings = ViewportSettingsFlags.None;
+        Application.Current.Margin!.ViewportSettings = ViewportSettingsFlags.None;
 
         var subView = new View ()
         {
@@ -34,26 +34,26 @@ public class AdornmentSubViewTests (ITestOutputHelper output)
         // Turn of TransparentMouse for the test
         subView.Margin!.ViewportSettings = ViewportSettingsFlags.None;
 
-        Application.Top.Margin!.Add (subView);
-        Application.Top.Layout ();
+        Application.Current.Margin!.Add (subView);
+        Application.Current.Layout ();
 
         var foundView = View.GetViewsUnderLocation (new Point(0, 0), ViewportSettingsFlags.None).LastOrDefault ();
 
         bool found = foundView == subView || foundView == subView.Margin;
         Assert.Equal (expectedFound, found);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (ignoreDisposed: true);
     }
 
     [Fact]
     public void Adornment_WithNonVisibleSubView_Finds_Adornment ()
     {
-        Application.Top = new Toplevel ()
+        Application.Current = new Toplevel ()
         {
             Width = 10,
             Height = 10
         };
-        Application.Top.Padding.Thickness = new Thickness (1);
+        Application.Current.Padding.Thickness = new Thickness (1);
 
         var subView = new View ()
         {
@@ -63,11 +63,11 @@ public class AdornmentSubViewTests (ITestOutputHelper output)
             Height = 1,
             Visible = false
         };
-        Application.Top.Padding.Add (subView);
-        Application.Top.Layout ();
+        Application.Current.Padding.Add (subView);
+        Application.Current.Layout ();
 
-        Assert.Equal (Application.Top.Padding, View.GetViewsUnderLocation (new Point(0, 0), ViewportSettingsFlags.None).LastOrDefault ());
-        Application.Top?.Dispose ();
+        Assert.Equal (Application.Current.Padding, View.GetViewsUnderLocation (new Point(0, 0), ViewportSettingsFlags.None).LastOrDefault ());
+        Application.Current?.Dispose ();
         Application.ResetState (ignoreDisposed: true);
     }
 }

Tests/UnitTests/View/Adornment/MarginTests.cs

@@ -15,27 +15,27 @@ public class MarginTests (ITestOutputHelper output)
         view.Margin!.Diagnostics = ViewDiagnosticFlags.Thickness;
         view.Margin.Thickness = new (1);
 
-        Application.Top = new Toplevel ();
-        Application.TopLevels.Push (Application.Top);
+        Application.Current = new Toplevel ();
+        Application.SessionStack.Push (Application.Current);
 
-        Application.Top.SetScheme (new()
+        Application.Current.SetScheme (new()
         {
             Normal = new (Color.Red, Color.Green), Focus = new (Color.Green, Color.Red)
         });
 
-        Application.Top.Add (view);
+        Application.Current.Add (view);
         Assert.Equal (ColorName16.Red, view.Margin.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
-        Assert.Equal (ColorName16.Red, Application.Top.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (ColorName16.Red, Application.Current.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
 
-        Application.Top.BeginInit ();
-        Application.Top.EndInit ();
+        Application.Current.BeginInit ();
+        Application.Current.EndInit ();
         Application.LayoutAndDraw();
 
         DriverAssert.AssertDriverContentsAre (
                                              @"",
                                              output
                                             );
-        DriverAssert.AssertDriverAttributesAre ("0", output, null, Application.Top.GetAttributeForRole (VisualRole.Normal));
+        DriverAssert.AssertDriverAttributesAre ("0", output, null, Application.Current.GetAttributeForRole (VisualRole.Normal));
 
         Application.ResetState (true);
     }
@@ -51,20 +51,20 @@ public class MarginTests (ITestOutputHelper output)
         view.Margin.Thickness = new (1);
         view.Margin.ViewportSettings = ViewportSettingsFlags.None;
 
-        Application.Top = new Toplevel ();
-        Application.TopLevels.Push (Application.Top);
+        Application.Current = new Toplevel ();
+        Application.SessionStack.Push (Application.Current);
 
-        Application.Top.SetScheme (new ()
+        Application.Current.SetScheme (new ()
         {
             Normal = new (Color.Red, Color.Green), Focus = new (Color.Green, Color.Red)
         });
 
-        Application.Top.Add (view);
+        Application.Current.Add (view);
         Assert.Equal (ColorName16.Red, view.Margin.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
-        Assert.Equal (ColorName16.Red, Application.Top.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
+        Assert.Equal (ColorName16.Red, Application.Current.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
 
-        Application.Top.BeginInit ();
-        Application.Top.EndInit ();
+        Application.Current.BeginInit ();
+        Application.Current.EndInit ();
         Application.LayoutAndDraw ();
 
         DriverAssert.AssertDriverContentsAre (
@@ -74,7 +74,7 @@ M M
 MMM",
                                               output
                                              );
-        DriverAssert.AssertDriverAttributesAre ("0", output, null, Application.Top.GetAttributeForRole (VisualRole.Normal));
+        DriverAssert.AssertDriverAttributesAre ("0", output, null, Application.Current.GetAttributeForRole (VisualRole.Normal));
 
         Application.ResetState (true);
     }

Tests/UnitTests/View/Adornment/ShadowStyleTests.cs

@@ -65,7 +65,7 @@ public class ShadowStyleTests (ITestOutputHelper output)
         view.SetScheme (new (Attribute.Default));
 
         superView.Add (view);
-        Application.TopLevels.Push (superView);
+        Application.SessionStack.Push (superView);
         Application.LayoutAndDraw (true);
         DriverAssert.AssertDriverAttributesAre (expectedAttrs, output, Application.Driver, attributes);
         Application.ResetState (true);
@@ -118,7 +118,7 @@ public class ShadowStyleTests (ITestOutputHelper output)
         };
         view.ShadowStyle = style;
         superView.Add (view);
-        Application.TopLevels.Push (superView);
+        Application.SessionStack.Push (superView);
         Application.LayoutAndDraw (true);
 
         DriverAssert.AssertDriverContentsWithFrameAre (expected, output);

Tests/UnitTests/View/Keyboard/KeyBindingsTests.cs

@@ -160,14 +160,14 @@ public class KeyBindingsTests ()
         var hotKeyRaised = false;
         var acceptRaised = false;
         var selectRaised = false;
-        Application.Top = new Toplevel ();
+        Application.Current = new Toplevel ();
         var view = new View
         {
             CanFocus = true,
             HotKeySpecifier = new Rune ('_'),
             Title = "_Test"
         };
-        Application.Top.Add (view);
+        Application.Current.Add (view);
         view.HandlingHotKey += (s, e) => hotKeyRaised = true;
         view.Accepting += (s, e) => acceptRaised = true;
         view.Selecting += (s, e) => selectRaised = true;
@@ -191,7 +191,7 @@ public class KeyBindingsTests ()
         Assert.False (acceptRaised);
         Assert.False (selectRaised);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
     // tests that test KeyBindingScope.Focus and KeyBindingScope.HotKey (tests for KeyBindingScope.Application are in Application/KeyboardTests.cs)

Tests/UnitTests/View/Layout/GetViewsUnderLocationTests.cs

@@ -70,17 +70,17 @@ public class GetViewsUnderLocationTests
     )
     {
         // Arrange
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Id = "Top",
             Frame = new (frameX, frameY, 10, 10)
         };
-        Application.Top.Margin!.Thickness = new (marginThickness);
-        Application.Top.Margin!.Id = "Margin";
-        Application.Top.Border!.Thickness = new (borderThickness);
-        Application.Top.Border!.Id = "Border";
-        Application.Top.Padding!.Thickness = new (paddingThickness);
-        Application.Top.Padding.Id = "Padding";
+        Application.Current.Margin!.Thickness = new (marginThickness);
+        Application.Current.Margin!.Id = "Margin";
+        Application.Current.Border!.Thickness = new (borderThickness);
+        Application.Current.Border!.Id = "Border";
+        Application.Current.Padding!.Thickness = new (paddingThickness);
+        Application.Current.Padding.Id = "Padding";
 
         var location = new Point (testX, testY);
 
@@ -98,7 +98,7 @@ public class GetViewsUnderLocationTests
             Assert.Equal (expectedViewsFound, foundIds);
         }
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -109,7 +109,7 @@ public class GetViewsUnderLocationTests
     public void Returns_Top_If_No_SubViews (int testX, int testY)
     {
         // Arrange
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Frame = new (0, 0, 10, 10)
         };
@@ -120,8 +120,8 @@ public class GetViewsUnderLocationTests
         List<View?> viewsUnderMouse = View.GetViewsUnderLocation (location, ViewportSettingsFlags.TransparentMouse);
 
         // Assert
-        Assert.Contains (viewsUnderMouse, v => v == Application.Top);
-        Application.Top.Dispose ();
+        Assert.Contains (viewsUnderMouse, v => v == Application.Current);
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -134,13 +134,13 @@ public class GetViewsUnderLocationTests
     {
         Application.ResetState (true);
 
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10, Height = 10
         };
 
-        Assert.Same (Application.Top, View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ());
-        Application.Top.Dispose ();
+        Assert.Same (Application.Current, View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ());
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -155,7 +155,7 @@ public class GetViewsUnderLocationTests
     [InlineData (5, 6, true)]
     public void Returns_Correct_If_SubViews (int testX, int testY, bool expectedSubViewFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10, Height = 10
         };
@@ -165,12 +165,12 @@ public class GetViewsUnderLocationTests
             X = 1, Y = 2,
             Width = 5, Height = 5
         };
-        Application.Top.Add (subview);
+        Application.Current.Add (subview);
 
         View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -184,7 +184,7 @@ public class GetViewsUnderLocationTests
     [InlineData (5, 6, false)]
     public void Returns_Null_If_SubView_NotVisible (int testX, int testY, bool expectedSubViewFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10, Height = 10
         };
@@ -195,12 +195,12 @@ public class GetViewsUnderLocationTests
             Width = 5, Height = 5,
             Visible = false
         };
-        Application.Top.Add (subview);
+        Application.Current.Add (subview);
 
         View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -214,7 +214,7 @@ public class GetViewsUnderLocationTests
     [InlineData (5, 6, false)]
     public void Returns_Null_If_Not_Visible_And_SubView_Visible (int testX, int testY, bool expectedSubViewFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10, Height = 10,
             Visible = false
@@ -225,14 +225,14 @@ public class GetViewsUnderLocationTests
             X = 1, Y = 2,
             Width = 5, Height = 5
         };
-        Application.Top.Add (subview);
+        Application.Current.Add (subview);
         subview.Visible = true;
         Assert.True (subview.Visible);
-        Assert.False (Application.Top.Visible);
+        Assert.False (Application.Current.Visible);
         View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -249,23 +249,23 @@ public class GetViewsUnderLocationTests
     [InlineData (6, 7, true)]
     public void Returns_Correct_If_Start_Has_Adornments (int testX, int testY, bool expectedSubViewFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10, Height = 10
         };
-        Application.Top.Margin!.Thickness = new (1);
+        Application.Current.Margin!.Thickness = new (1);
 
         var subview = new View
         {
             X = 1, Y = 2,
             Width = 5, Height = 5
         };
-        Application.Top.Add (subview);
+        Application.Current.Add (subview);
 
         View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -280,24 +280,24 @@ public class GetViewsUnderLocationTests
     [InlineData (-1, 0, 0, false)]
     public void Returns_Correct_If_Start_Has_Offset_Viewport (int offset, int testX, int testY, bool expectedSubViewFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10, Height = 10,
             ViewportSettings = ViewportSettingsFlags.AllowNegativeLocation
         };
-        Application.Top.Viewport = new (offset, offset, 10, 10);
+        Application.Current.Viewport = new (offset, offset, 10, 10);
 
         var subview = new View
         {
             X = 1, Y = 1,
             Width = 2, Height = 2
         };
-        Application.Top.Add (subview);
+        Application.Current.Add (subview);
 
         View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -313,25 +313,25 @@ public class GetViewsUnderLocationTests
     [InlineData (6, 7, false)]
     public void Returns_Correct_If_Start_Has_Adornment_WithSubView (int testX, int testY, bool expectedSubViewFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10, Height = 10
         };
-        Application.Top.Padding!.Thickness = new (1);
+        Application.Current.Padding!.Thickness = new (1);
 
         var subview = new View
         {
             X = Pos.AnchorEnd (1), Y = Pos.AnchorEnd (1),
             Width = 1, Height = 1
         };
-        Application.Top.Padding.Add (subview);
-        Application.Top.BeginInit ();
-        Application.Top.EndInit ();
+        Application.Current.Padding.Add (subview);
+        Application.Current.BeginInit ();
+        Application.Current.EndInit ();
 
         View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == subview);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -347,17 +347,17 @@ public class GetViewsUnderLocationTests
     {
         Application.ResetState (true);
 
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Id = "Top",
             Width = 10, Height = 10
         };
-        Application.Top.Margin!.Thickness = new (1);
-        Application.Top.Margin!.Id = "Margin";
-        Application.Top.Border!.Thickness = new (1);
-        Application.Top.Border!.Id = "Border";
-        Application.Top.Padding!.Thickness = new (1);
-        Application.Top.Padding.Id = "Padding";
+        Application.Current.Margin!.Thickness = new (1);
+        Application.Current.Margin!.Id = "Margin";
+        Application.Current.Border!.Thickness = new (1);
+        Application.Current.Border!.Id = "Border";
+        Application.Current.Padding!.Thickness = new (1);
+        Application.Current.Padding.Id = "Padding";
 
         var subview = new View
         {
@@ -365,13 +365,13 @@ public class GetViewsUnderLocationTests
             X = 1, Y = 1,
             Width = 1, Height = 1
         };
-        Application.Top.Add (subview);
+        Application.Current.Add (subview);
 
         List<View?> viewsUnderMouse = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse);
         string [] foundIds = viewsUnderMouse.Select (v => v!.Id).ToArray ();
 
         Assert.Equal (expectedViewsFound, foundIds);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -388,7 +388,7 @@ public class GetViewsUnderLocationTests
     [InlineData (2, 3, new [] { "Top", "subview" })]
     public void Returns_Correct_If_SubView_Has_Adornments (int testX, int testY, string [] expectedViewsFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Id = "Top",
             Width = 10, Height = 10
@@ -402,13 +402,13 @@ public class GetViewsUnderLocationTests
         };
         subview.Border!.Thickness = new (1);
         subview.Border!.Id = "border";
-        Application.Top.Add (subview);
+        Application.Current.Add (subview);
 
         List<View?> viewsUnderMouse = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse);
         string [] foundIds = viewsUnderMouse.Select (v => v!.Id).ToArray ();
 
         Assert.Equal (expectedViewsFound, foundIds);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -425,7 +425,7 @@ public class GetViewsUnderLocationTests
     [InlineData (2, 3, new [] { "Top", "subview" })]
     public void Returns_Correct_If_SubView_Has_Adornments_With_TransparentMouse (int testX, int testY, string [] expectedViewsFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Id = "Top",
             Width = 10, Height = 10
@@ -440,13 +440,13 @@ public class GetViewsUnderLocationTests
         subview.Border!.Thickness = new (1);
         subview.Border!.ViewportSettings = ViewportSettingsFlags.TransparentMouse;
         subview.Border!.Id = "border";
-        Application.Top.Add (subview);
+        Application.Current.Add (subview);
 
         List<View?> viewsUnderMouse = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse);
         string [] foundIds = viewsUnderMouse.Select (v => v!.Id).ToArray ();
 
         Assert.Equal (expectedViewsFound, foundIds);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -463,7 +463,7 @@ public class GetViewsUnderLocationTests
     [InlineData (5, 5, true)]
     public void Returns_Correct_If_SubView_Has_Adornment_WithSubView (int testX, int testY, bool expectedSubViewFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10, Height = 10
         };
@@ -486,14 +486,14 @@ public class GetViewsUnderLocationTests
             Height = 1
         };
         subview.Padding.Add (paddingSubView);
-        Application.Top.Add (subview);
-        Application.Top.BeginInit ();
-        Application.Top.EndInit ();
+        Application.Current.Add (subview);
+        Application.Current.BeginInit ();
+        Application.Current.EndInit ();
 
         View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == paddingSubView);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -510,7 +510,7 @@ public class GetViewsUnderLocationTests
     [InlineData (5, 5, true)]
     public void Returns_Correct_If_SubView_Is_Scrolled_And_Has_Adornment_WithSubView (int testX, int testY, bool expectedSubViewFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10, Height = 10
         };
@@ -537,14 +537,14 @@ public class GetViewsUnderLocationTests
             Height = 1
         };
         subview.Padding.Add (paddingSubView);
-        Application.Top.Add (subview);
-        Application.Top.BeginInit ();
-        Application.Top.EndInit ();
+        Application.Current.Add (subview);
+        Application.Current.BeginInit ();
+        Application.Current.EndInit ();
 
         View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ();
 
         Assert.Equal (expectedSubViewFound, found == paddingSubView);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -560,7 +560,7 @@ public class GetViewsUnderLocationTests
     [InlineData (5, 5, 2)]
     public void Returns_Correct_With_NestedSubViews (int testX, int testY, int expectedSubViewFound)
     {
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10, Height = 10
         };
@@ -583,11 +583,11 @@ public class GetViewsUnderLocationTests
             }
         }
 
-        Application.Top.Add (subviews [0]);
+        Application.Current.Add (subviews [0]);
 
         View? found = View.GetViewsUnderLocation (new (testX, testY), ViewportSettingsFlags.TransparentMouse).LastOrDefault ();
         Assert.Equal (expectedSubViewFound, subviews.IndexOf (found!));
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -604,7 +604,7 @@ public class GetViewsUnderLocationTests
     public void Tiled_SubViews (int mouseX, int mouseY, string [] viewIdStrings)
     {
         // Arrange
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Frame = new (0, 0, 10, 10),
             Id = "top"
@@ -630,7 +630,7 @@ public class GetViewsUnderLocationTests
             Arrangement = ViewArrangement.Overlapped
         }; // at 2,2 to 4,3 (screen)
         view.Add (subView);
-        Application.Top.Add (view);
+        Application.Current.Add (view);
 
         List<View?> found = View.GetViewsUnderLocation (new (mouseX, mouseY), ViewportSettingsFlags.TransparentMouse);
 
@@ -638,7 +638,7 @@ public class GetViewsUnderLocationTests
 
         Assert.Equal (viewIdStrings, foundIds);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -656,7 +656,7 @@ public class GetViewsUnderLocationTests
     public void Popover (int mouseX, int mouseY, string [] viewIdStrings)
     {
         // Arrange
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Frame = new (0, 0, 10, 10),
             Id = "top"
@@ -683,7 +683,7 @@ public class GetViewsUnderLocationTests
         }; // at 2,2 to 4,3 (screen)
 
         view.Add (popOver);
-        Application.Top.Add (view);
+        Application.Current.Add (view);
 
         List<View?> found = View.GetViewsUnderLocation (new (mouseX, mouseY), ViewportSettingsFlags.TransparentMouse);
 
@@ -691,7 +691,7 @@ public class GetViewsUnderLocationTests
 
         Assert.Equal (viewIdStrings, foundIds);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -714,10 +714,10 @@ public class GetViewsUnderLocationTests
         secondaryToplevel.Margin!.Thickness = new (1);
         secondaryToplevel.Layout ();
 
-        Application.TopLevels.Clear ();
-        Application.TopLevels.Push (topToplevel);
-        Application.TopLevels.Push (secondaryToplevel);
-        Application.Top = secondaryToplevel;
+        Application.SessionStack.Clear ();
+        Application.SessionStack.Push (topToplevel);
+        Application.SessionStack.Push (secondaryToplevel);
+        Application.Current = secondaryToplevel;
 
         List<View?> found = View.GetViewsUnderLocation (new (2, 2), ViewportSettingsFlags.TransparentMouse);
         Assert.Contains (found, v => v?.Id == topToplevel.Id);
@@ -725,7 +725,7 @@ public class GetViewsUnderLocationTests
 
         topToplevel.Dispose ();
         secondaryToplevel.Dispose ();
-        Application.TopLevels.Clear ();
+        Application.SessionStack.Clear ();
         Application.ResetState (true);
     }
 
@@ -748,10 +748,10 @@ public class GetViewsUnderLocationTests
         secondaryToplevel.Margin!.Thickness = new (1);
         secondaryToplevel.Layout ();
 
-        Application.TopLevels.Clear ();
-        Application.TopLevels.Push (topToplevel);
-        Application.TopLevels.Push (secondaryToplevel);
-        Application.Top = secondaryToplevel;
+        Application.SessionStack.Clear ();
+        Application.SessionStack.Push (topToplevel);
+        Application.SessionStack.Push (secondaryToplevel);
+        Application.Current = secondaryToplevel;
 
         List<View?> found = View.GetViewsUnderLocation (new (7, 7), ViewportSettingsFlags.TransparentMouse);
         Assert.Contains (found, v => v?.Id == secondaryToplevel.Id);
@@ -759,7 +759,7 @@ public class GetViewsUnderLocationTests
 
         topToplevel.Dispose ();
         secondaryToplevel.Dispose ();
-        Application.TopLevels.Clear ();
+        Application.SessionStack.Clear ();
         Application.ResetState (true);
     }
 
@@ -781,10 +781,10 @@ public class GetViewsUnderLocationTests
         };
         secondaryToplevel.Margin!.Thickness = new (1);
 
-        Application.TopLevels.Clear ();
-        Application.TopLevels.Push (topToplevel);
-        Application.TopLevels.Push (secondaryToplevel);
-        Application.Top = secondaryToplevel;
+        Application.SessionStack.Clear ();
+        Application.SessionStack.Push (topToplevel);
+        Application.SessionStack.Push (secondaryToplevel);
+        Application.Current = secondaryToplevel;
 
         secondaryToplevel.Margin!.ViewportSettings = ViewportSettingsFlags.None;
 
@@ -801,7 +801,7 @@ public class GetViewsUnderLocationTests
 
         topToplevel.Dispose ();
         secondaryToplevel.Dispose ();
-        Application.TopLevels.Clear ();
+        Application.SessionStack.Clear ();
         Application.ResetState (true);
     }
 
@@ -824,17 +824,17 @@ public class GetViewsUnderLocationTests
         secondaryToplevel.Margin!.Thickness = new (1);
         secondaryToplevel.Layout ();
 
-        Application.TopLevels.Clear ();
-        Application.TopLevels.Push (topToplevel);
-        Application.TopLevels.Push (secondaryToplevel);
-        Application.Top = secondaryToplevel;
+        Application.SessionStack.Clear ();
+        Application.SessionStack.Push (topToplevel);
+        Application.SessionStack.Push (secondaryToplevel);
+        Application.Current = secondaryToplevel;
 
         List<View?> found = View.GetViewsUnderLocation (new (20, 20), ViewportSettingsFlags.TransparentMouse);
         Assert.Empty (found);
 
         topToplevel.Dispose ();
         secondaryToplevel.Dispose ();
-        Application.TopLevels.Clear ();
+        Application.SessionStack.Clear ();
         Application.ResetState (true);
     }
 }

Tests/UnitTests/View/Layout/Pos.CombineTests.cs

@@ -40,7 +40,7 @@ public class PosCombineTests (ITestOutputHelper output)
     [SetupFakeApplication]
     public void PosCombine_DimCombine_View_With_SubViews ()
     {
-        Application.Top = new Toplevel () { Width = 80, Height = 25 };
+        Application.Current = new Toplevel () { Width = 80, Height = 25 };
         var win1 = new Window { Id = "win1", Width = 20, Height = 10 };
         var view1 = new View
         {
@@ -59,10 +59,10 @@ public class PosCombineTests (ITestOutputHelper output)
         view2.Add (view3);
         win2.Add (view2);
         win1.Add (view1, win2);
-        Application.Top.Add (win1);
-        Application.Top.Layout ();
+        Application.Current.Add (win1);
+        Application.Current.Layout ();
 
-        Assert.Equal (new Rectangle (0, 0, 80, 25), Application.Top.Frame);
+        Assert.Equal (new Rectangle (0, 0, 80, 25), Application.Current.Frame);
         Assert.Equal (new Rectangle (0, 0, 5, 1), view1.Frame);
         Assert.Equal (new Rectangle (0, 0, 20, 10), win1.Frame);
         Assert.Equal (new Rectangle (0, 2, 10, 3), win2.Frame);
@@ -70,7 +70,7 @@ public class PosCombineTests (ITestOutputHelper output)
         Assert.Equal (new Rectangle (0, 0, 7, 1), view3.Frame);
         var foundView = View.GetViewsUnderLocation (new Point(9, 4), ViewportSettingsFlags.None).LastOrDefault ();
         Assert.Equal (foundView, view2);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -89,13 +89,13 @@ public class PosCombineTests (ITestOutputHelper output)
         top.Add (w);
         Application.Begin (top);
 
-        f.X = Pos.X (Application.Top) + Pos.X (v2) - Pos.X (v1);
-        f.Y = Pos.Y (Application.Top) + Pos.Y (v2) - Pos.Y (v1);
+        f.X = Pos.X (Application.Current) + Pos.X (v2) - Pos.X (v1);
+        f.Y = Pos.Y (Application.Current) + Pos.Y (v2) - Pos.Y (v1);
 
-        Application.Top.SubViewsLaidOut += (s, e) =>
+        Application.Current.SubViewsLaidOut += (s, e) =>
         {
-            Assert.Equal (0, Application.Top.Frame.X);
-            Assert.Equal (0, Application.Top.Frame.Y);
+            Assert.Equal (0, Application.Current.Frame.X);
+            Assert.Equal (0, Application.Current.Frame.Y);
             Assert.Equal (2, w.Frame.X);
             Assert.Equal (2, w.Frame.Y);
             Assert.Equal (2, f.Frame.X);
@@ -109,7 +109,7 @@ public class PosCombineTests (ITestOutputHelper output)
         Application.StopAfterFirstIteration = true;
 
         Assert.Throws<LayoutException> (() => Application.Run ());
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         top.Dispose ();
         Application.Shutdown ();
     }

Tests/UnitTests/View/Layout/SetLayoutTests.cs

@@ -12,7 +12,7 @@ public class SetLayoutTests (ITestOutputHelper output)
     [AutoInitShutdown]
     public void Screen_Size_Change_Causes_Layout ()
     {
-        Application.Top = new ();
+        Application.Current = new ();
 
         var view = new View
         {
@@ -22,21 +22,21 @@ public class SetLayoutTests (ITestOutputHelper output)
             Height = 1,
             Text = "0123456789"
         };
-        Application.Top.Add (view);
+        Application.Current.Add (view);
 
-        var rs = Application.Begin (Application.Top);
+        var rs = Application.Begin (Application.Current);
         Application.Driver!.SetScreenSize (80, 25);
 
         Assert.Equal (new (0, 0, 80, 25), new Rectangle (0, 0, Application.Screen.Width, Application.Screen.Height));
-        Assert.Equal (new (0, 0, Application.Screen.Width, Application.Screen.Height), Application.Top.Frame);
-        Assert.Equal (new (0, 0, 80, 25), Application.Top.Frame);
+        Assert.Equal (new (0, 0, Application.Screen.Width, Application.Screen.Height), Application.Current.Frame);
+        Assert.Equal (new (0, 0, 80, 25), Application.Current.Frame);
 
         Application.Driver!.SetScreenSize (20, 10);
-        Assert.Equal (new (0, 0, Application.Screen.Width, Application.Screen.Height), Application.Top.Frame);
+        Assert.Equal (new (0, 0, Application.Screen.Width, Application.Screen.Height), Application.Current.Frame);
 
-        Assert.Equal (new (0, 0, 20, 10), Application.Top.Frame);
+        Assert.Equal (new (0, 0, 20, 10), Application.Current.Frame);
 
         Application.End (rs);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 }

Tests/UnitTests/View/Navigation/CanFocusTests.cs

@@ -91,10 +91,10 @@ public class CanFocusTests
         Label label = new () { Text = "label" };
         View view = new () { Text = "view", CanFocus = true };
         Application.Navigation = new ();
-        Application.Top = new ();
-        Application.Top.Add (label, view);
+        Application.Current = new ();
+        Application.Current.Add (label, view);
 
-        Application.Top.SetFocus ();
+        Application.Current.SetFocus ();
         Assert.Equal (view, Application.Navigation.GetFocused ());
         Assert.False (label.CanFocus);
         Assert.False (label.HasFocus);
@@ -124,7 +124,7 @@ public class CanFocusTests
         Assert.True (label.HasFocus);
         Assert.False (view.HasFocus);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState ();
     }
 }

Tests/UnitTests/View/Navigation/NavigationTests.cs

@@ -27,7 +27,7 @@ public class NavigationTests (ITestOutputHelper output) : TestsAllViews
         }
 
         Toplevel top = new ();
-        Application.Top = top;
+        Application.Current = top;
         Application.Navigation = new ();
 
         View otherView = new ()
@@ -118,7 +118,7 @@ public class NavigationTests (ITestOutputHelper output) : TestsAllViews
         }
 
         Toplevel top = new ();
-        Application.Top = top;
+        Application.Current = top;
         Application.Navigation = new ();
 
         View otherView = new ()
@@ -150,8 +150,8 @@ public class NavigationTests (ITestOutputHelper output) : TestsAllViews
         // Ensure the view is Visible
         view.Visible = true;
 
-        Application.Top.SetFocus ();
-        Assert.True (Application.Top!.HasFocus);
+        Application.Current.SetFocus ();
+        Assert.True (Application.Current!.HasFocus);
         Assert.True (top.HasFocus);
 
         // Start with the focus on our test view
@@ -282,7 +282,7 @@ public class NavigationTests (ITestOutputHelper output) : TestsAllViews
 
         Toplevel top = new ();
 
-        Application.Top = top;
+        Application.Current = top;
         Application.Navigation = new ();
 
         View otherView = new ()

Tests/UnitTests/View/TextTests.cs

@@ -394,7 +394,7 @@ Y
         Assert.Equal (new (1, 5), view.TextFormatter.ConstrainToSize);
         Assert.Equal (new () { "Views" }, view.TextFormatter.GetLines ());
         Assert.Equal (new (0, 0, 4, 10), win.Frame);
-        Assert.Equal (new (0, 0, 4, 10), Application.Top.Frame);
+        Assert.Equal (new (0, 0, 4, 10), Application.Current.Frame);
 
         var expected = @"
 ┌──┐

Tests/UnitTests/View/ViewCommandTests.cs

@@ -46,9 +46,9 @@ public class ViewCommandTests
 
         w.LayoutSubViews ();
 
-        Application.Top = w;
-        Application.TopLevels.Push (w);
-        Assert.Same (Application.Top, w);
+        Application.Current = w;
+        Application.SessionStack.Push (w);
+        Assert.Same (Application.Current, w);
 
         // Click button 2
         Rectangle btn2Frame = btnB.FrameToScreen ();
@@ -121,9 +121,9 @@ public class ViewCommandTests
 
         w.Add (btn);
 
-        Application.Top = w;
-        Application.TopLevels.Push (w);
-        Assert.Same (Application.Top, w);
+        Application.Current = w;
+        Application.SessionStack.Push (w);
+        Assert.Same (Application.Current, w);
 
         w.LayoutSubViews ();
 

Tests/UnitTests/View/Viewport/ViewportSettings.TransparentMouseTests.cs

@@ -23,7 +23,7 @@ public class TransparentMouseTests
         {
             Id = "top",
         };
-        Application.Top = top;
+        Application.Current = top;
 
         var underlying = new MouseTrackingView { Id = "underlying", X = 0, Y = 0, Width = 10, Height = 10 };
         var overlay = new MouseTrackingView { Id = "overlay", X = 0, Y = 0, Width = 10, Height = 10, ViewportSettings = ViewportSettingsFlags.TransparentMouse };
@@ -56,7 +56,7 @@ public class TransparentMouseTests
     {
         // Arrange
         var top = new Toplevel ();
-        Application.Top = top;
+        Application.Current = top;
 
         var underlying = new MouseTrackingView { X = 0, Y = 0, Width = 10, Height = 10 };
         var overlay = new MouseTrackingView { X = 0, Y = 0, Width = 10, Height = 10, ViewportSettings = ViewportSettingsFlags.None };
@@ -90,7 +90,7 @@ public class TransparentMouseTests
     {
         // Arrange
         var top = new Toplevel ();
-        Application.Top = top;
+        Application.Current = top;
 
         var underlying = new MouseTrackingView { X = 0, Y = 0, Width = 10, Height = 10, ViewportSettings = ViewportSettingsFlags.TransparentMouse };
         var overlay = new MouseTrackingView { X = 0, Y = 0, Width = 10, Height = 10, ViewportSettings = ViewportSettingsFlags.TransparentMouse };

Tests/UnitTests/Views/AppendAutocompleteTests.cs

@@ -30,12 +30,12 @@ public class AppendAutocompleteTests (ITestOutputHelper output)
         Assert.Equal ("f", tf.Text);
 
         // Still has focus though
-        Assert.Same (tf, Application.Top.Focused);
+        Assert.Same (tf, Application.Current.Focused);
 
         // But can tab away
         Application.RaiseKeyDownEvent ('\t');
-        Assert.NotSame (tf, Application.Top.Focused);
-        Application.Top.Dispose ();
+        Assert.NotSame (tf, Application.Current.Focused);
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -69,7 +69,7 @@ public class AppendAutocompleteTests (ITestOutputHelper output)
         tf.PositionCursor ();
         DriverAssert.AssertDriverContentsAre ("fish", output);
         Assert.Equal ("fi", tf.Text);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Theory]
@@ -107,7 +107,7 @@ public class AppendAutocompleteTests (ITestOutputHelper output)
         tf.PositionCursor ();
         DriverAssert.AssertDriverContentsAre ("fish", output);
         Assert.Equal ("f", tf.Text);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -133,7 +133,7 @@ public class AppendAutocompleteTests (ITestOutputHelper output)
         tf.Draw ();
         DriverAssert.AssertDriverContentsAre ("f", output);
         Assert.Equal ("f ", tf.Text);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -157,7 +157,7 @@ public class AppendAutocompleteTests (ITestOutputHelper output)
         tf.Draw ();
         DriverAssert.AssertDriverContentsAre ("fx", output);
         Assert.Equal ("fx", tf.Text);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -195,7 +195,7 @@ public class AppendAutocompleteTests (ITestOutputHelper output)
         tf.Draw ();
         DriverAssert.AssertDriverContentsAre ("my FISH", output);
         Assert.Equal ("my FISH", tf.Text);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -231,12 +231,12 @@ public class AppendAutocompleteTests (ITestOutputHelper output)
         Assert.Equal ("fish", tf.Text);
 
         // Tab should autcomplete but not move focus
-        Assert.Same (tf, Application.Top.Focused);
+        Assert.Same (tf, Application.Current.Focused);
 
         // Second tab should move focus (nothing to autocomplete)
         Application.RaiseKeyDownEvent ('\t');
-        Assert.NotSame (tf, Application.Top.Focused);
-        Application.Top.Dispose ();
+        Assert.NotSame (tf, Application.Current.Focused);
+        Application.Current.Dispose ();
     }
 
     [Theory]
@@ -256,7 +256,7 @@ public class AppendAutocompleteTests (ITestOutputHelper output)
         tf.PositionCursor ();
         DriverAssert.AssertDriverContentsAre (expectRender, output);
         Assert.Equal ("f", tf.Text);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     private TextField GetTextFieldsInView ()

Tests/UnitTests/Views/ButtonTests.cs

@@ -204,7 +204,7 @@ public class ButtonTests (ITestOutputHelper output)
         clicked = false;
 
         // Toplevel does not handle Enter, so it should get passed on to button
-        Assert.False (Application.Top.NewKeyDownEvent (Key.Enter));
+        Assert.False (Application.Current.NewKeyDownEvent (Key.Enter));
         Assert.True (clicked);
         clicked = false;
 

Tests/UnitTests/Views/CheckBoxTests.cs

@@ -16,11 +16,11 @@ public class CheckBoxTests (ITestOutputHelper output)
     public void Commands_Select ()
     {
         Application.Navigation = new ();
-        Application.Top = new ();
+        Application.Current = new ();
         View otherView = new () { CanFocus = true };
         var ckb = new CheckBox ();
-        Application.Top.Add (ckb, otherView);
-        Application.Top.SetFocus ();
+        Application.Current.Add (ckb, otherView);
+        Application.Current.SetFocus ();
         Assert.True (ckb.HasFocus);
 
         var checkedStateChangingCount = 0;
@@ -64,7 +64,7 @@ public class CheckBoxTests (ITestOutputHelper output)
         Assert.Equal (3, selectCount);
         Assert.Equal (1, acceptCount);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState ();
     }
 

Tests/UnitTests/Views/ColorPickerTests.cs

@@ -12,7 +12,7 @@ public class ColorPickerTests
 
         var otherView = new View { CanFocus = true };
 
-        Application.Top?.Add (otherView); // thi sets focus to otherView
+        Application.Current?.Add (otherView); // thi sets focus to otherView
         Assert.True (otherView.HasFocus);
 
         cp.SetFocus ();
@@ -774,11 +774,11 @@ public class ColorPickerTests
 
         Application.Navigation = new ();
 
-        Application.Top = new () { Width = 20, Height = 5 };
-        Application.Top.Add (cp);
+        Application.Current = new () { Width = 20, Height = 5 };
+        Application.Current.Add (cp);
 
-        Application.Top.LayoutSubViews ();
-        Application.Top.SetFocus ();
+        Application.Current.LayoutSubViews ();
+        Application.Current.SetFocus ();
 
         return cp;
     }

Tests/UnitTests/Views/ComboBoxTests.cs

@@ -1016,7 +1016,7 @@ Three
         Application.Navigation = new ();
         var cb = new ComboBox ();
         var top = new Toplevel ();
-        Application.Top = top;
+        Application.Current = top;
 
         top.Add (cb);
         top.FocusDeepest (NavigationDirection.Forward, null);
@@ -1055,7 +1055,7 @@ Three
         Assert.Equal (-1, cb.SelectedItem);
         Assert.Equal ("", cb.Text);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 }

Tests/UnitTests/Views/HexViewTests.cs

@@ -33,9 +33,9 @@ public class HexViewTests
     {
         var hv = new HexView (LoadStream (null, out _, true)) { Width = 20, Height = 20 };
         Application.Navigation = new ApplicationNavigation ();
-        Application.Top = new Toplevel ();
-        Application.Top.Add (hv);
-        Application.Top.SetFocus ();
+        Application.Current = new Toplevel ();
+        Application.Current.Add (hv);
+        Application.Current.SetFocus ();
 
         // Needed because HexView relies on LayoutComplete to calc sizes
         hv.LayoutSubViews ();
@@ -70,7 +70,7 @@ public class HexViewTests
         Assert.Empty (hv.Edits);
         Assert.Equal (127, hv.Source.Length);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
 
     }
@@ -79,7 +79,7 @@ public class HexViewTests
     public void ApplyEdits_With_Argument ()
     {
         Application.Navigation = new ApplicationNavigation ();
-        Application.Top = new Toplevel ();
+        Application.Current = new Toplevel ();
 
         byte [] buffer = Encoding.Default.GetBytes ("Fest");
         var original = new MemoryStream ();
@@ -90,8 +90,8 @@ public class HexViewTests
         original.CopyTo (copy);
         copy.Flush ();
         var hv = new HexView (copy) { Width = Dim.Fill (), Height = Dim.Fill () };
-        Application.Top.Add (hv);
-        Application.Top.SetFocus ();
+        Application.Current.Add (hv);
+        Application.Current.SetFocus ();
 
         // Needed because HexView relies on LayoutComplete to calc sizes
         hv.LayoutSubViews ();
@@ -122,7 +122,7 @@ public class HexViewTests
         Assert.Equal ("Zest", Encoding.Default.GetString (readBuffer));
         Assert.Equal (Encoding.Default.GetString (buffer), Encoding.Default.GetString (readBuffer));
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -148,10 +148,10 @@ public class HexViewTests
         Application.Navigation = new ApplicationNavigation ();
 
         var hv = new HexView (LoadStream (null, out _)) { Width = 100, Height = 100 };
-        Application.Top = new Toplevel ();
-        Application.Top.Add (hv);
+        Application.Current = new Toplevel ();
+        Application.Current.Add (hv);
 
-        Application.Top.LayoutSubViews ();
+        Application.Current.LayoutSubViews ();
 
         Assert.Equal (63, hv.Source!.Length);
         Assert.Equal (20, hv.BytesPerLine);
@@ -176,7 +176,7 @@ public class HexViewTests
         Assert.Equal (new (3, 3), hv.GetPosition (hv.Address));
 
         Assert.Equal (hv.Source!.Length, hv.Address);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -186,8 +186,8 @@ public class HexViewTests
         Application.Navigation = new ApplicationNavigation ();
 
         var hv = new HexView (LoadStream (null, out _, unicode: true)) { Width = 100, Height = 100 };
-        Application.Top = new Toplevel ();
-        Application.Top.Add (hv);
+        Application.Current = new Toplevel ();
+        Application.Current.Add (hv);
 
         hv.LayoutSubViews ();
 
@@ -213,7 +213,7 @@ public class HexViewTests
         Assert.Equal (new (6, 6), hv.GetPosition (hv.Address));
 
         Assert.Equal (hv.Source!.Length, hv.Address);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -266,9 +266,9 @@ public class HexViewTests
     public void KeyBindings_Test_Movement_LeftSide ()
     {
         Application.Navigation = new ApplicationNavigation ();
-        Application.Top = new Toplevel ();
+        Application.Current = new Toplevel ();
         var hv = new HexView (LoadStream (null, out _)) { Width = 20, Height = 10 };
-        Application.Top.Add (hv);
+        Application.Current.Add (hv);
 
         hv.LayoutSubViews ();
 
@@ -314,7 +314,7 @@ public class HexViewTests
 
         Assert.True (Application.RaiseKeyDownEvent (Key.CursorUp.WithCtrl));
         Assert.Equal (0, hv.Address);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -322,10 +322,10 @@ public class HexViewTests
     public void PositionChanged_Event ()
     {
         var hv = new HexView (LoadStream (null, out _)) { Width = 20, Height = 10 };
-        Application.Top = new Toplevel ();
-        Application.Top.Add (hv);
+        Application.Current = new Toplevel ();
+        Application.Current.Add (hv);
 
-        Application.Top.LayoutSubViews ();
+        Application.Current.LayoutSubViews ();
 
         HexViewEventArgs hexViewEventArgs = null!;
         hv.PositionChanged += (s, e) => hexViewEventArgs = e;
@@ -339,7 +339,7 @@ public class HexViewTests
         Assert.Equal (4, hexViewEventArgs.BytesPerLine);
         Assert.Equal (new (1, 1), hexViewEventArgs.Position);
         Assert.Equal (5, hexViewEventArgs.Address);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -347,32 +347,32 @@ public class HexViewTests
     public void Source_Sets_Address_To_Zero_If_Greater_Than_Source_Length ()
     {
         var hv = new HexView (LoadStream (null, out _)) { Width = 10, Height = 5 };
-        Application.Top = new Toplevel ();
-        Application.Top.Add (hv);
+        Application.Current = new Toplevel ();
+        Application.Current.Add (hv);
 
-        Application.Top.Layout ();
+        Application.Current.Layout ();
 
         Assert.True (hv.NewKeyDownEvent (Key.End));
         Assert.Equal (MEM_STRING_LENGTH, hv.Address);
 
         hv.Source = new MemoryStream ();
-        Application.Top.Layout ();
+        Application.Current.Layout ();
         Assert.Equal (0, hv.Address);
 
         hv.Source = LoadStream (null, out _);
         hv.Width = Dim.Fill ();
         hv.Height = Dim.Fill ();
-        Application.Top.Layout ();
+        Application.Current.Layout ();
         Assert.Equal (0, hv.Address);
 
         Assert.True (hv.NewKeyDownEvent (Key.End));
         Assert.Equal (MEM_STRING_LENGTH, hv.Address);
 
         hv.Source = new MemoryStream ();
-        Application.Top.Layout ();
+        Application.Current.Layout ();
         Assert.Equal (0, hv.Address);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 

Tests/UnitTests/Views/LabelTests.cs

@@ -1071,7 +1071,7 @@ e
         Assert.Equal (new (5, 1), label.TextFormatter.ConstrainToSize);
         Assert.Equal (["Label"], label.TextFormatter.GetLines ());
         Assert.Equal (new (0, 0, 10, 4), win.Frame);
-        Assert.Equal (new (0, 0, 10, 4), Application.Top.Frame);
+        Assert.Equal (new (0, 0, 10, 4), Application.Current.Frame);
 
         var expected = @"
 ┌────────┐
@@ -1130,7 +1130,7 @@ e
         Assert.Equal (new (5, 1), label.TextFormatter.ConstrainToSize);
         Assert.Equal (["Label"], label.TextFormatter.GetLines ());
         Assert.Equal (new (0, 0, 10, 4), win.Frame);
-        Assert.Equal (new (0, 0, 10, 4), Application.Top.Frame);
+        Assert.Equal (new (0, 0, 10, 4), Application.Current.Frame);
 
         var expected = @"
 ┌────────┐
@@ -1203,10 +1203,10 @@ e
             CanFocus = true
         };
         Application.Navigation = new ();
-        Application.Top = new ();
-        Application.Top.Add (otherView, label, nextView);
+        Application.Current = new ();
+        Application.Current.Add (otherView, label, nextView);
 
-        Application.Top.SetFocus ();
+        Application.Current.SetFocus ();
         Assert.True (otherView.HasFocus);
 
         Assert.True (Application.RaiseKeyDownEvent (label.HotKey));
@@ -1214,7 +1214,7 @@ e
         Assert.False (label.HasFocus);
         Assert.True (nextView.HasFocus);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState ();
     }
 
@@ -1225,18 +1225,18 @@ e
         Label label = new () { X = 0, Y = 1, Text = "_label" };
         View nextView = new () { X = Pos.Right (label), Y = Pos.Top (label), Width = 1, Height = 1, Id = "nextView", CanFocus = true };
         Application.Navigation = new ();
-        Application.Top = new ();
-        Application.Top.Add (otherView, label, nextView);
-        Application.Top.Layout ();
+        Application.Current = new ();
+        Application.Current.Add (otherView, label, nextView);
+        Application.Current.Layout ();
 
-        Application.Top.SetFocus ();
+        Application.Current.SetFocus ();
 
         // click on label
         Application.RaiseMouseEvent (new () { ScreenPosition = label.Frame.Location, Flags = MouseFlags.Button1Clicked });
         Assert.False (label.HasFocus);
         Assert.True (nextView.HasFocus);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState ();
     }
 
@@ -1255,8 +1255,8 @@ e
             CanFocus = true
         };
         Application.Navigation = new ();
-        Application.Top = new ();
-        Application.Top.Add (label, view);
+        Application.Current = new ();
+        Application.Current.Add (label, view);
 
         view.SetFocus ();
         Assert.True (label.CanFocus);
@@ -1269,7 +1269,7 @@ e
         Assert.True (label.HasFocus);
         Assert.False (view.HasFocus);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState ();
     }
 
@@ -1296,14 +1296,14 @@ e
             CanFocus = true
         };
 
-        Application.Top = new ()
+        Application.Current = new ()
         {
             Width = 10,
             Height = 10
         };
-        Application.Top.Add (label, otherView);
-        Application.Top.SetFocus ();
-        Application.Top.Layout ();
+        Application.Current.Add (label, otherView);
+        Application.Current.SetFocus ();
+        Application.Current.Layout ();
 
         Assert.True (label.CanFocus);
         Assert.True (label.HasFocus);
@@ -1323,7 +1323,7 @@ e
         Assert.False (label.HasFocus);
         Assert.True (otherView.HasFocus);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState ();
     }
 

Tests/UnitTests/Views/Menuv1/MenuBarv1Tests.cs

@@ -1100,11 +1100,11 @@ wo
         Assert.False (copyAction);
 
 #if SUPPORT_ALT_TO_ACTIVATE_MENU
-        Assert.False (Application.Top.ProcessKeyDown (new KeyEventArgs (Key.AltMask)));
-        Assert.False (Application.Top.ProcessKeyDown (new KeyEventArgs (Key.AltMask)));
-        Assert.True (Application.Top.ProcessKeyUp (new KeyEventArgs (Key.AltMask)));
+        Assert.False (Application.Current.ProcessKeyDown (new KeyEventArgs (Key.AltMask)));
+        Assert.False (Application.Current.ProcessKeyDown (new KeyEventArgs (Key.AltMask)));
+        Assert.True (Application.Current.ProcessKeyUp (new KeyEventArgs (Key.AltMask)));
         Assert.True (menu.IsMenuOpen);
-        Application.Top.Draw ();
+        Application.Current.Draw ();
 
         string expected = @"
  File  Edit
@@ -1113,26 +1113,26 @@ wo
         var pos = DriverAsserts.AssertDriverContentsWithFrameAre (expected, output);
         Assert.Equal (new (1, 0, 11, 1), pos);
 
-        Assert.True (Application.Top.ProcessKeyDown (new KeyEventArgs (Key.N)));
+        Assert.True (Application.Current.ProcessKeyDown (new KeyEventArgs (Key.N)));
         AutoInitShutdownAttribute.RunIteration ();
         Assert.False (newAction); // not yet, hot keys don't work if the item is not visible
 
-        Assert.True (Application.Top.ProcessKeyDown (new KeyEventArgs (Key.F)));
+        Assert.True (Application.Current.ProcessKeyDown (new KeyEventArgs (Key.F)));
         AutoInitShutdownAttribute.RunIteration ();
-        Assert.True (Application.Top.ProcessKeyDown (new KeyEventArgs (Key.N)));
+        Assert.True (Application.Current.ProcessKeyDown (new KeyEventArgs (Key.N)));
         AutoInitShutdownAttribute.RunIteration ();
         Assert.True (newAction);
-        Application.Top.Draw ();
+        Application.Current.Draw ();
 
         expected = @"
  File  Edit
 ";
 
-        Assert.False (Application.Top.ProcessKeyDown (new KeyEventArgs (Key.AltMask)));
-        Assert.True (Application.Top.ProcessKeyUp (new KeyEventArgs (Key.AltMask)));
-        Assert.True (Application.Top.ProcessKeyUp (new KeyEventArgs (Key.AltMask)));
+        Assert.False (Application.Current.ProcessKeyDown (new KeyEventArgs (Key.AltMask)));
+        Assert.True (Application.Current.ProcessKeyUp (new KeyEventArgs (Key.AltMask)));
+        Assert.True (Application.Current.ProcessKeyUp (new KeyEventArgs (Key.AltMask)));
         Assert.True (menu.IsMenuOpen);
-        Application.Top.Draw ();
+        Application.Current.Draw ();
 
         expected = @"
  File  Edit
@@ -1141,8 +1141,8 @@ wo
         pos = DriverAsserts.AssertDriverContentsWithFrameAre (expected, output);
         Assert.Equal (new (1, 0, 11, 1), pos);
 
-        Assert.True (Application.Top.ProcessKeyDown (new KeyEventArgs (Key.CursorRight)));
-        Assert.True (Application.Top.ProcessKeyDown (new KeyEventArgs (Key.C)));
+        Assert.True (Application.Current.ProcessKeyDown (new KeyEventArgs (Key.CursorRight)));
+        Assert.True (Application.Current.ProcessKeyDown (new KeyEventArgs (Key.C)));
         AutoInitShutdownAttribute.RunIteration ();
         Assert.True (copyAction);
 #endif
@@ -1211,19 +1211,19 @@ wo
 
         Assert.True (menu.NewKeyDownEvent (Key.F.WithAlt));
         Assert.True (menu.IsMenuOpen);
-        Application.Top.Draw ();
+        Application.Current.Draw ();
         DriverAssert.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (0), output);
 
-        Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.N));
+        Assert.True (Application.Current.SubViews.ElementAt (1).NewKeyDownEvent (Key.N));
         AutoInitShutdownAttribute.RunIteration ();
         Assert.True (newAction);
 
         Assert.True (menu.NewKeyDownEvent (Key.E.WithAlt));
         Assert.True (menu.IsMenuOpen);
-        Application.Top.Draw ();
+        Application.Current.Draw ();
         DriverAssert.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (1), output);
 
-        Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.C));
+        Assert.True (Application.Current.SubViews.ElementAt (1).NewKeyDownEvent (Key.C));
         AutoInitShutdownAttribute.RunIteration ();
         Assert.True (copyAction);
         top.Dispose ();
@@ -1945,7 +1945,7 @@ wo
 
         Application.AddTimeout (TimeSpan.Zero, () =>
                                                        {
-                                                           Toplevel top = Application.Top;
+                                                           Toplevel top = Application.Current;
 
                                                            AutoInitShutdownAttribute.RunIteration ();
 
@@ -2090,7 +2090,7 @@ wo
         DriverAssert.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (0), output);
 
         // Open second
-        Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.CursorRight));
+        Assert.True (Application.Current.SubViews.ElementAt (1).NewKeyDownEvent (Key.CursorRight));
         Assert.True (menu.IsMenuOpen);
         View.SetClipToScreen ();
         top.Draw ();
@@ -2141,7 +2141,7 @@ wo
         Assert.True (top.SubViews.ElementAt (1).NewKeyDownEvent (Key.CursorRight));
         Assert.True (menu.IsMenuOpen);
         View.SetClipToScreen ();
-        Application.Top.Draw ();
+        Application.Current.Draw ();
         DriverAssert.AssertDriverContentsAre (expectedMenu.ExpectedSubMenuOpen (1), output);
 
         // Close menu
@@ -3075,7 +3075,7 @@ Edit
 
         pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
 
-        Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.CursorDown));
+        Assert.True (Application.Current.SubViews.ElementAt (1).NewKeyDownEvent (Key.CursorDown));
         top.Draw ();
 
         expected = @"
@@ -3090,7 +3090,7 @@ Edit
 
         pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
 
-        Assert.True (Application.Top.SubViews.ElementAt (2).NewKeyDownEvent (Key.CursorLeft));
+        Assert.True (Application.Current.SubViews.ElementAt (2).NewKeyDownEvent (Key.CursorLeft));
         top.Draw ();
 
         expected = @"
@@ -3104,7 +3104,7 @@ Edit
 
         pos = DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
 
-        Assert.True (Application.Top.SubViews.ElementAt (1).NewKeyDownEvent (Key.Esc));
+        Assert.True (Application.Current.SubViews.ElementAt (1).NewKeyDownEvent (Key.Esc));
         top.Draw ();
 
         expected = @"
@@ -3186,7 +3186,7 @@ Edit
         menu.NewMouseEvent (
                             new ()
                             {
-                                Position = new (1, 2), Flags = MouseFlags.ReportMousePosition, View = Application.Top.SubViews.ElementAt (1)
+                                Position = new (1, 2), Flags = MouseFlags.ReportMousePosition, View = Application.Current.SubViews.ElementAt (1)
                             }
                            );
         top.Draw ();
@@ -3208,7 +3208,7 @@ Edit
                       menu.NewMouseEvent (
                                           new ()
                                           {
-                                              Position = new (1, 1), Flags = MouseFlags.ReportMousePosition, View = Application.Top.SubViews.ElementAt (1)
+                                              Position = new (1, 1), Flags = MouseFlags.ReportMousePosition, View = Application.Current.SubViews.ElementAt (1)
                                           }
                                          )
                      );
@@ -3227,7 +3227,7 @@ Edit
         Assert.Equal (new (1, 0, 10, 6), pos);
 
         menu.NewMouseEvent (
-                            new () { Position = new (70, 2), Flags = MouseFlags.Button1Clicked, View = Application.Top }
+                            new () { Position = new (70, 2), Flags = MouseFlags.Button1Clicked, View = Application.Current }
                            );
         top.Draw ();
 

Tests/UnitTests/Views/ShortcutTests.cs

@@ -23,7 +23,7 @@ public class ShortcutTests
     [InlineData (9, 0)]
     public void MouseClick_Raises_Accepted (int x, int expectedAccepted)
     {
-        Application.Top = new ();
+        Application.Current = new ();
 
         var shortcut = new Shortcut
         {
@@ -31,8 +31,8 @@ public class ShortcutTests
             Text = "0",
             Title = "C"
         };
-        Application.Top.Add (shortcut);
-        Application.Top.Layout ();
+        Application.Current.Add (shortcut);
+        Application.Current.Layout ();
 
         var accepted = 0;
         shortcut.Accepting += (s, e) => accepted++;
@@ -46,7 +46,7 @@ public class ShortcutTests
 
         Assert.Equal (expectedAccepted, accepted);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -74,7 +74,7 @@ public class ShortcutTests
         int expectedShortcutSelected
     )
     {
-        Application.Top = new ();
+        Application.Current = new ();
 
         var shortcut = new Shortcut
         {
@@ -93,9 +93,9 @@ public class ShortcutTests
         var shortcutSelectCount = 0;
         shortcut.Selecting += (s, e) => { shortcutSelectCount++; };
 
-        Application.Top.Add (shortcut);
-        Application.Top.SetRelativeLayout (new (100, 100));
-        Application.Top.LayoutSubViews ();
+        Application.Current.Add (shortcut);
+        Application.Current.SetRelativeLayout (new (100, 100));
+        Application.Current.LayoutSubViews ();
 
         Application.RaiseMouseEvent (
                                   new ()
@@ -109,7 +109,7 @@ public class ShortcutTests
         Assert.Equal (expectedCommandViewAccepted, commandViewAcceptCount);
         Assert.Equal (expectedCommandViewSelected, commandViewSelectCount);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -130,7 +130,7 @@ public class ShortcutTests
     [InlineData (9, 0, 0)]
     public void MouseClick_Button_CommandView_Raises_Shortcut_Accepted (int mouseX, int expectedAccept, int expectedButtonAccept)
     {
-        Application.Top = new ();
+        Application.Current = new ();
 
         var shortcut = new Shortcut
         {
@@ -147,9 +147,9 @@ public class ShortcutTests
         };
         var buttonAccepted = 0;
         shortcut.CommandView.Accepting += (s, e) => { buttonAccepted++; };
-        Application.Top.Add (shortcut);
-        Application.Top.SetRelativeLayout (new (100, 100));
-        Application.Top.LayoutSubViews ();
+        Application.Current.Add (shortcut);
+        Application.Current.SetRelativeLayout (new (100, 100));
+        Application.Current.LayoutSubViews ();
 
         var accepted = 0;
         shortcut.Accepting += (s, e) => { accepted++; };
@@ -164,7 +164,7 @@ public class ShortcutTests
         Assert.Equal (expectedAccept, accepted);
         Assert.Equal (expectedButtonAccept, buttonAccepted);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -186,7 +186,7 @@ public class ShortcutTests
     [InlineData (10, 1, 0)]
     public void MouseClick_CheckBox_CommandView_Raises_Shortcut_Accepted_Selected_Correctly (int mouseX, int expectedAccepted, int expectedCheckboxAccepted)
     {
-        Application.Top = new ();
+        Application.Current = new ();
 
         var shortcut = new Shortcut
         {
@@ -212,9 +212,9 @@ public class ShortcutTests
                                              checkboxSelected++;
                                          };
 
-        Application.Top.Add (shortcut);
-        Application.Top.SetRelativeLayout (new (100, 100));
-        Application.Top.LayoutSubViews ();
+        Application.Current.Add (shortcut);
+        Application.Current.SetRelativeLayout (new (100, 100));
+        Application.Current.LayoutSubViews ();
 
         var selected = 0;
         shortcut.Selecting += (s, e) =>
@@ -241,7 +241,7 @@ public class ShortcutTests
         Assert.Equal (expectedCheckboxAccepted, checkboxAccepted);
         Assert.Equal (expectedCheckboxAccepted, checkboxSelected);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -260,7 +260,7 @@ public class ShortcutTests
     [InlineData (false, KeyCode.F1, 0, 0)]
     public void KeyDown_Raises_Accepted_Selected (bool canFocus, KeyCode key, int expectedAccept, int expectedSelect)
     {
-        Application.Top = new ();
+        Application.Current = new ();
 
         var shortcut = new Shortcut
         {
@@ -269,7 +269,7 @@ public class ShortcutTests
             Title = "_C",
             CanFocus = canFocus
         };
-        Application.Top.Add (shortcut);
+        Application.Current.Add (shortcut);
         shortcut.SetFocus ();
 
         Assert.Equal (canFocus, shortcut.HasFocus);
@@ -285,7 +285,7 @@ public class ShortcutTests
         Assert.Equal (expectedAccept, accepted);
         Assert.Equal (expectedSelect, selected);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -305,7 +305,7 @@ public class ShortcutTests
     [InlineData (false, KeyCode.F1, 0, 0)]
     public void KeyDown_CheckBox_Raises_Accepted_Selected (bool canFocus, KeyCode key, int expectedAccept, int expectedSelect)
     {
-        Application.Top = new ();
+        Application.Current = new ();
 
         var shortcut = new Shortcut
         {
@@ -317,7 +317,7 @@ public class ShortcutTests
             },
             CanFocus = canFocus
         };
-        Application.Top.Add (shortcut);
+        Application.Current.Add (shortcut);
         shortcut.SetFocus ();
 
         Assert.Equal (canFocus, shortcut.HasFocus);
@@ -337,7 +337,7 @@ public class ShortcutTests
         Assert.Equal (expectedAccept, accepted);
         Assert.Equal (expectedSelect, selected);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
     [Theory]
@@ -349,7 +349,7 @@ public class ShortcutTests
     [InlineData (KeyCode.F1, 0)]
     public void KeyDown_App_Scope_Invokes_Accept (KeyCode key, int expectedAccept)
     {
-        Application.Top = new ();
+        Application.Current = new ();
 
         var shortcut = new Shortcut
         {
@@ -358,8 +358,8 @@ public class ShortcutTests
             Text = "0",
             Title = "_C"
         };
-        Application.Top.Add (shortcut);
-        Application.Top.SetFocus ();
+        Application.Current.Add (shortcut);
+        Application.Current.SetFocus ();
 
         var accepted = 0;
         shortcut.Accepting += (s, e) => accepted++;
@@ -368,7 +368,7 @@ public class ShortcutTests
 
         Assert.Equal (expectedAccept, accepted);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -427,7 +427,7 @@ public class ShortcutTests
     [InlineData (false, KeyCode.F1, 0)]
     public void KeyDown_App_Scope_Invokes_Action (bool canFocus, KeyCode key, int expectedAction)
     {
-        Application.Top = new ();
+        Application.Current = new ();
 
         var shortcut = new Shortcut
         {
@@ -438,8 +438,8 @@ public class ShortcutTests
             CanFocus = canFocus
         };
 
-        Application.Top.Add (shortcut);
-        Application.Top.SetFocus ();
+        Application.Current.Add (shortcut);
+        Application.Current.SetFocus ();
 
         var action = 0;
         shortcut.Action += () => action++;
@@ -448,7 +448,7 @@ public class ShortcutTests
 
         Assert.Equal (expectedAction, action);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState (true);
     }
 
@@ -456,11 +456,11 @@ public class ShortcutTests
     [Fact]
     public void Scheme_SetScheme_Does_Not_Fault_3664 ()
     {
-        Application.Top = new ();
+        Application.Current = new ();
         Application.Navigation = new ();
         var shortcut = new Shortcut ();
 
-        Application.Top.SetScheme (null);
+        Application.Current.SetScheme (null);
 
         Assert.False (shortcut.HasScheme);
         Assert.NotNull (shortcut.GetScheme ());
@@ -470,7 +470,7 @@ public class ShortcutTests
         Assert.False (shortcut.HasScheme);
         Assert.NotNull (shortcut.GetScheme ());
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
         Application.ResetState ();
     }
 }

Tests/UnitTests/Views/SpinnerViewTests.cs

@@ -40,7 +40,7 @@ public class SpinnerViewTests (ITestOutputHelper output)
         // Dispose clears timeout
         view.Dispose ();
         Assert.Empty (Application.TimedEvents.Timeouts);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -62,7 +62,7 @@ public class SpinnerViewTests (ITestOutputHelper output)
 
         expected = "/";
         DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -95,7 +95,7 @@ public class SpinnerViewTests (ITestOutputHelper output)
 
         //expected = "|";
         //DriverAsserts.AssertDriverContentsWithFrameAre (expected, output);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     private SpinnerView GetSpinnerView ()

Tests/UnitTests/Views/TableViewTests.cs

@@ -3234,19 +3234,19 @@ A B C
 
         // Pressing left should move us to the first column without changing focus
         Application.RaiseKeyDownEvent (Key.CursorLeft);
-        Assert.Same (tableView, Application.Top!.MostFocused);
+        Assert.Same (tableView, Application.Current!.MostFocused);
         Assert.True (tableView.HasFocus);
 
         // Because we are now on the leftmost cell a further left press should move focus
         Application.RaiseKeyDownEvent (Key.CursorLeft);
 
-        Assert.NotSame (tableView, Application.Top.MostFocused);
+        Assert.NotSame (tableView, Application.Current.MostFocused);
         Assert.False (tableView.HasFocus);
 
-        Assert.Same (tf1, Application.Top.MostFocused);
+        Assert.Same (tf1, Application.Current.MostFocused);
         Assert.True (tf1.HasFocus);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -3259,19 +3259,19 @@ A B C
 
         // First press should move us up
         Application.RaiseKeyDownEvent (Key.CursorUp);
-        Assert.Same (tableView, Application.Top!.MostFocused);
+        Assert.Same (tableView, Application.Current!.MostFocused);
         Assert.True (tableView.HasFocus);
 
         // Because we are now on the top row a further press should move focus
         Application.RaiseKeyDownEvent (Key.CursorUp);
 
-        Assert.NotSame (tableView, Application.Top.MostFocused);
+        Assert.NotSame (tableView, Application.Current.MostFocused);
         Assert.False (tableView.HasFocus);
 
-        Assert.Same (tf1, Application.Top.MostFocused);
+        Assert.Same (tf1, Application.Current.MostFocused);
         Assert.True (tf1.HasFocus);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -3284,19 +3284,19 @@ A B C
 
         // First press should move us to the rightmost column without changing focus
         Application.RaiseKeyDownEvent (Key.CursorRight);
-        Assert.Same (tableView, Application.Top!.MostFocused);
+        Assert.Same (tableView, Application.Current!.MostFocused);
         Assert.True (tableView.HasFocus);
 
         // Because we are now on the rightmost cell, a further right press should move focus
         Application.RaiseKeyDownEvent (Key.CursorRight);
 
-        Assert.NotSame (tableView, Application.Top.MostFocused);
+        Assert.NotSame (tableView, Application.Current.MostFocused);
         Assert.False (tableView.HasFocus);
 
-        Assert.Same (tf2, Application.Top.MostFocused);
+        Assert.Same (tf2, Application.Current.MostFocused);
         Assert.True (tf2.HasFocus);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -3309,19 +3309,19 @@ A B C
 
         // First press should move us to the bottommost row without changing focus
         Application.RaiseKeyDownEvent (Key.CursorDown);
-        Assert.Same (tableView, Application.Top!.MostFocused);
+        Assert.Same (tableView, Application.Current!.MostFocused);
         Assert.True (tableView.HasFocus);
 
         // Because we are now on the bottommost cell, a further down press should move focus
         Application.RaiseKeyDownEvent (Key.CursorDown);
 
-        Assert.NotSame (tableView, Application.Top.MostFocused);
+        Assert.NotSame (tableView, Application.Current.MostFocused);
         Assert.False (tableView.HasFocus);
 
-        Assert.Same (tf2, Application.Top.MostFocused);
+        Assert.Same (tf2, Application.Current.MostFocused);
         Assert.True (tf2.HasFocus);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -3334,7 +3334,7 @@ A B C
 
         // Pressing shift-left should give us a multi selection
         Application.RaiseKeyDownEvent (Key.CursorLeft.WithShift);
-        Assert.Same (tableView, Application.Top!.MostFocused);
+        Assert.Same (tableView, Application.Current!.MostFocused);
         Assert.True (tableView.HasFocus);
         Assert.Equal (2, tableView.GetAllSelectedCells ().Count ());
 
@@ -3345,19 +3345,19 @@ A B C
 
         // Selection 'clears' just to the single cell and we remain focused
         Assert.Single (tableView.GetAllSelectedCells ());
-        Assert.Same (tableView, Application.Top.MostFocused);
+        Assert.Same (tableView, Application.Current.MostFocused);
         Assert.True (tableView.HasFocus);
 
         // A further left will switch focus
         Application.RaiseKeyDownEvent (Key.CursorLeft);
 
-        Assert.NotSame (tableView, Application.Top.MostFocused);
+        Assert.NotSame (tableView, Application.Current.MostFocused);
         Assert.False (tableView.HasFocus);
 
-        Assert.Same (tf1, Application.Top.MostFocused);
+        Assert.Same (tf1, Application.Current.MostFocused);
         Assert.True (tf1.HasFocus);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Theory]
@@ -3398,16 +3398,16 @@ A B C
         tableView.EndInit ();
 
         Application.Navigation = new ();
-        Application.Top = new ();
+        Application.Current = new ();
         tf1 = new ();
         tf2 = new ();
-        Application.Top.Add (tf1);
-        Application.Top.Add (tableView);
-        Application.Top.Add (tf2);
+        Application.Current.Add (tf1);
+        Application.Current.Add (tableView);
+        Application.Current.Add (tf2);
 
         tableView.SetFocus ();
 
-        Assert.Same (tableView, Application.Top.MostFocused);
+        Assert.Same (tableView, Application.Current.MostFocused);
         Assert.True (tableView.HasFocus);
 
         // Set big table

Tests/UnitTests/Views/TextFieldTests.cs

@@ -84,7 +84,7 @@ public class TextFieldTests (ITestOutputHelper output)
 
         tf.Draw ();
         DriverAssert.AssertDriverContentsAre (expectedRender, output);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -104,7 +104,7 @@ public class TextFieldTests (ITestOutputHelper output)
 
         tf.Draw ();
         DriverAssert.AssertDriverContentsAre ("Misérables", output);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Theory (Skip = "Broke with ContextMenuv2")]
@@ -132,7 +132,7 @@ public class TextFieldTests (ITestOutputHelper output)
         View.SetClipToScreen ();
         tf.Draw ();
         DriverAssert.AssertDriverContentsAre (content, output);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -157,7 +157,7 @@ public class TextFieldTests (ITestOutputHelper output)
         View.SetClipToScreen ();
         tf.Draw ();
         DriverAssert.AssertDriverContentsAre ("Enter txt", output);
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -187,7 +187,7 @@ public class TextFieldTests (ITestOutputHelper output)
         // All characters in "Enter text" should have the caption attribute
         DriverAssert.AssertDriverAttributesAre ("0000000000", output, Application.Driver, captionAttr);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -221,7 +221,7 @@ public class TextFieldTests (ITestOutputHelper output)
         // F is underlined (index 1), remaining characters use normal caption attribute (index 0)
         DriverAssert.AssertDriverAttributesAre ("1000", output, Application.Driver, captionAttr, hotkeyAttr);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -255,7 +255,7 @@ public class TextFieldTests (ITestOutputHelper output)
         // "Enter " (6 chars) + "T" (underlined) + "ext" (3 chars)
         DriverAssert.AssertDriverAttributesAre ("0000001000", output, Application.Driver, captionAttr, hotkeyAttr);
 
-        Application.Top.Dispose ();
+        Application.Current.Dispose ();
     }
 
     [Fact]
@@ -1686,7 +1686,7 @@ Les Miśerables",
         {
             base.Before (methodUnderTest);
 
-            //Application.Top.Scheme = Colors.Schemes ["Base"];
+            //Application.Current.Scheme = Colors.Schemes ["Base"];
             _textField = new ()
             {
                 //                1         2         3 

Tests/UnitTests/Views/TextViewTests.cs

@@ -109,7 +109,7 @@ public class TextViewTests
                 Assert.Equal (leftCol, _textView.LeftColumn);
             }
 
-            Application.Top.Remove (_textView);
+            Application.Current.Remove (_textView);
             Application.RequestStop ();
         }
     }

Tests/UnitTests/Views/ToplevelTests.cs

@@ -69,11 +69,11 @@ public class ToplevelTests
 #endif
 
         Application.Begin (top);
-        Assert.Equal (top, Application.Top);
+        Assert.Equal (top, Application.Current);
 
-        // Application.Top without menu and status bar.
+        // Application.Current without menu and status bar.
         View supView = View.GetLocationEnsuringFullVisibility (top, 2, 2, out int nx, out int ny /*, out StatusBar sb*/);
-        Assert.Equal (Application.Top, supView);
+        Assert.Equal (Application.Current, supView);
         Assert.Equal (0, nx);
         Assert.Equal (0, ny);
 
@@ -82,7 +82,7 @@ public class ToplevelTests
         top.Add (new MenuBar ());
         Assert.NotNull (top.MenuBar);
 
-        // Application.Top with a menu and without status bar.
+        // Application.Current with a menu and without status bar.
         View.GetLocationEnsuringFullVisibility (top, 2, 2, out nx, out ny /*, out sb*/);
         Assert.Equal (0, nx);
         Assert.Equal (1, ny);
@@ -92,11 +92,11 @@ public class ToplevelTests
         //top.Add (new StatusBar ());
         //Assert.NotNull (top.StatusBar);
 
-        // Application.Top with a menu and status bar.
+        // Application.Current with a menu and status bar.
         View.GetLocationEnsuringFullVisibility (top, 2, 2, out nx, out ny /*, out sb*/);
         Assert.Equal (0, nx);
 
-        // The available height is lower than the Application.Top height minus
+        // The available height is lower than the Application.Current height minus
         // the menu bar and status bar, then the top can go beyond the bottom
         //        Assert.Equal (2, ny);
         //Assert.NotNull (sb);
@@ -106,11 +106,11 @@ public class ToplevelTests
         Assert.Null (top.MenuBar);
         Assert.NotNull (menuBar);
 
-        // Application.Top without a menu and with a status bar.
+        // Application.Current without a menu and with a status bar.
         View.GetLocationEnsuringFullVisibility (top, 2, 2, out nx, out ny /*, out sb*/);
         Assert.Equal (0, nx);
 
-        // The available height is lower than the Application.Top height minus
+        // The available height is lower than the Application.Current height minus
         // the status bar, then the top can go beyond the bottom
         //        Assert.Equal (2, ny);
         //Assert.NotNull (sb);
@@ -127,11 +127,11 @@ public class ToplevelTests
 
         // The SuperView is always the same regardless of the caller.
         supView = View.GetLocationEnsuringFullVisibility (win, 0, 0, out nx, out ny /*, out sb*/);
-        Assert.Equal (Application.Top, supView);
+        Assert.Equal (Application.Current, supView);
         supView = View.GetLocationEnsuringFullVisibility (win, 0, 0, out nx, out ny /*, out sb*/);
-        Assert.Equal (Application.Top, supView);
+        Assert.Equal (Application.Current, supView);
 
-        // Application.Top without menu and status bar.
+        // Application.Current without menu and status bar.
         View.GetLocationEnsuringFullVisibility (win, 0, 0, out nx, out ny /*, out sb*/);
         Assert.Equal (0, nx);
         Assert.Equal (0, ny);
@@ -141,7 +141,7 @@ public class ToplevelTests
         top.Add (new MenuBar ());
         Assert.NotNull (top.MenuBar);
 
-        // Application.Top with a menu and without status bar.
+        // Application.Current with a menu and without status bar.
         View.GetLocationEnsuringFullVisibility (win, 2, 2, out nx, out ny /*, out sb*/);
         Assert.Equal (0, nx);
         Assert.Equal (1, ny);
@@ -152,11 +152,11 @@ public class ToplevelTests
 
         //Assert.NotNull (top.StatusBar);
 
-        // Application.Top with a menu and status bar.
+        // Application.Current with a menu and status bar.
         View.GetLocationEnsuringFullVisibility (win, 30, 20, out nx, out ny /*, out sb*/);
         Assert.Equal (0, nx);
 
-        // The available height is lower than the Application.Top height minus
+        // The available height is lower than the Application.Current height minus
         // the menu bar and status bar, then the top can go beyond the bottom
         //Assert.Equal (20, ny);
         //Assert.NotNull (sb);
@@ -177,7 +177,7 @@ public class ToplevelTests
         win = new () { Width = 60, Height = 15 };
         top.Add (win);
 
-        // Application.Top without menu and status bar.
+        // Application.Current without menu and status bar.
         View.GetLocationEnsuringFullVisibility (win, 0, 0, out nx, out ny /*, out sb*/);
         Assert.Equal (0, nx);
         Assert.Equal (0, ny);
@@ -187,7 +187,7 @@ public class ToplevelTests
         top.Add (new MenuBar ());
         Assert.NotNull (top.MenuBar);
 
-        // Application.Top with a menu and without status bar.
+        // Application.Current with a menu and without status bar.
         View.GetLocationEnsuringFullVisibility (win, 2, 2, out nx, out ny /*, out sb*/);
         Assert.Equal (2, nx);
         Assert.Equal (2, ny);
@@ -198,7 +198,7 @@ public class ToplevelTests
 
         //Assert.NotNull (top.StatusBar);
 
-        // Application.Top with a menu and status bar.
+        // Application.Current with a menu and status bar.
         View.GetLocationEnsuringFullVisibility (win, 30, 20, out nx, out ny /*, out sb*/);
         Assert.Equal (20, nx); // 20+60=80
 
@@ -307,7 +307,7 @@ public class ToplevelTests
             }
             else if (iterations == 1)
             {
-                Assert.Equal (new (2, 2), Application.Top!.Frame.Location);
+                Assert.Equal (new (2, 2), Application.Current!.Frame.Location);
             }
             else if (iterations == 2)
             {
@@ -316,12 +316,12 @@ public class ToplevelTests
                 // Grab the mouse
                 Application.RaiseMouseEvent (new () { ScreenPosition = new (3, 2), Flags = MouseFlags.Button1Pressed });
 
-                Assert.Equal (Application.Top!.Border, Application.Mouse.MouseGrabView);
-                Assert.Equal (new (2, 2, 10, 3), Application.Top.Frame);
+                Assert.Equal (Application.Current!.Border, Application.Mouse.MouseGrabView);
+                Assert.Equal (new (2, 2, 10, 3), Application.Current.Frame);
             }
             else if (iterations == 3)
             {
-                Assert.Equal (Application.Top!.Border, Application.Mouse.MouseGrabView);
+                Assert.Equal (Application.Current!.Border, Application.Mouse.MouseGrabView);
 
                 // Drag to left
                 Application.RaiseMouseEvent (
@@ -333,38 +333,38 @@ public class ToplevelTests
                                              });
                 AutoInitShutdownAttribute.RunIteration ();
 
-                Assert.Equal (Application.Top.Border, Application.Mouse.MouseGrabView);
-                Assert.Equal (new (1, 2, 10, 3), Application.Top.Frame);
+                Assert.Equal (Application.Current.Border, Application.Mouse.MouseGrabView);
+                Assert.Equal (new (1, 2, 10, 3), Application.Current.Frame);
             }
             else if (iterations == 4)
             {
-                Assert.Equal (Application.Top!.Border, Application.Mouse.MouseGrabView);
-                Assert.Equal (new (1, 2), Application.Top.Frame.Location);
+                Assert.Equal (Application.Current!.Border, Application.Mouse.MouseGrabView);
+                Assert.Equal (new (1, 2), Application.Current.Frame.Location);
 
-                Assert.Equal (Application.Top.Border, Application.Mouse.MouseGrabView);
+                Assert.Equal (Application.Current.Border, Application.Mouse.MouseGrabView);
             }
             else if (iterations == 5)
             {
-                Assert.Equal (Application.Top!.Border, Application.Mouse.MouseGrabView);
+                Assert.Equal (Application.Current!.Border, Application.Mouse.MouseGrabView);
 
                 // Drag up
                 Application.RaiseMouseEvent (new () { ScreenPosition = new (2, 1), Flags = MouseFlags.Button1Pressed | MouseFlags.ReportMousePosition });
                 AutoInitShutdownAttribute.RunIteration ();
 
-                Assert.Equal (Application.Top!.Border, Application.Mouse.MouseGrabView);
-                Assert.Equal (new (1, 1, 10, 3), Application.Top.Frame);
+                Assert.Equal (Application.Current!.Border, Application.Mouse.MouseGrabView);
+                Assert.Equal (new (1, 1, 10, 3), Application.Current.Frame);
             }
             else if (iterations == 6)
             {
-                Assert.Equal (Application.Top!.Border, Application.Mouse.MouseGrabView);
-                Assert.Equal (new (1, 1), Application.Top.Frame.Location);
+                Assert.Equal (Application.Current!.Border, Application.Mouse.MouseGrabView);
+                Assert.Equal (new (1, 1), Application.Current.Frame.Location);
 
-                Assert.Equal (Application.Top.Border, Application.Mouse.MouseGrabView);
-                Assert.Equal (new (1, 1, 10, 3), Application.Top.Frame);
+                Assert.Equal (Application.Current.Border, Application.Mouse.MouseGrabView);
+                Assert.Equal (new (1, 1, 10, 3), Application.Current.Frame);
             }
             else if (iterations == 7)
             {
-                Assert.Equal (Application.Top!.Border, Application.Mouse.MouseGrabView);
+                Assert.Equal (Application.Current!.Border, Application.Mouse.MouseGrabView);
 
                 // Ungrab the mouse
                 Application.RaiseMouseEvent (new () { ScreenPosition = new (2, 1), Flags = MouseFlags.Button1Released });

Tests/UnitTestsParallelizable/TestSetup.cs

@@ -39,7 +39,7 @@ public class GlobalTestSetup : IDisposable
         // Check that all Application fields and properties are set to their default values
 
         // Public Properties
-        Assert.Null (Application.Top);
+        Assert.Null (Application.Current);
         Assert.Null (Application.Mouse.MouseGrabView);
 
         // Don't check Application.ForceDriver
@@ -59,7 +59,7 @@ public class GlobalTestSetup : IDisposable
         Assert.Equal (Application.GetSupportedCultures (), Application.SupportedCultures);
         Assert.Equal (Application.GetAvailableCulturesFromEmbeddedResources (), Application.SupportedCultures);
         Assert.Null (Application.MainThreadId);
-        Assert.Empty (Application.TopLevels);
+        Assert.Empty (Application.SessionStack);
         Assert.Empty (Application.CachedViewsUnderMouse);
 
         // Mouse