Browse Source

More code reduction. Put these in a primary constructor. Update uses.

Brandon Thetford 11 months ago
parent
commit
219cfb559a

+ 4 - 6
Terminal.Gui/View/Layout/Dim.cs

@@ -113,12 +113,10 @@ public abstract record Dim : IEqualityOperators<Dim, Dim, bool>
     /// <param name="maximumContentDim">The maximum dimension the View's ContentSize will be fit to.</param>
     public static Dim? Auto (DimAutoStyle style = DimAutoStyle.Auto, Dim? minimumContentDim = null, Dim? maximumContentDim = null)
     {
-        return new DimAuto ()
-        {
-            MinimumContentDim = minimumContentDim,
-            MaximumContentDim = maximumContentDim,
-            Style = style
-        };
+        return new DimAuto (
+                            MinimumContentDim: minimumContentDim,
+                            MaximumContentDim: maximumContentDim,
+                            Style: style);
     }
 
     /// <summary>

+ 3 - 21
Terminal.Gui/View/Layout/DimAuto.cs

@@ -15,29 +15,11 @@ namespace Terminal.Gui;
 ///         methods on the <see cref="Dim"/> class to create <see cref="Dim"/> objects instead.
 ///     </para>
 /// </remarks>
+/// <param name="MaximumContentDim">The maximum dimension the View's ContentSize will be fit to. NOT CURRENTLY SUPPORTED.</param>
+/// <param name="MinimumContentDim">The minimum dimension the View's ContentSize will be constrained to.</param>
+/// <param name="Style">The <see cref="DimAutoStyle"/> of the <see cref="DimAuto"/>.</param>
 public record DimAuto (Dim? MaximumContentDim, Dim? MinimumContentDim, DimAutoStyle Style) : Dim
 {
-    /// <summary>
-    ///     Gets the maximum dimension the View's ContentSize will be fit to. NOT CURRENTLY SUPPORTED.
-    /// </summary>
-
-    // ReSharper disable once ConvertToAutoProperty
-    public required Dim? MaximumContentDim { get; init; } = MaximumContentDim;
-
-    /// <summary>
-    ///     Gets the minimum dimension the View's ContentSize will be constrained to.
-    /// </summary>
-
-    // ReSharper disable once ConvertToAutoProperty
-    public required Dim? MinimumContentDim { get; init; } = MinimumContentDim;
-
-    /// <summary>
-    ///     Gets the style of the DimAuto.
-    /// </summary>
-
-    // ReSharper disable once ConvertToAutoProperty
-    public required DimAutoStyle Style { get; init; } = Style;
-
     /// <inheritdoc/>
     public override string ToString () { return $"Auto({Style},{MinimumContentDim},{MaximumContentDim})"; }
 

+ 30 - 35
UnitTests/View/Layout/Dim.AutoTests.cs

@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 using Xunit.Abstractions;
 using static Terminal.Gui.Dim;
 
@@ -203,40 +203,35 @@ public partial class DimAutoTests (ITestOutputHelper output)
     [Fact]
     public void TestEquality ()
     {
-        var a = new DimAuto
-        {
-            MaximumContentDim = null,
-            MinimumContentDim = 1,
-            Style = DimAutoStyle.Auto
-        };
-
-        var b = new DimAuto
-        {
-            MaximumContentDim = null,
-            MinimumContentDim = 1,
-            Style = DimAutoStyle.Auto
-        };
-
-        var c = new DimAuto
-        {
-            MaximumContentDim = 2,
-            MinimumContentDim = 1,
-            Style = DimAutoStyle.Auto
-        };
-
-        var d = new DimAuto
-        {
-            MaximumContentDim = null,
-            MinimumContentDim = 1,
-            Style = DimAutoStyle.Content
-        };
-
-        var e = new DimAuto
-        {
-            MaximumContentDim = null,
-            MinimumContentDim = 2,
-            Style = DimAutoStyle.Auto
-        };
+        var a = new DimAuto (
+                             MaximumContentDim: null,
+                             MinimumContentDim: 1,
+                             Style: DimAutoStyle.Auto
+                            );
+
+        var b = new DimAuto (
+                             MaximumContentDim: null,
+                             MinimumContentDim: 1,
+                             Style: DimAutoStyle.Auto
+                            );
+
+        var c = new DimAuto(
+                             MaximumContentDim: 2,
+                             MinimumContentDim: 1,
+                             Style: DimAutoStyle.Auto
+                            );
+
+        var d = new DimAuto (
+                             MaximumContentDim: null,
+                             MinimumContentDim: 1,
+                             Style: DimAutoStyle.Content
+                            );
+
+        var e = new DimAuto (
+                             MaximumContentDim: null,
+                             MinimumContentDim: 2,
+                             Style: DimAutoStyle.Auto
+                            );
 
         // Test equality with same values
         Assert.True (a.Equals (b));