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

Fixes #2775. Something in 1.13 broke centering child windows. (#2778)

Browse Source 
* Fixes #2776. Pressing Alt key on a Window with only a MenuBar throws System.InvalidOperationException.

* Add unit test.

* Fix extra bracket.

* Prevents throw exception if Application.Current is null.

* Fix unit test because OnLeave is now invoked on toplevel removing, preventing two views having focus.

* Fix unit test method name.

* Fix Window by not layout on his subviews when adding a new view after the Application.Begin was already running.

* FindAndOpenMenuByHotkey now search inside Menus and inside his Children.

* Add unit test for Window LayoutSubviews and FindAndOpenChildrenMenuByHotkey menu method.

* Prevents button to be clear when it's invisible.

* Fixes 2780. Moving a Window that is Application.Top shouldn't be allowed.

* Fix condition if Window and Application.Top.

* Always LayoutSubviews and PositionToplevels after Clear.

* Fixes #2787. MenuItem with CanExecute returning false is select when a MenuBar is opened.

* Leveraging the power of CanExecute feature.

* Fixes #2789. StatusItem should have a disabled attribute if it can't execute.

* Allows positioning a child window outside the limits of the menu and the status bar.

* Change to a more appropriate name.

* Simplifies all the run actions.

* Prevents open menu bar if it's invisible and close all opened menus.

* Fix mdi run loop.

* Fix hot key on mdi toplevels.

* Fix position on mdi toplevels.

* Fix Top.Redraw by set state.Toplevel.SetNeedsDisplay if it's needed to redraw.

* Fix MdiTop by repainted when a keystroke is generated by keyboard.

* Rename local fields.

* Force redraw if application.Top needs display.

* Added more features to the scenario.

* Change the scenarios to run as Application.Top instead of sub-views.

* Add a new scenario similar but as Mdi Container.

* Add a bunch of new unit tests to prove all this PR.

* Only it's need to redraw Application.Top if it's a Mdi Container.

* Remove unnecessary code.

* Unit test that proves that a MDI child leaves no trace when the location is changed.

* Removes unnecessary Application.Init because theses uses Run<T> which already call it.

* Ensures a menu bar been closed after run an action.

* Ensures that another view can be focused if not IsMenuOpen and LastFocused is null, instead of focused the menu itself.

* Ensures a focused contentview subview being focused if MostFocused is null.

* Ensures a MdiTop subview to have priority if it's focused and thus  make it Current.

* Allow a MdiChild be closed when pressing Application.QuitKey.

* More unit tests proving the changes.

* Ensures the top.MostFocused is focused.

* Ensures MdiChild on the front if MdiTop.MostFocused isn't valid, like ContentView.

* Add unit test showing MdiChild on the front.

* Fix an issue where NullReferenceException can be throws everywhere while get the Application.MdiChildes property.

---------

Co-authored-by: Tig <tig@users.noreply.github.com>
This commit is contained in:
BDisp
2023-10-17 18:34:28 +01:00
committed by GitHub
parent 9a47180bb4
commit 3e1637aac8
12 changed files with 2877 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
UnitTests/TopLevels/MdiTests.cs
View File

@@ -68,24 +68,24 @@ namespace Terminal.Gui.TopLevelTests {
var iterations = 4;
top1.Ready += () => {
Assert.Null (Application.MdiChildes);
Assert.Empty (Application.MdiChildes);
Application.Run (top2);
};
top2.Ready += () => {
Assert.Null (Application.MdiChildes);
Assert.Empty (Application.MdiChildes);
Application.Run (top3);
};
top3.Ready += () => {
Assert.Null (Application.MdiChildes);
Assert.Empty (Application.MdiChildes);
Application.Run (top4);
};
top4.Ready += () => {
Assert.Null (Application.MdiChildes);
Assert.Empty (Application.MdiChildes);
Application.Run (d);
};
d.Ready += () => {
Assert.Null (Application.MdiChildes);
Assert.Empty (Application.MdiChildes);
// This will close the d because on a not MdiContainer the Application.Current it always used.
Application.RequestStop (top1);
Assert.True (Application.Current == d);
@@ -94,19 +94,26 @@ namespace Terminal.Gui.TopLevelTests {
d.Closed += (e) => Application.RequestStop (top1);
Application.Iteration += () => {
Assert.Null (Application.MdiChildes);
if (iterations == 4) Assert.True (Application.Current == d);
else if (iterations == 3) Assert.True (Application.Current == top4);
else if (iterations == 2) Assert.True (Application.Current == top3);
else if (iterations == 1) Assert.True (Application.Current == top2);
else Assert.True (Application.Current == top1);
Assert.Empty (Application.MdiChildes);
if (iterations == 4) {
Assert.True (Application.Current == d);
} else if (iterations == 3) {
Assert.True (Application.Current == top4);
} else if (iterations == 2) {
Assert.True (Application.Current == top3);
} else if (iterations == 1) {
Assert.True (Application.Current == top2);
} else {
Assert.True (Application.Current == top1);
}
Application.RequestStop (top1);
iterations--;
};
Application.Run (top1);
Assert.Null (Application.MdiChildes);
Assert.Empty (Application.MdiChildes);
}
class Mdi : Toplevel {
@@ -166,7 +173,9 @@ else Assert.True (Application.Current == top1);
Assert.False (d.Running);
} else {
Assert.Equal (iterations, Application.MdiChildes.Count);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.MdiChildes [i].Id);
for (int i = 0; i < iterations; i++) {
Assert.Equal ((iterations - i + 1).ToString (), Application.MdiChildes [i].Id);
}
}
iterations--;
};
@@ -224,7 +233,9 @@ else Assert.True (Application.Current == top1);
Assert.False (d.Running);
} else {
Assert.Equal (iterations, Application.MdiChildes.Count);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.MdiChildes [i].Id);
for (int i = 0; i < iterations; i++) {
Assert.Equal ((iterations - i + 1).ToString (), Application.MdiChildes [i].Id);
}
}
iterations--;
};
@@ -283,7 +294,9 @@ else Assert.True (Application.Current == top1);
Assert.False (d.Running);
} else {
Assert.Equal (iterations, Application.MdiChildes.Count);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.MdiChildes [i].Id);
for (int i = 0; i < iterations; i++) {
Assert.Equal ((iterations - i + 1).ToString (), Application.MdiChildes [i].Id);
}
}
iterations--;
};
@@ -381,7 +394,9 @@ else Assert.True (Application.Current == top1);
Assert.False (Application.Current.Running);
} else {
Assert.Equal (iterations, Application.MdiChildes.Count);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + 1).ToString (), Application.MdiChildes [i].Id);
for (int i = 0; i < iterations; i++) {
Assert.Equal ((iterations - i + 1).ToString (), Application.MdiChildes [i].Id);
}
}
iterations--;
};
@@ -448,8 +463,10 @@ else Assert.True (Application.Current == top1);
Assert.True (c4.Running);
} else {
Assert.Equal (iterations, Application.MdiChildes.Count);
for (int i = 0; i < iterations; i++) Assert.Equal ((iterations - i + (iterations == 4 && i == 0 ? 2 : 1)).ToString (),
for (int i = 0; i < iterations; i++) {
Assert.Equal ((iterations - i + (iterations == 4 && i == 0 ? 2 : 1)).ToString (),
Application.MdiChildes [i].Id);
}
}
iterations--;
};
@@ -571,7 +588,10 @@ else Assert.True (Application.Current == top1);
};
stage.Closed += (_) => {
if (iterations == 11) allStageClosed = true;
if (iterations == 11) {
allStageClosed = true;
}
Assert.Equal (iterations, Application.MdiChildes.Count);
if (running) {
stageCompleted = true;
@@ -593,12 +613,15 @@ else Assert.True (Application.Current == top1);
running = false;
Assert.Equal (iterations, Application.MdiChildes.Count);
} else if (!mdiRequestStop && running && !allStageClosed) Assert.Equal (iterations, Application.MdiChildes.Count);
else if (!mdiRequestStop && !running && allStageClosed) {
} else if (!mdiRequestStop && running && !allStageClosed) {
Assert.Equal (iterations, Application.MdiChildes.Count);
} else if (!mdiRequestStop && !running && allStageClosed) {
Assert.Equal (iterations, Application.MdiChildes.Count);
mdiRequestStop = true;
mdi.RequestStop ();
} else Assert.Empty (Application.MdiChildes);
} else {
Assert.Empty (Application.MdiChildes);
}
};
Application.Run (mdi);

1880
UnitTests/TopLevels/ToplevelTests.cs
View File

File diff suppressed because it is too large Load Diff

110
UnitTests/TopLevels/WindowTests.cs
View File

@@ -253,5 +253,115 @@ namespace Terminal.Gui.TopLevelTests {
var exception = Record.Exception (() => win.ProcessHotKey (new KeyEvent (Key.AltMask, new KeyModifiers { Alt = true })));
Assert.Null (exception);
}
[Fact, AutoInitShutdown]
public void Adding_Center_Window_Child_To_Window_Parent_Always_LayoutSubviews ()
{
var parentWin = new Window ();
View childWin = null;
var menu = new MenuBar (new MenuBarItem [] {
new MenuBarItem ("Child", new MenuItem [] {
new MenuItem ("_Create Child", "", () => {
childWin = new Window () {
X = Pos.Center (),
Y = Pos.Center (),
Width = 10,
Height = 10
};
parentWin.Add (childWin);
})
}),
new MenuBarItem ("View", new MenuBarItem [] {
new MenuBarItem ("Create", new MenuItem [] {
new MenuItem("_TextField", "", () => {
var tf = new TextField ("Test") {
X = Pos.Center (),
Y = Pos.Center (),
Width = 5
};
childWin.Add (tf);
})
})
})
});
parentWin.Add (menu);
Application.Top.Add (parentWin);
Application.Begin (Application.Top);
((FakeDriver)Application.Driver).SetBufferSize (20, 20);
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──────────────────┐
│ Child View │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
└──────────────────┘", output);
Assert.True (parentWin.ProcessHotKey (new KeyEvent (Key.C | Key.AltMask, new KeyModifiers { Alt = true })));
Application.MainLoop.MainIteration ();
parentWin.Redraw (parentWin.Bounds);
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──────────────────┐
│ Child View │
│ │
│ │
│ │
│ ┌────────┐ │
│ │ │ │
│ │ │ │
│ │ │ │
│ │ │ │
│ │ │ │
│ │ │ │
│ │ │ │
│ │ │ │
│ └────────┘ │
│ │
│ │
│ │
│ │
└──────────────────┘", output);
Assert.True (parentWin.ProcessHotKey (new KeyEvent (Key.T | Key.AltMask, new KeyModifiers { Alt = true })));
Application.MainLoop.MainIteration ();
childWin.Redraw (childWin.Bounds);
TestHelpers.AssertDriverContentsWithFrameAre (@"
┌──────────────────┐
│ Child View │
│ │
│ │
│ │
│ ┌────────┐ │
│ │ │ │
│ │ │ │
│ │ │ │
│ │ Test │ │
│ │ │ │
│ │ │ │
│ │ │ │
│ │ │ │
│ └────────┘ │
│ │
│ │
│ │
│ │
└──────────────────┘", output);
}
}
}