Replaced Horizontal/Vertical Spacing with Item/Line spacing

Author: Avid29

components/WrapPanel2/samples/WrapPanel2BasicSample.xaml

@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <Page x:Class="WrapPanel2Experiment.Samples.WrapPanel2BasicSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -24,12 +24,12 @@
           Margin="16">
         <controls:WrapPanel2 HorizontalAlignment="{x:Bind LayoutHorizontalAlignment, Mode=OneWay}"
                              VerticalAlignment="{x:Bind LayoutVerticalAlignment, Mode=OneWay}"
+                             Orientation="{x:Bind local:WrapPanel2BasicSample.ConvertStringToOrientation(LayoutOrientation), Mode=OneWay}"
+                             ItemSpacing="{x:Bind ItemSpacing, Mode=OneWay}"
+                             LineSpacing="{x:Bind LineSpacing, Mode=OneWay}"
                              FixedRowLengths="{x:Bind FixedRowLengths, Mode=OneWay}"
                              ForcedStretchMethod="{x:Bind local:WrapPanel2BasicSample.ConvertStringToForcedStretchMethod(LayoutForcedStretchMethod), Mode=OneWay}"
-                             HorizontalSpacing="{x:Bind HorizontalSpacing, Mode=OneWay}"
-                             Orientation="{x:Bind local:WrapPanel2BasicSample.ConvertStringToOrientation(LayoutOrientation), Mode=OneWay}"
-                             OverflowBehavior="{x:Bind local:WrapPanel2BasicSample.ConvertStringToOverflowBehavior(LayoutOverflowBehavior), Mode=OneWay}"
-                             VerticalSpacing="{x:Bind VerticalSpacing, Mode=OneWay}">
+                             OverflowBehavior="{x:Bind local:WrapPanel2BasicSample.ConvertStringToOverflowBehavior(LayoutOverflowBehavior), Mode=OneWay}">
             <Border controls:WrapPanel2.LayoutLength="2*">
                 <TextBlock HorizontalAlignment="Center"
                            Text="2*" />

components/WrapPanel2/samples/WrapPanel2BasicSample.xaml.cs

@@ -12,8 +12,8 @@ namespace WrapPanel2Experiment.Samples;
 [ToolkitSampleMultiChoiceOption("LayoutOrientation", "Horizontal", "Vertical", Title = "Orientation")]
 [ToolkitSampleMultiChoiceOption("LayoutHorizontalAlignment", "Left", "Center", "Right", "Stretch", Title = "Horizontal Alignment")]
 [ToolkitSampleMultiChoiceOption("LayoutVerticalAlignment", "Top", "Center", "Bottom", "Stretch", Title = "Vertical Alignment")]
-[ToolkitSampleNumericOption("HorizontalSpacing", 8, 0, 16, Title = "Horizontal Spacing")]
-[ToolkitSampleNumericOption("VerticalSpacing", 2, 0, 16, Title = "Vertical Spacing")]
+[ToolkitSampleNumericOption("ItemSpacing", 8, 0, 16, Title = "Item Spacing")]
+[ToolkitSampleNumericOption("LineSpacing", 2, 0, 16, Title = "Line Spacing")]
 [ToolkitSampleBoolOption("FixedRowLengths", false, Title = "Fixed Row Lengths")]
 [ToolkitSampleMultiChoiceOption("LayoutForcedStretchMethod", "None", "First", "Last", "Equal", "Proportional", Title = "Forced Stretch Method")]
 [ToolkitSampleMultiChoiceOption("LayoutOverflowBehavior", "Wrap", "Drop", Title = "Overflow Behavior")]

components/WrapPanel2/src/WrapPanel2.Properties.cs

@@ -26,19 +26,19 @@ public partial class WrapPanel2
         new PropertyMetadata(default(Orientation), OnPropertyChanged));
 
     /// <summary>
-    /// Backing <see cref="DependencyProperty"/> for the <see cref="HorizontalSpacing"/> property.
+    /// Backing <see cref="DependencyProperty"/> for the <see cref="ItemSpacing"/> property.
     /// </summary>
-    public static readonly DependencyProperty HorizontalSpacingProperty = DependencyProperty.Register(
-        nameof(HorizontalSpacing),
+    public static readonly DependencyProperty ItemSpacingProperty = DependencyProperty.Register(
+        nameof(ItemSpacing),
         typeof(double),
         typeof(WrapPanel2),
         new PropertyMetadata(default(double), OnPropertyChanged));
 
     /// <summary>
-    /// Backing <see cref="DependencyProperty"/> for the <see cref="VerticalSpacing"/> property.
+    /// Backing <see cref="DependencyProperty"/> for the <see cref="LineSpacing"/> property.
     /// </summary>
-    public static readonly DependencyProperty VerticalSpacingProperty = DependencyProperty.Register(
-        nameof(VerticalSpacing),
+    public static readonly DependencyProperty lineSpacingProperty = DependencyProperty.Register(
+        nameof(LineSpacing),
         typeof(double),
         typeof(WrapPanel2),
         new PropertyMetadata(default(double), OnPropertyChanged));
@@ -80,21 +80,21 @@ public Orientation Orientation
     }
 
     /// <summary>
-    /// Gets or sets the horizontal spacing between items.
+    /// Gets or sets the spacing between items.
     /// </summary>
-    public double HorizontalSpacing
+    public double ItemSpacing
     {
-        get => (double)GetValue(HorizontalSpacingProperty);
-        set => SetValue(HorizontalSpacingProperty, value);
+        get => (double)GetValue(ItemSpacingProperty);
+        set => SetValue(ItemSpacingProperty, value);
     }
 
     /// <summary>
     /// Gets or sets the vertical spacing between items.
     /// </summary>
-    public double VerticalSpacing
+    public double LineSpacing
     {
-        get => (double)GetValue(VerticalSpacingProperty);
-        set => SetValue(VerticalSpacingProperty, value);
+        get => (double)GetValue(lineSpacingProperty);
+        set => SetValue(lineSpacingProperty, value);
     }
 
     /// <summary>

components/WrapPanel2/src/WrapPanel2.cs

@@ -20,7 +20,6 @@ protected override Size MeasureOverride(Size availableSize)
 
         // Define XY/UV coordinate variables
         var uvAvailableSize = new UVCoord(availableSize.Width, availableSize.Height, Orientation);
-        var uvSpacing = new UVCoord(HorizontalSpacing, VerticalSpacing, Orientation);
 
         RowSpec currentRowSpec = default;
 
@@ -41,7 +40,7 @@ protected override Size MeasureOverride(Size availableSize)
 
             // Attempt to add the child to the current row/column
             var spec = new RowSpec(layoutLength, uvDesiredSize);
-            if (!currentRowSpec.TryAdd(spec, uvSpacing.U, uvAvailableSize.U))
+            if (!currentRowSpec.TryAdd(spec, ItemSpacing, uvAvailableSize.U))
             {
                 // If the overflow behavior is drop, just end the row here.
                 if (OverflowBehavior is OverflowBehavior.Drop)
@@ -50,20 +49,20 @@ protected override Size MeasureOverride(Size availableSize)
                 // Could not add to current row/column
                 // Start a new row/column
                 _rowSpecs.Add(currentRowSpec);
-                _longestRowSize = Math.Max(_longestRowSize, currentRowSpec.Measure(uvSpacing.U));
+                _longestRowSize = Math.Max(_longestRowSize, currentRowSpec.Measure(ItemSpacing));
                 currentRowSpec = spec;
             }
         }
 
         // Add the final row/column
         _rowSpecs.Add(currentRowSpec);
-        _longestRowSize = Math.Max(_longestRowSize, currentRowSpec.Measure(uvSpacing.U));
+        _longestRowSize = Math.Max(_longestRowSize, currentRowSpec.Measure(ItemSpacing));
 
         // Calculate final desired size
         var uvSize = new UVCoord(0, 0, Orientation)
         {
             U = IsMainAxisStretch(uvAvailableSize.U) ? uvAvailableSize.U : _longestRowSize,
-            V = _rowSpecs.Sum(static rs => rs.MaxOffAxisSize) + (uvSpacing.V * (_rowSpecs.Count - 1))
+            V = _rowSpecs.Sum(static rs => rs.MaxOffAxisSize) + (LineSpacing * (_rowSpecs.Count - 1))
         };
 
         // Clamp to available size and return
@@ -82,18 +81,17 @@ protected override Size ArrangeOverride(Size finalSize)
         // Create XY/UV coordinate variables
         var pos = new UVCoord(0, 0, Orientation);
         var uvFinalSize = new UVCoord(finalSize, Orientation);
-        var uvSpacing = new UVCoord(HorizontalSpacing, VerticalSpacing, Orientation);
 
         // Adjust the starting position based on off-axis alignment
-        var contentHeight = _rowSpecs.Sum(static rs => rs.MaxOffAxisSize) + (uvSpacing.V * (_rowSpecs.Count - 1));
+        var contentHeight = _rowSpecs.Sum(static rs => rs.MaxOffAxisSize) + (LineSpacing * (_rowSpecs.Count - 1));
         pos.V = GetStartByAlignment(GetOffAlignment(), contentHeight, uvFinalSize.V);
 
         var childQueue = new Queue<UIElement>(Children.Where(static e => e.Visibility is Visibility.Visible));
 
         foreach (var row in _rowSpecs)
         {
             // Arrange the row/column
-            ArrangeRow(ref pos, row, uvFinalSize, uvSpacing, childQueue);
+            ArrangeRow(ref pos, row, uvFinalSize, childQueue);
         }
 
         // "Arrange" remaning children by rendering them with zero size
@@ -106,9 +104,9 @@ protected override Size ArrangeOverride(Size finalSize)
         return finalSize;
     }
 
-    private void ArrangeRow(ref UVCoord pos, RowSpec row, UVCoord uvFinalSize, UVCoord uvSpacing, Queue<UIElement> childQueue)
+    private void ArrangeRow(ref UVCoord pos, RowSpec row, UVCoord uvFinalSize, Queue<UIElement> childQueue)
     {
-        var spacingTotalSize = uvSpacing.U * (row.ItemsCount - 1);
+        var spacingTotalSize = ItemSpacing * (row.ItemsCount - 1);
         var remainingSpace = uvFinalSize.U - row.ReservedSpace - spacingTotalSize;
         var portionSize = row.MinPortionSize;
 
@@ -130,7 +128,7 @@ private void ArrangeRow(ref UVCoord pos, RowSpec row, UVCoord uvFinalSize, UVCoo
         // Also do this if there are no star-sized items in the row/column and no forced streching is in use.
         if (!stretch || (row.PortionsSum is 0 && ForcedStretchMethod is ForcedStretchMethod.None))
         {
-            var rowSize = row.Measure(uvSpacing.U);
+            var rowSize = row.Measure(ItemSpacing);
             pos.U = GetStartByAlignment(GetAlignment(), rowSize, uvFinalSize.U);
         }
 
@@ -184,11 +182,11 @@ private void ArrangeRow(ref UVCoord pos, RowSpec row, UVCoord uvFinalSize, UVCoo
             child.Arrange(new Rect(pos.X, pos.Y, size.X, size.Y));
 
             // Advance the position
-            pos.U += size.U + uvSpacing.U;
+            pos.U += size.U + ItemSpacing;
         }
 
         // Advance to the next row/column
-        pos.V += row.MaxOffAxisSize + uvSpacing.V;
+        pos.V += row.MaxOffAxisSize + LineSpacing;
     }
 
     private UVCoord GetChildSize(UIElement child, int indexInRow, RowSpec row, double portionSize, bool forceStretch)