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

Cleanup

Browse Source
This commit is contained in:
Tig
2024-05-17 16:33:53 -07:00
parent a7cb676c0b
commit a70d87ea16
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Terminal.Gui/View/Layout/PosAlign.cs
View File

@@ -44,12 +44,7 @@ public class PosAlign : Pos
/// <param name="size"></param>
private static void AlignGroup (int groupId, IList<View> views, Dimension dimension, int size)
{
if (views is null)
{
return;
}
Aligner firstInGroup = null;
Aligner? firstInGroup = null;
List<int> dimensionsList = new ();
List<View> viewsInGroup = views.Where (
@@ -76,7 +71,7 @@ public class PosAlign : Pos
foreach (View view in viewsInGroup)
{
PosAlign posAlign = dimension == Dimension.Width ? view.X as PosAlign : view.Y as PosAlign;
PosAlign? posAlign = dimension == Dimension.Width ? view.X as PosAlign : view.Y as PosAlign;
if (posAlign is { })
{
@@ -100,7 +95,7 @@ public class PosAlign : Pos
for (var index = 0; index < viewsInGroup.Count; index++)
{
View view = viewsInGroup [index];
PosAlign align = dimension == Dimension.Width ? view.X as PosAlign : view.Y as PosAlign;
PosAlign? align = dimension == Dimension.Width ? view.X as PosAlign : view.Y as PosAlign;
if (align is { })
{
@@ -125,13 +120,16 @@ public class PosAlign : Pos
private void Aligner_PropertyChanged (object? sender, PropertyChangedEventArgs e) { _location = null; }
/// <inheritdoc/>
public override bool Equals (object other)
public override bool Equals (object? other)
{
return other is PosAlign align && _groupId == align._groupId && _location == align._location && align.Aligner.Alignment == Aligner.Alignment;
return other is PosAlign align &&
_groupId == align._groupId &&
_location == align._location &&
align.Aligner.Alignment == Aligner.Alignment;
}
/// <inheritdoc/>
public override int GetHashCode () { return Aligner.GetHashCode () ^ _groupId.GetHashCode (); }
public override int GetHashCode () { return HashCode.Combine (Aligner, _groupId); }
/// <inheritdoc/>
public override string ToString () { return $"Align(groupId={_groupId}, alignment={Aligner.Alignment})"; }

1
UnitTests/Drawing/AlignerTests.cs
View File

@@ -228,7 +228,6 @@ public class AlignerTests (ITestOutputHelper output)
[InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30 }, 101, new [] { 0, 50, 71 })]
[InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 10, 30, 61 })]
[InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 10, 30, 60, 101 })]
[InlineData (Alignment.FirstLeftRestRight, new [] { 3, 4, 5 }, 21, new [] { 0, 11, 16 })]
public void Alignment_SpaceBetweenItems (Alignment alignment, int [] sizes, int containerSize, int [] expected)
{
int [] positions = new Aligner