Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensures the menu bar grabs the mouse when removing a menu.

Browse Source
This commit is contained in:
BDisp
2024-04-10 18:16:51 +01:00
parent d5800743ea
commit c42c88ccbc
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Terminal.Gui/Views/Menu/MenuBar.cs
View File

@@ -1386,6 +1386,12 @@ public class MenuBar : View
menu = _openSubMenu [i];
Application.Current.Remove (menu);
_openSubMenu.Remove (menu);
if (Application.MouseGrabView == menu)
{
Application.GrabMouse (this);
}
menu.Dispose ();
}

24
UnitTests/Views/MenuBarTests.cs
View File

@@ -3262,11 +3262,7 @@ Edit
Rectangle pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
Assert.Equal (new Rectangle (1, 0, 8, 1), pos);
Assert.True (
menu.NewMouseEvent (
new MouseEvent { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu }
)
);
Assert.True (menu.NewMouseEvent (new () { X = 1, Y = 0, Flags = MouseFlags.Button1Pressed, View = menu }));
top.Draw ();
expected = @"
@@ -3281,11 +3277,7 @@ Edit
pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
Assert.Equal (new Rectangle (1, 0, 10, 6), pos);
Assert.False (
menu.NewMouseEvent (
new MouseEvent { X = 1, Y = 2, Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [1] }
)
);
Assert.False (menu.NewMouseEvent (new () { X = 1, Y = 2, Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [1] }));
top.Draw ();
expected = @"
@@ -3301,11 +3293,7 @@ Edit
pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
Assert.Equal (new Rectangle (1, 0, 15, 7), pos);
Assert.False (
menu.NewMouseEvent (
new MouseEvent { X = 1, Y = 1, Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [2] }
)
);
Assert.False (menu.NewMouseEvent (new () { X = 1, Y = 1, Flags = MouseFlags.Button1Clicked, View = Application.Top.Subviews [2] }));
top.Draw ();
expected = @"
@@ -3320,11 +3308,7 @@ Edit
pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
Assert.Equal (new Rectangle (1, 0, 10, 6), pos);
Assert.False (
menu.NewMouseEvent (
new MouseEvent { X = 70, Y = 2, Flags = MouseFlags.Button1Clicked, View = Application.Top }
)
);
Assert.False (menu.NewMouseEvent (new () { X = 70, Y = 2, Flags = MouseFlags.Button1Clicked, View = Application.Top }));
top.Draw ();
expected = @"