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

Rename Rect to Rectangle in preparation for removal

Browse Source
This commit is contained in:
Brandon Thetford
2024-02-20 17:12:58 -07:00
parent 13bd11d5d0
commit a638edeeaf
106 changed files with 1261 additions and 1259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ public class LineCanvas : IDisposable
// TODO: Add other resolvers
};
private Rect _cachedBounds;
private Rectangle _cachedBounds;
/// <summary>Creates a new instance.</summary>
public LineCanvas ()
@@ -134,7 +134,7 @@ public class LineCanvas : IDisposable
Attribute? attribute = default
)
{
_cachedBounds = Rect.Empty;
_cachedBounds = Rectangle.Empty;
_lines.Add (new StraightLine (start, length, orientation, style, attribute));
}
@@ -142,14 +142,14 @@ public class LineCanvas : IDisposable
/// <param name="line"></param>
public void AddLine (StraightLine line)
{
_cachedBounds = Rect.Empty;
_cachedBounds = Rectangle.Empty;
_lines.Add (line);
}
/// <summary>Clears all lines from the LineCanvas.</summary>
public void Clear ()
{
_cachedBounds = Rect.Empty;
_cachedBounds = Rectangle.Empty;
_lines.Clear ();
}
@@ -157,7 +157,7 @@ public class LineCanvas : IDisposable
/// Clears any cached states from the canvas Call this method if you make changes to lines that have already been
/// added.
/// </summary>
public void ClearCache () { _cachedBounds = Rect.Empty; }
public void ClearCache () { _cachedBounds = Rectangle.Empty; }
/// <summary>
/// Evaluates the lines that have been added to the canvas and returns a map containing the glyphs and their
@@ -200,7 +200,7 @@ public class LineCanvas : IDisposable
/// </summary>
/// <param name="inArea">A rectangle to constrain the search by.</param>
/// <returns>A map of the points within the canvas that intersect with <paramref name="inArea"/>.</returns>
public Dictionary<Point, Rune> GetMap (Rect inArea)
public Dictionary<Point, Rune> GetMap (Rectangle inArea)
{
Dictionary<Point, Rune> map = new ();

4
Terminal.Gui/Drawing/StraightLine.cs
View File

@@ -45,7 +45,7 @@ public class StraightLine
/// Gets the rectangle that describes the bounds of the canvas. Location is the coordinates of the line that is
/// furthest left/top and Size is defined by the line that extends the furthest right/bottom.
/// </summary>
internal Rect Bounds
internal Rectangle Bounds
{
get
{
@@ -59,7 +59,7 @@ public class StraightLine
int width = Orientation == Orientation.Horizontal ? size : 1;
int height = Orientation == Orientation.Vertical ? size : 1;
return new Rect (x, y, width, height);
return new Rectangle (x, y, width, height);
}
}

24
Terminal.Gui/Drawing/Thickness.cs
View File

@@ -9,10 +9,10 @@ namespace Terminal.Gui;
/// </summary>
/// <remarks>
/// <para>
/// Use the helper API (<see cref="GetInside(Rect)"/> to get the rectangle describing the insides of the frame,
/// Use the helper API (<see cref="GetInside(Rectangle)"/> to get the rectangle describing the insides of the frame,
/// with the thickness widths subtracted.
/// </para>
/// <para>Use the helper API (<see cref="Draw(Rect, string)"/> to draw the frame with the specified thickness.</para>
/// <para>Use the helper API (<see cref="Draw(Rectangle, string)"/> to draw the frame with the specified thickness.</para>
/// </remarks>
public class Thickness : IEquatable<Thickness>
{
@@ -87,15 +87,15 @@ public class Thickness : IEquatable<Thickness>
/// <summary>
/// Gets whether the specified coordinates lie within the thickness (inside the bounding rectangle but outside of
/// the rectangle described by <see cref="GetInside(Rect)"/>.
/// the rectangle described by <see cref="GetInside(Rectangle)"/>.
/// </summary>
/// <param name="outside">Describes the location and size of the rectangle that contains the thickness.</param>
/// <param name="x">The x coord to check.</param>
/// <param name="y">The y coord to check.</param>
/// <returns><see langword="true"/> if the specified coordinate is within the thickness; <see langword="false"/> otherwise.</returns>
public bool Contains (Rect outside, int x, int y)
public bool Contains (Rectangle outside, int x, int y)
{
Rect inside = GetInside (outside);
Rectangle inside = GetInside (outside);
return outside.Contains (x, y) && !inside.Contains (x, y);
}
@@ -111,11 +111,11 @@ public class Thickness : IEquatable<Thickness>
/// <param name="rect">The location and size of the rectangle that bounds the thickness rectangle, in screen coordinates.</param>
/// <param name="label">The diagnostics label to draw on the bottom of the <see cref="Bottom"/>.</param>
/// <returns>The inner rectangle remaining to be drawn.</returns>
public Rect Draw (Rect rect, string label = null)
public Rectangle Draw (Rectangle rect, string label = null)
{
if (rect.Size.Width < 1 || rect.Size.Height < 1)
{
return Rect.Empty;
return Rectangle.Empty;
}
var clearChar = (Rune)' ';
@@ -141,20 +141,20 @@ public class Thickness : IEquatable<Thickness>
// Draw the Top side
if (Top > 0)
{
Application.Driver.FillRect (new Rect (rect.X, rect.Y, rect.Width, Math.Min (rect.Height, Top)), topChar);
Application.Driver.FillRect (new Rectangle (rect.X, rect.Y, rect.Width, Math.Min (rect.Height, Top)), topChar);
}
// Draw the Left side
if (Left > 0)
{
Application.Driver.FillRect (new Rect (rect.X, rect.Y, Math.Min (rect.Width, Left), rect.Height), leftChar);
Application.Driver.FillRect (new Rectangle (rect.X, rect.Y, Math.Min (rect.Width, Left), rect.Height), leftChar);
}
// Draw the Right side
if (Right > 0)
{
Application.Driver.FillRect (
new Rect (
new Rectangle (
Math.Max (0, rect.X + rect.Width - Right),
rect.Y,
Math.Min (rect.Width, Right),
@@ -168,7 +168,7 @@ public class Thickness : IEquatable<Thickness>
if (Bottom > 0)
{
Application.Driver.FillRect (
new Rect (
new Rectangle (
rect.X,
rect.Y + Math.Max (0, rect.Height - Bottom),
rect.Width,
@@ -266,7 +266,7 @@ public class Thickness : IEquatable<Thickness>
/// </remarks>
/// <param name="rect">The source rectangle</param>
/// <returns></returns>
public Rect GetInside (Rect rect)
public Rectangle GetInside (Rectangle rect)
{
int x = rect.X + Left;
int y = rect.Y + Top;