Fixes gui-cs#2810. Pressing Alt key on a Toplevel with only a MenuBar…

… throws System.InvalidOperationException.
BDisp · Aug 15, 2023 · 4419a48 · 4419a48
1 parent 42f5b16
commit 4419a48
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/Terminal.Gui/Core/Toplevel.cs b/Terminal.Gui/Core/Toplevel.cs
@@ -218,6 +218,7 @@ public Toplevel () : base ()
 
 		void Initialize ()
 		{
+			CanFocus = true;
 			ColorScheme = Colors.TopLevel;
 
 			// Things this view knows how to do
@@ -569,6 +570,9 @@ internal void AddMenuStatusBar (View view)
 		///<inheritdoc/>
 		public override void Remove (View view)
 		{
+			if (InternalSubviews.Count < 1) {
+				CanFocus = false;
+			}
 			if (this is Toplevel toplevel && toplevel.MenuBar != null) {
 				RemoveMenuStatusBar (view);
 			}

diff --git a/Terminal.Gui/Core/Window.cs b/Terminal.Gui/Core/Window.cs
@@ -182,7 +182,6 @@ public Window (ustring title = null, int padding = 0, Border border = null) : ba
 
 		void Initialize (ustring title, Rect frame, int padding = 0, Border border = null)
 		{
-			CanFocus = true;
 			ColorScheme = Colors.Base;
 			if (title == null) title = ustring.Empty;
 			Title = title;

diff --git a/UnitTests/TopLevels/ToplevelTests.cs b/UnitTests/TopLevels/ToplevelTests.cs
@@ -1031,5 +1031,22 @@ public void PositionCursor_SetCursorVisibility_To_Invisible_If_Focused_Is_Null (
 			Application.Driver.GetCursorVisibility (out cursor);
 			Assert.Equal (CursorVisibility.Invisible, cursor);
 		}
+
+		[Fact, AutoInitShutdown]
+		public void Activating_MenuBar_By_Alt_Key_Does_Not_Throw ()
+		{
+			var menu = new MenuBar (new MenuBarItem [] {
+				new MenuBarItem ("Child", new MenuItem [] {
+					new MenuItem ("_Create Child", "", null)
+				})
+			});
+			var topChild = new Toplevel ();
+			topChild.Add (menu);
+			Application.Top.Add (topChild);
+			Application.Begin (Application.Top);
+
+			var exception = Record.Exception (() => topChild.ProcessHotKey (new KeyEvent (Key.AltMask, new KeyModifiers { Alt = true })));
+			Assert.Null (exception);
+		}
 	}
 }