Skip to content

V1 - Fixes #3740. Disabled MenuItem triggers exception. #3744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tig merged 1 commit into from
Sep 19, 2024
Merged

V1 - Fixes #3740. Disabled MenuItem triggers exception. #3744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Terminal.Gui/Views/Menu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,7 @@ public virtual void OnMenuOpened ()
mi = openCurrentMenu.barItems.Children [openCurrentMenu.current];
} else if (openCurrentMenu.barItems.IsTopLevel) {
mi = openCurrentMenu.barItems;
} else {
} else if (openCurrentMenu?.current > -1) {
mi = openMenu.barItems.Children [openMenu.current];
}
MenuOpened?.Invoke (mi);
Expand Down
12 changes: 4 additions & 8 deletions UnitTests/Menus/MenuTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,7 @@ public void MenuOpened_On_Disabled_MenuItem ()
View = mCurrent
}));
Assert.True (menu.IsMenuOpen);
Assert.Equal ("_File", miCurrent.Parent.Title);
Assert.Equal ("_New", miCurrent.Title);
Assert.Null (miCurrent);

Assert.True (mCurrent.MouseEvent (new MouseEvent () {
X = 1,
Expand All @@ -229,8 +228,7 @@ public void MenuOpened_On_Disabled_MenuItem ()
View = mCurrent
}));
Assert.True (menu.IsMenuOpen);
Assert.Equal ("_File", miCurrent.Parent.Title);
Assert.Equal ("_New", miCurrent.Title);
Assert.Null (miCurrent);

Assert.True (mCurrent.MouseEvent (new MouseEvent () {
X = 1,
Expand All @@ -239,8 +237,7 @@ public void MenuOpened_On_Disabled_MenuItem ()
View = mCurrent
}));
Assert.True (menu.IsMenuOpen);
Assert.Equal ("_File", miCurrent.Parent.Title);
Assert.Equal ("_Save", miCurrent.Title);
Assert.Null (miCurrent);

// close the menu
Assert.True (menu.MouseEvent (new MouseEvent () {
Expand All @@ -265,8 +262,7 @@ public void MenuOpened_On_Disabled_MenuItem ()

Assert.True (mCurrent.ProcessKey (new KeyEvent (Key.CursorUp, new KeyModifiers ())));
Assert.True (menu.IsMenuOpen);
Assert.Equal ("_File", miCurrent.Parent.Title);
Assert.Equal ("_New", miCurrent.Title);
Assert.Null (miCurrent);

// close the menu
Assert.True (menu.ProcessHotKey (new KeyEvent (Key.F9, new KeyModifiers ())));
Expand Down