Merge branch 'v2_develop' into v2_3750-MouseEnter

This commit is contained in:
Tig
2024-09-24 09:12:58 -06:00
committed by GitHub
2 changed files with 25 additions and 1 deletions

View File

@@ -101,7 +101,7 @@ internal sealed class Menu : View
for (var i = 0; i < _barItems.Children?.Length; i++)
{
if (_barItems.Children [i]!.IsEnabled ())
if (_barItems.Children [i]?.IsEnabled () == true)
{
_currentChild = i;

View File

@@ -148,6 +148,30 @@ public class MenuBarTests (ITestOutputHelper output)
top.Dispose ();
}
[Fact]
[AutoInitShutdown]
public void CanExecute_False_Does_Not_Throws ()
{
var menu = new MenuBar
{
Menus =
[
new ("File", new MenuItem []
{
new ("New", "", null, () => false),
null,
new ("Quit", "", null)
})
]
};
var top = new Toplevel ();
top.Add (menu);
Application.Begin (top);
Assert.True (menu.NewKeyDownEvent (menu.Key));
Assert.True (menu.IsMenuOpen);
}
[Fact]
[AutoInitShutdown]
public void CanExecute_HotKey ()