Merge branch 'v2_develop' of tig:gui-cs/Terminal.Gui into v2_develop

This commit is contained in:
Tig
2025-03-17 15:59:37 +01:00
2 changed files with 40 additions and 0 deletions

View File

@@ -743,6 +743,11 @@ public class MenuBar : View, IDesignable
return;
}
if (_selected == -1)
{
return;
}
OpenMenu (_selected);
SelectEnabledItem (
@@ -984,6 +989,11 @@ public class MenuBar : View, IDesignable
return;
}
if (_selected == -1)
{
return;
}
OpenMenu (_selected);
if (!SelectEnabledItem (

View File

@@ -2105,4 +2105,34 @@ public class ContextMenuTests (ITestOutputHelper output)
top.Dispose ();
}
[Fact]
[AutoInitShutdown]
public void Menu_Without_SubMenu_Is_Closed_When_Pressing_Key_Right_Or_Key_Left ()
{
var cm = new ContextMenu ();
var menuItems = new MenuBarItem (
[
new ("_New", string.Empty, null),
new ("_Save", string.Empty, null)
]
);
var top = new Toplevel ();
Application.Begin (top);
cm.Show (menuItems);
Assert.True (cm.MenuBar!.IsMenuOpen);
Assert.True (Application.RaiseKeyDownEvent (Key.CursorRight));
Assert.False (cm.MenuBar!.IsMenuOpen);
cm.Show (menuItems);
Assert.True (cm.MenuBar!.IsMenuOpen);
Assert.True (Application.RaiseKeyDownEvent (Key.CursorLeft));
Assert.False (cm.MenuBar!.IsMenuOpen);
top.Dispose ();
}
}