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

Change _lines field to Lines property.

Browse Source
This commit is contained in:
BDisp
2023-11-14 20:31:19 +00:00
parent 69a7f17f19
commit ab6c5f3094
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Terminal.Gui/Drawing/LineCanvas.cs
View File

@@ -84,7 +84,10 @@ namespace Terminal.Gui {
}
}
private List<StraightLine> _lines = new List<StraightLine> ();
/// <summary>
/// Get or sets a list of <see cref="StraightLine"/> lines.
/// </summary>
public List<StraightLine> Lines { get; internal set; } = new List<StraightLine> ();
Dictionary<IntersectionRuneType, IntersectionRuneResolver> runeResolvers = new Dictionary<IntersectionRuneType, IntersectionRuneResolver> {
{IntersectionRuneType.ULCorner,new ULIntersectionRuneResolver()},
@@ -122,7 +125,7 @@ namespace Terminal.Gui {
public void AddLine (Point start, int length, Orientation orientation, LineStyle style, Attribute? attribute = default)
{
_cachedBounds = Rect.Empty;
_lines.Add (new StraightLine (start, length, orientation, style, attribute));
Lines.Add (new StraightLine (start, length, orientation, style, attribute));
}
/// <summary>
@@ -132,7 +135,7 @@ namespace Terminal.Gui {
public void AddLine (StraightLine line)
{
_cachedBounds = Rect.Empty;
_lines.Add (line);
Lines.Add (line);
}
/// <summary>
@@ -141,9 +144,9 @@ namespace Terminal.Gui {
/// <returns></returns>
public StraightLine RemoveLastLine()
{
var l = _lines.LastOrDefault ();
var l = Lines.LastOrDefault ();
if(l != null) {
_lines.Remove(l);
Lines.Remove(l);
}
return l!;
@@ -155,7 +158,7 @@ namespace Terminal.Gui {
public void Clear ()
{
_cachedBounds = Rect.Empty;
_lines.Clear ();
Lines.Clear ();
}
/// <summary>
@@ -177,14 +180,14 @@ namespace Terminal.Gui {
public Rect Bounds {
get {
if (_cachedBounds.IsEmpty) {
if (_lines.Count == 0) {
if (Lines.Count == 0) {
return _cachedBounds;
}
Rect bounds = _lines [0].Bounds;
Rect bounds = Lines [0].Bounds;
for (var i = 1; i < _lines.Count; i++) {
var line = _lines [i];
for (var i = 1; i < Lines.Count; i++) {
var line = Lines [i];
var lineBounds = line.Bounds;
bounds = Rect.Union (bounds, lineBounds);
}
@@ -220,7 +223,7 @@ namespace Terminal.Gui {
for (int y = inArea.Y; y < inArea.Y + inArea.Height; y++) {
for (int x = inArea.X; x < inArea.X + inArea.Width; x++) {
var intersects = _lines
var intersects = Lines
.Select (l => l.Intersects (x, y))
.Where (i => i != null)
.ToArray ();
@@ -250,7 +253,7 @@ namespace Terminal.Gui {
for (int y = Bounds.Y; y < Bounds.Y + Bounds.Height; y++) {
for (int x = Bounds.X; x < Bounds.X + Bounds.Width; x++) {
var intersects = _lines
var intersects = Lines
.Select (l => l.Intersects (x, y))
.Where (i => i != null)
.ToArray ();
@@ -721,7 +724,7 @@ namespace Terminal.Gui {
/// <param name="lineCanvas"></param>
public void Merge (LineCanvas lineCanvas)
{
foreach (var line in lineCanvas._lines) {
foreach (var line in lineCanvas.Lines) {
AddLine (line);
}
}

3
Terminal.Gui/Views/TabView.cs
View File

@@ -187,9 +187,12 @@ namespace Terminal.Gui {
// How much space do we need to leave at the bottom to show the tabs
int spaceAtBottom = Math.Max (0, GetTabHeight (false) - 1);
int startAtY = Math.Max (0, GetTabHeight (true) - 1);
var lc = new LineCanvas () { Lines = new List<StraightLine> (LineCanvas.Lines) };
DrawFrame (new Rect (0, startAtY, Bounds.Width,
Math.Max (Bounds.Height - spaceAtBottom - startAtY, 0)), LineStyle.Single);
LineCanvas.Lines = lc.Lines;
}
if (Tabs.Any ()) {

1
UICatalog/Scenarios/TabViewExample.cs
View File

@@ -57,6 +57,7 @@ namespace UICatalog.Scenarios {
Y = 0,
Width = 60,
Height = 20,
BorderStyle = LineStyle.Single
};
tabView.AddTab (new Tab ("Tab1", new Label ("hodor!")), false);