Merge branch 'v2_develop' into v2_2489_scroll-scrollbar-new

This commit is contained in:
BDisp
2024-09-02 19:35:03 +01:00
committed by GitHub
20 changed files with 1360 additions and 670 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -15,10 +15,10 @@ public class MenuBarTests (ITestOutputHelper output)
Assert.Equal ("n", menuBarItem.HotKey);
Assert.Equal ("i", menuItem.HotKey);
Assert.Empty (menuBar.Menus);
menuBarItem.AddMenuBarItem (menuItem);
menuBarItem.AddMenuBarItem (menuBar, menuItem);
menuBar.Menus = [menuBarItem];
Assert.Single (menuBar.Menus);
Assert.Single (menuBar.Menus [0].Children);
Assert.Single (menuBar.Menus [0].Children!);
Assert.Contains (Key.N.WithAlt, menuBar.KeyBindings.Bindings);
Assert.DoesNotContain (Key.I, menuBar.KeyBindings.Bindings);
@@ -2938,7 +2938,7 @@ Edit
Assert.Contains (Key.A.WithCtrl, menuBar.KeyBindings.Bindings);
menuBar.Menus [0].Children [0].ShortcutKey = Key.B.WithCtrl;
menuBar.Menus [0].Children! [0].ShortcutKey = Key.B.WithCtrl;
Assert.DoesNotContain (Key.A.WithCtrl, menuBar.KeyBindings.Bindings);
Assert.Contains (Key.B.WithCtrl, menuBar.KeyBindings.Bindings);

View File

@@ -43,4 +43,68 @@ public class MenuTests
void Run () { }
}
[Fact]
public void MenuBarItem_SubMenu_Can_Return_Null ()
{
var menuItem = new MenuItem ();
var menuBarItem = new MenuBarItem ();
Assert.Null (menuBarItem.SubMenu (menuItem));
}
[Fact]
public void MenuBarItem_Constructors_Defaults ()
{
var menuBarItem = new MenuBarItem ();
Assert.Equal ("", menuBarItem.Title);
Assert.Equal ("", menuBarItem.Help);
Assert.Null (menuBarItem.Action);
Assert.Null (menuBarItem.CanExecute);
Assert.Null (menuBarItem.Parent);
Assert.Equal (Key.Empty, menuBarItem.ShortcutKey);
Assert.Equal ([], menuBarItem.Children);
Assert.False (menuBarItem.IsTopLevel);
menuBarItem = new MenuBarItem (null!, null!, Run, () => true, new ());
Assert.Equal ("", menuBarItem.Title);
Assert.Equal ("", menuBarItem.Help);
Assert.Equal (Run, menuBarItem.Action);
Assert.NotNull (menuBarItem.CanExecute);
Assert.NotNull (menuBarItem.Parent);
Assert.Equal (Key.Empty, menuBarItem.ShortcutKey);
Assert.Null (menuBarItem.Children);
Assert.False (menuBarItem.IsTopLevel);
menuBarItem = new MenuBarItem (null!, Array.Empty<MenuItem> (), new ());
Assert.Equal ("", menuBarItem.Title);
Assert.Equal ("", menuBarItem.Help);
Assert.Null (menuBarItem.Action);
Assert.Null (menuBarItem.CanExecute);
Assert.NotNull (menuBarItem.Parent);
Assert.Equal (Key.Empty, menuBarItem.ShortcutKey);
Assert.Equal ([], menuBarItem.Children);
Assert.False (menuBarItem.IsTopLevel);
menuBarItem = new MenuBarItem (null!, new List<MenuItem []> (), new ());
Assert.Equal ("", menuBarItem.Title);
Assert.Equal ("", menuBarItem.Help);
Assert.Null (menuBarItem.Action);
Assert.Null (menuBarItem.CanExecute);
Assert.NotNull (menuBarItem.Parent);
Assert.Equal (Key.Empty, menuBarItem.ShortcutKey);
Assert.Equal ([], menuBarItem.Children);
Assert.False (menuBarItem.IsTopLevel);
menuBarItem = new MenuBarItem ([]);
Assert.Equal ("", menuBarItem.Title);
Assert.Equal ("", menuBarItem.Help);
Assert.Null (menuBarItem.Action);
Assert.Null (menuBarItem.CanExecute);
Assert.Null (menuBarItem.Parent);
Assert.Equal (Key.Empty, menuBarItem.ShortcutKey);
Assert.Equal ([], menuBarItem.Children);
Assert.False (menuBarItem.IsTopLevel);
void Run () { }
}
}