Fixes #4329 - Rename Application.Top to Application.Current, Application.TopLevels to Application.SessionStack, and enable nullable reference types

Examples/CommunityToolkitExample/Program.cs

@@ -16,7 +16,7 @@ private static void Main (string [] args)
         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 @@ private static void Main (string [] args)
         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 @@ private void OnApplicationOnIteration (object? s, IterationEventArgs a)
 
     private void OnApplicationSessionBegun (object? sender, SessionTokenEventArgs e)
     {
-        SubscribeAllSubViews (Application.Top!);
+        SubscribeAllSubViews (Application.Current!);
 
         _demoKeys = GetDemoKeyStrokes ();
 
@@ -241,7 +241,7 @@ private void OnApplicationSessionBegun (object? sender, SessionTokenEventArgs e)
 
         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 override void Main ()
     // 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 @@ private void App_Loaded (object sender, EventArgs e)
             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 @@ private void App_Loaded (object sender, EventArgs e)
             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 @@ private void App_Loaded (object sender, EventArgs e)
             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 @@ void MenuLikeExamplesMouseEvent (object _, MouseEventArgs e)
             Width = Dim.Width (menuLikeExamples),
             Height = Dim.Percent (33),
         };
-        Application.Top.Add (statusBarLikeExamples);
+        Application.Current.Add (statusBarLikeExamples);
 
         label = new Label ()
         {
@@ -249,7 +249,7 @@ void MenuLikeExamplesMouseEvent (object _, MouseEventArgs e)
         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 @@ void MenuLikeExamplesMouseEvent (object _, MouseEventArgs e)
 
     //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 override void Main ()
         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 override void Main ()
 
         void ConfigurationManagerOnApplied (object? sender, ConfigurationManagerEventArgs e)
         {
-            Application.Top?.SetNeedsDraw ();
+            Application.Current?.SetNeedsDraw ();
         }
     }
     public void Save ()

Examples/UICatalog/Scenarios/CsvEditor.cs

@@ -502,7 +502,7 @@ private void Open (string filename)
             // 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 @@ private void TopCommandNotBound (object? sender, CommandEventArgs e)
                 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 @@ private void TopCommandNotBound (object? sender, CommandEventArgs e)
                 _message = string.Empty;
             }
 
-            Application.Top!.SetNeedsDraw (); // trigger redraw
+            Application.Current!.SetNeedsDraw (); // trigger redraw
         }
 
         // Optional win condition:
@@ -200,7 +200,7 @@ private void TopCommandNotBound (object? sender, CommandEventArgs e)
             _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 override void Main ()
     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 @@ private void App_Loaded (object? sender, EventArgs e)
 
         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 @@ private void App_Loaded (object? sender, EventArgs e)
                                                                           };
 
 
-        Application.Top.Add (alignKeysShortcut);
+        Application.Current.Add (alignKeysShortcut);
 
         var commandFirstShortcut = new Shortcut
         {
@@ -115,7 +115,7 @@ private void App_Loaded (object? sender, EventArgs e)
                                                                                                       $"{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 @@ private void App_Loaded (object? sender, EventArgs e)
                                                                                  }
                                                                              };
 
-        Application.Top.Add (commandFirstShortcut);
+        Application.Current.Add (commandFirstShortcut);
 
         var canFocusShortcut = new Shortcut
         {
@@ -159,7 +159,7 @@ private void App_Loaded (object? sender, EventArgs e)
                                                                                  SetCanFocus (e.Result == CheckState.Checked);
                                                                              }
                                                                          };
-        Application.Top.Add (canFocusShortcut);
+        Application.Current.Add (canFocusShortcut);
 
         var appShortcut = new Shortcut
         {
@@ -173,7 +173,7 @@ private void App_Loaded (object? sender, EventArgs e)
             BindKeyToApplication = true
         };
 
-        Application.Top.Add (appShortcut);
+        Application.Current.Add (appShortcut);
 
         var buttonShortcut = new Shortcut
         {
@@ -193,7 +193,7 @@ private void App_Loaded (object? sender, EventArgs e)
         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 @@ private void App_Loaded (object? sender, EventArgs e)
                                                                                     }
                                                                                 };
 
-        Application.Top.Add (optionSelectorShortcut);
+        Application.Current.Add (optionSelectorShortcut);
 
         var sliderShortcut = new Shortcut
         {
@@ -248,7 +248,7 @@ private void App_Loaded (object? sender, EventArgs e)
                                                                            eventLog.MoveDown ();
                                                                        };
 
-        Application.Top.Add (sliderShortcut);
+        Application.Current.Add (sliderShortcut);
 
         ListView listView = new ListView ()
         {
@@ -270,7 +270,7 @@ private void App_Loaded (object? sender, EventArgs e)
             Key = Key.F5.WithCtrl,
         };
 
-        Application.Top.Add (listViewShortcut);
+        Application.Current.Add (listViewShortcut);
 
         var noCommandShortcut = new Shortcut
         {
@@ -282,7 +282,7 @@ private void App_Loaded (object? sender, EventArgs e)
             Key = Key.D0
         };
 
-        Application.Top.Add (noCommandShortcut);
+        Application.Current.Add (noCommandShortcut);
 
         var noKeyShortcut = new Shortcut
         {
@@ -295,7 +295,7 @@ private void App_Loaded (object? sender, EventArgs e)
             HelpText = "Keyless"
         };
 
-        Application.Top.Add (noKeyShortcut);
+        Application.Current.Add (noKeyShortcut);
 
         var noHelpShortcut = new Shortcut
         {
@@ -308,7 +308,7 @@ private void App_Loaded (object? sender, EventArgs e)
             HelpText = ""
         };
 
-        Application.Top.Add (noHelpShortcut);
+        Application.Current.Add (noHelpShortcut);
         noHelpShortcut.SetFocus ();
 
         var framedShortcut = new Shortcut
@@ -340,7 +340,7 @@ private void App_Loaded (object? sender, EventArgs e)
         }
 
         framedShortcut.SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Toplevel);
-        Application.Top.Add (framedShortcut);
+        Application.Current.Add (framedShortcut);
 
         // Horizontal
         var progressShortcut = new Shortcut
@@ -387,7 +387,7 @@ private void App_Loaded (object? sender, EventArgs e)
                          };
         timer.Start ();
 
-        Application.Top.Add (progressShortcut);
+        Application.Current.Add (progressShortcut);
 
         var textField = new TextField
         {
@@ -408,7 +408,7 @@ private void App_Loaded (object? sender, EventArgs e)
         };
         textField.CanFocus = true;
 
-        Application.Top.Add (textFieldShortcut);
+        Application.Current.Add (textFieldShortcut);
 
         var bgColorShortcut = new Shortcut
         {
@@ -450,19 +450,19 @@ private void App_Loaded (object? sender, EventArgs e)
                                         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 @@ private void App_Loaded (object? sender, EventArgs e)
         };
         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 @@ private void App_Loaded (object? sender, EventArgs e)
 
         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 @@ void AlignKeys (bool align)
         {
             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 @@ private void RunWorker ()
 
                                                   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;