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

Fix a bug where a focused view was receiving the Leave event.

Browse Source
This commit is contained in:
BDisp
2023-08-15 16:29:07 +01:00
parent aa4f9c108f
commit de909b86cd
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Terminal.Gui/Core/Toplevel.cs
View File

@@ -570,9 +570,6 @@ namespace Terminal.Gui {
///<inheritdoc/>
public override void Remove (View view)
{
if (InternalSubviews.Count < 1) {
CanFocus = false;
}
if (this is Toplevel toplevel && toplevel.MenuBar != null) {
RemoveMenuStatusBar (view);
}

3
Terminal.Gui/Core/Window.cs
View File

@@ -270,9 +270,6 @@ namespace Terminal.Gui {
SetNeedsDisplay ();
contentView.Remove (view);
if (contentView.InternalSubviews.Count < 1) {
CanFocus = false;
}
RemoveMenuStatusBar (view);
if (view != contentView && Focused == null) {
FocusFirst ();

3
UnitTests/TopLevels/ToplevelTests.cs
View File

@@ -1009,7 +1009,8 @@ namespace Terminal.Gui.TopLevelTests {
Application.End (rs);
Assert.True (isEnter);
Assert.True (isLeave); // Leave event is now also invoked on Application.End allowing preform same output action
Assert.False (isLeave); // Leave event cannot be trigger because it v.Enter was performed and v is focused
Assert.True (v.HasFocus);
}
[Fact, AutoInitShutdown]