Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-01 16:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1973. Avoid positioning Submenus off screen. (#1975)

Browse Source 
* Fixes #1973. Avoid positioning Submenus off screen.

* Firstly avoids negative positions on the sub-menus and then avoids the bottom not exceeding the console height, as possible.
This commit is contained in:
BDisp
2022-09-05 14:17:58 +00:00
committed by GitHub
parent e767ae14eb
commit 13948501d5
3 changed files with 229 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
UnitTests/ContextMenuTests.cs
View File

@@ -423,7 +423,7 @@ namespace Terminal.Gui.Core {
cm.Show ();
Assert.Equal (new Point (0, 0), cm.Position);
Application.Begin (Application.Top);
((FakeDriver)Application.Driver).SetBufferSize (80, 4);
((FakeDriver)Application.Driver).SetBufferSize (80, 3);
var expected = @"
┌──────┐
@@ -432,7 +432,7 @@ namespace Terminal.Gui.Core {
";
var pos = GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new Rect (0, 1, 8, 3), pos);
Assert.Equal (new Rect (0, 0, 8, 3), pos);
cm.Hide ();
Assert.Equal (new Point (0, 0), cm.Position);
@@ -648,7 +648,6 @@ namespace Terminal.Gui.Core {
Application.Begin (Application.Top);
((FakeDriver)Application.Driver).SetBufferSize (44, 17);
Assert.Equal (new Rect (9, 3, 20, 1), tf.Frame);
Assert.True (tf.HasFocus);
@@ -679,5 +678,215 @@ namespace Terminal.Gui.Core {
var pos = GraphViewTests.AssertDriverContentsWithFrameAre (expected, output);
Assert.Equal (new Rect (2, 0, 44, 17), pos);
}
[Fact, AutoInitShutdown]
public void Menus_And_SubMenus_Always_Try_To_Be_On_Screen ()
{
var cm = new ContextMenu (-1, -2,
new MenuBarItem (new MenuItem [] {
new MenuItem ("One", "", null),
new MenuItem ("Two", "", null),
new MenuItem ("Three", "", null),
new MenuBarItem ("Four", new MenuItem [] {
new MenuItem ("SubMenu1", "", null),
new MenuItem ("SubMenu2", "", null),
new MenuItem ("SubMenu3", "", null),
new MenuItem ("SubMenu4", "", null),
new MenuItem ("SubMenu5", "", null),
new MenuItem ("SubMenu6", "", null),
new MenuItem ("SubMenu7", "", null)
}),
new MenuItem ("Five", "", null),
new MenuItem ("Six", "", null)
})
);
Assert.Equal (new Point (-1, -2), cm.Position);
cm.Show ();
Assert.Equal (new Point (-1, -2), cm.Position);
var top = Application.Top;
Application.Begin (top);
GraphViewTests.AssertDriverContentsWithFrameAre (@"
┌────────┐
│ One │
│ Two │
│ Three │
│ Four ►│
│ Five │
│ Six │
└────────┘
", output);
Assert.True (top.Subviews [0].MouseEvent (new MouseEvent {
X = 0,
Y = 4,
Flags = MouseFlags.ReportMousePosition,
View = top.Subviews [0]
}));
Application.Refresh ();
Assert.Equal (new Point (-1, -2), cm.Position);
GraphViewTests.AssertDriverContentsWithFrameAre (@"
┌────────┐
│ One │
│ Two │
│ Three │
│ Four ►│┌───────────┐
│ Five ││ SubMenu1 │
│ Six ││ SubMenu2 │
└────────┘│ SubMenu3 │
│ SubMenu4 │
│ SubMenu5 │
│ SubMenu6 │
│ SubMenu7 │
└───────────┘
", output);
((FakeDriver)Application.Driver).SetBufferSize (40, 20);
cm.Position = new Point (41, -2);
cm.Show ();
Application.Refresh ();
Assert.Equal (new Point (41, -2), cm.Position);
GraphViewTests.AssertDriverContentsWithFrameAre (@"
┌────────┐
│ One │
│ Two │
│ Three │
│ Four ►│
│ Five │
│ Six │
└────────┘
", output);
Assert.True (top.Subviews [0].MouseEvent (new MouseEvent {
X = 30,
Y = 4,
Flags = MouseFlags.ReportMousePosition,
View = top.Subviews [0]
}));
Application.Refresh ();
Assert.Equal (new Point (41, -2), cm.Position);
GraphViewTests.AssertDriverContentsWithFrameAre (@"
┌────────┐
│ One │
│ Two │
│ Three │
┌───────────┐│ Four ►│
│ SubMenu1 ││ Five │
│ SubMenu2 ││ Six │
│ SubMenu3 │└────────┘
│ SubMenu4 │
│ SubMenu5 │
│ SubMenu6 │
│ SubMenu7 │
└───────────┘
", output);
cm.Position = new Point (41, 9);
cm.Show ();
Application.Refresh ();
Assert.Equal (new Point (41, 9), cm.Position);
GraphViewTests.AssertDriverContentsWithFrameAre (@"
┌────────┐
│ One │
│ Two │
│ Three │
│ Four ►│
│ Five │
│ Six │
└────────┘
", output);
Assert.True (top.Subviews [0].MouseEvent (new MouseEvent {
X = 30,
Y = 4,
Flags = MouseFlags.ReportMousePosition,
View = top.Subviews [0]
}));
Application.Refresh ();
Assert.Equal (new Point (41, 9), cm.Position);
GraphViewTests.AssertDriverContentsWithFrameAre (@"
┌────────┐
┌───────────┐│ One │
│ SubMenu1 ││ Two │
│ SubMenu2 ││ Three │
│ SubMenu3 ││ Four ►│
│ SubMenu4 ││ Five │
│ SubMenu5 ││ Six │
│ SubMenu6 │└────────┘
│ SubMenu7 │
└───────────┘
", output);
cm.Position = new Point (41, 22);
cm.Show ();
Application.Refresh ();
Assert.Equal (new Point (41, 22), cm.Position);
GraphViewTests.AssertDriverContentsWithFrameAre (@"
┌────────┐
│ One │
│ Two │
│ Three │
│ Four ►│
│ Five │
│ Six │
└────────┘
", output);
Assert.True (top.Subviews [0].MouseEvent (new MouseEvent {
X = 30,
Y = 4,
Flags = MouseFlags.ReportMousePosition,
View = top.Subviews [0]
}));
Application.Refresh ();
Assert.Equal (new Point (41, 22), cm.Position);
GraphViewTests.AssertDriverContentsWithFrameAre (@"
┌───────────┐
│ SubMenu1 │┌────────┐
│ SubMenu2 ││ One │
│ SubMenu3 ││ Two │
│ SubMenu4 ││ Three │
│ SubMenu5 ││ Four ►│
│ SubMenu6 ││ Five │
│ SubMenu7 ││ Six │
└───────────┘└────────┘
", output);
((FakeDriver)Application.Driver).SetBufferSize (18, 8);
cm.Position = new Point (19, 10);
cm.Show ();
Application.Refresh ();
Assert.Equal (new Point (19, 10), cm.Position);
GraphViewTests.AssertDriverContentsWithFrameAre (@"
┌────────┐
│ One │
│ Two │
│ Three │
│ Four ►│
│ Five │
│ Six │
└────────┘
", output);
Assert.True (top.Subviews [0].MouseEvent (new MouseEvent {
X = 30,
Y = 4,
Flags = MouseFlags.ReportMousePosition,
View = top.Subviews [0]
}));
Application.Refresh ();
Assert.Equal (new Point (19, 10), cm.Position);
GraphViewTests.AssertDriverContentsWithFrameAre (@"
┌───────────┐────┐
│ SubMenu1 │ │
│ SubMenu2 │ │
│ SubMenu3 │ee │
│ SubMenu4 │r ►│
│ SubMenu5 │e │
│ SubMenu6 │ │
│ SubMenu7 │────┘
", output);
}
}
}