Refine ToolBar spacing and collapsed layout

Author: emako

src/Wpf.Ui.Violeta/Controls/ToolBar/ToolBar.cs

@@ -236,24 +236,24 @@ private static void OnOverflowPanelWrapWidthChanged(DependencyObject d, Dependen
 
     #endregion OverflowPanelWrapWidth
 
-    #region ItemSpacing
+    #region Spacing
 
-    public static readonly DependencyProperty ItemSpacingProperty = DependencyProperty.Register(
-        nameof(ItemSpacing),
+    public static readonly DependencyProperty SpacingProperty = DependencyProperty.Register(
+        nameof(Spacing),
         typeof(double),
         typeof(ToolBar),
-        new FrameworkPropertyMetadata(6d, FrameworkPropertyMetadataOptions.AffectsMeasure, OnItemSpacingChanged));
+        new FrameworkPropertyMetadata(6d, FrameworkPropertyMetadataOptions.AffectsMeasure, OnSpacingChanged));
 
     /// <summary>
     /// Gap between adjacent items in the primary bar and the overflow flyout.
     /// </summary>
-    public double ItemSpacing
+    public double Spacing
     {
-        get => (double)GetValue(ItemSpacingProperty);
-        set => SetValue(ItemSpacingProperty, value);
+        get => (double)GetValue(SpacingProperty);
+        set => SetValue(SpacingProperty, value);
     }
 
-    private static void OnItemSpacingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    private static void OnSpacingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is ToolBar toolBar)
         {
@@ -262,7 +262,7 @@ private static void OnItemSpacingChanged(DependencyObject d, DependencyPropertyC
         }
     }
 
-    #endregion ItemSpacing
+    #endregion Spacing
 
     #region OverflowButtonStyle
 

src/Wpf.Ui.Violeta/Controls/ToolBar/ToolBarOverflowPanel.cs

@@ -54,7 +54,7 @@ protected override Size MeasureOverride(Size constraint)
     {
         SyncOverflowChildren();
 
-        double spacing = Math.Max(0, ToolBar?.ItemSpacing ?? 0);
+        double spacing = Math.Max(0, ToolBar?.Spacing ?? 0);
         double wrapWidth = WrapWidth;
         int maxItemsPerRow = MaxItemsPerRow;
         bool hasWidthLimit = wrapWidth > 0;
@@ -74,6 +74,11 @@ protected override Size MeasureOverride(Size constraint)
         foreach (UIElement child in Children)
         {
             child.Measure(infinite);
+            if (child.Visibility == Visibility.Collapsed)
+            {
+                continue;
+            }
+
             Size size = child.DesiredSize;
 
             double gap = rowItemCount > 0 ? spacing : 0;
@@ -106,7 +111,7 @@ protected override Size MeasureOverride(Size constraint)
 
     protected override Size ArrangeOverride(Size finalSize)
     {
-        double spacing = Math.Max(0, ToolBar?.ItemSpacing ?? 0);
+        double spacing = Math.Max(0, ToolBar?.Spacing ?? 0);
         double wrapWidth = WrapWidth;
         int maxItemsPerRow = MaxItemsPerRow;
         bool hasWidthLimit = wrapWidth > 0;
@@ -120,6 +125,12 @@ protected override Size ArrangeOverride(Size finalSize)
 
         foreach (UIElement child in Children)
         {
+            if (child.Visibility == Visibility.Collapsed)
+            {
+                child.Arrange(new Rect());
+                continue;
+            }
+
             Size size = child.DesiredSize;
             bool exceedsWidth = hasWidthLimit && rowItemCount > 0 && x + spacing + size.Width > limit;
             bool exceedsItemCount = hasItemLimit && rowItemCount >= maxItemsPerRow;

src/Wpf.Ui.Violeta/Controls/ToolBar/ToolBarPanel.cs

@@ -38,7 +38,7 @@ protected override Size MeasureOverride(Size constraint)
             return new Size(0, 0);
         }
 
-        double spacing = Math.Max(0, toolBar.ItemSpacing);
+        double spacing = Math.Max(0, toolBar.Spacing);
         var infinite = new Size(double.PositiveInfinity, constraint.Height);
 
         double maxHeight = 0;
@@ -133,7 +133,7 @@ private static OverflowMeasureResult MeasureOverflowPass(
 
         for (int i = 0; i < count; i++)
         {
-            if (children[i] is null)
+            if (children[i] is not { } child || child.Visibility == Visibility.Collapsed)
             {
                 continue;
             }
@@ -203,7 +203,7 @@ protected override Size ArrangeOverride(Size finalSize)
             return ArrangeAsStack(finalSize, spacing: 0);
         }
 
-        double spacing = Math.Max(0, toolBar.ItemSpacing);
+        double spacing = Math.Max(0, toolBar.Spacing);
         var generator = toolBar.ItemContainerGenerator;
         double x = 0;
         double height = finalSize.Height;
@@ -226,6 +226,12 @@ protected override Size ArrangeOverride(Size finalSize)
                 continue;
             }
 
+            if (child.Visibility == Visibility.Collapsed)
+            {
+                child.Arrange(new Rect());
+                continue;
+            }
+
             if (!first)
             {
                 x += spacing;
@@ -320,6 +326,11 @@ private Size MeasureAsStack(Size constraint, double spacing)
         foreach (UIElement child in Children)
         {
             child.Measure(infinite);
+            if (child.Visibility == Visibility.Collapsed)
+            {
+                continue;
+            }
+
             if (index > 0)
             {
                 width += spacing;
@@ -339,6 +350,12 @@ private Size ArrangeAsStack(Size finalSize, double spacing)
         bool first = true;
         foreach (UIElement child in Children)
         {
+            if (child.Visibility == Visibility.Collapsed)
+            {
+                child.Arrange(new Rect());
+                continue;
+            }
+
             if (!first)
             {
                 x += spacing;