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

Merge branch 'v2_develop' into v2_drawframe-method_2983

Browse Source
This commit is contained in:
Tig
2023-11-16 06:16:58 -08:00
committed by GitHub
parent 4c37ae1827 8cb10f8f09
commit 98f9e1e856
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Terminal.Gui/View/View.cs
View File

@@ -495,7 +495,7 @@ namespace Terminal.Gui {
protected override void Dispose (bool disposing)
{
LineCanvas.Dispose ();
Margin?.Dispose ();
Margin = null;
Border?.Dispose ();
@@ -513,8 +513,9 @@ namespace Terminal.Gui {
Remove (subview);
subview.Dispose ();
}
base.Dispose (disposing);
System.Diagnostics.Debug.Assert (InternalSubviews.Count == 0);
}
}
}

12
Terminal.Gui/Views/Wizard/WizardStep.cs
View File

@@ -1,4 +1,4 @@
namespace Terminal.Gui;
namespace Terminal.Gui;
/// <summary>
/// Represents a basic step that is displayed in a <see cref="Wizard"/>. The <see cref="WizardStep"/> view is divided horizontally in two. On the left is the
@@ -39,7 +39,7 @@ public class WizardStep : FrameView {
//private string title = string.Empty;
// The contentView works like the ContentView in FrameView.
private View contentView = new View () { Data = "WizardContentView" };
private View contentView = new View () { Id = "WizardContentView" };
/// <summary>
/// Sets or gets help text for the <see cref="WizardStep"/>.If <see cref="WizardStep.HelpText"/> is empty
@@ -185,8 +185,12 @@ public class WizardStep : FrameView {
}
SetNeedsDisplay ();
var touched = view.Frame;
contentView.Remove (view);
var container = view?.SuperView;
if (container == this) {
base.Remove (view);
} else {
container?.Remove (view);
}
if (contentView.InternalSubviews.Count < 1) {
this.CanFocus = false;