Fix CirclePanel and HoneycombPanel when contains collapsed element

ghost1372 · ghost1372 · commit 1caf9e3ae5d5 · 2026-06-01T01:10:40.000+03:30
diff --git a/dev/DevWinUI/Controls/Native/Panel/CirclePanel.cs b/dev/DevWinUI/Controls/Native/Panel/CirclePanel.cs
@@ -32,11 +32,13 @@ protected override Size MeasureOverride(Size availableSize)
     {
         var diameter = Diameter;
 
-        if (Children.Count == 0) return new Size(diameter, diameter);
+        var layoutChildren = Children.OfType<UIElement>().Where(element => element.Visibility != Visibility.Collapsed).ToList();
+
+        if (layoutChildren.Count == 0) return new Size(diameter, diameter);
 
         var newSize = new Size(diameter, diameter);
 
-        foreach (UIElement element in Children)
+        foreach (var element in layoutChildren)
         {
             element.Measure(newSize);
         }
@@ -49,11 +51,18 @@ protected override Size ArrangeOverride(Size finalSize)
         var keepVertical = KeepVertical;
         var offsetAngle = OffsetAngle;
 
+        var layoutChildren = Children.OfType<UIElement>().Where(element => element.Visibility != Visibility.Collapsed).ToList();
+
+        if (layoutChildren.Count == 0)
+        {
+            return finalSize;
+        }
+
         var i = 0;
-        var perDeg = 360.0 / Children.Count;
+        var perDeg = 360.0 / layoutChildren.Count;
         var radius = Diameter / 2;
 
-        foreach (UIElement element in Children)
+        foreach (var element in layoutChildren)
         {
             var centerX = element.DesiredSize.Width / 2.0;
             var centerY = element.DesiredSize.Height / 2.0;
diff --git a/dev/DevWinUI/Controls/Native/Panel/HoneycombPanel.cs b/dev/DevWinUI/Controls/Native/Panel/HoneycombPanel.cs
@@ -56,20 +56,19 @@ protected override Size MeasureOverride(Size availableSize)
     {
         var maxSize = new Size();
 
-        foreach (UIElement child in Children)
+        var layoutChildren = Children.Cast<UIElement>().Where(child => child != null && child.Visibility != Visibility.Collapsed).ToList();
+
+        foreach (var child in layoutChildren)
         {
-            if (child != null)
-            {
-                child.Measure(availableSize);
-                maxSize.Width = Math.Max(maxSize.Width, child.DesiredSize.Width);
-                maxSize.Height = Math.Max(maxSize.Height, child.DesiredSize.Height);
-            }
+            child.Measure(availableSize);
+            maxSize.Width = Math.Max(maxSize.Width, child.DesiredSize.Width);
+            maxSize.Height = Math.Max(maxSize.Height, child.DesiredSize.Height);
         }
 
         _unitLength = Math.Max(maxSize.Width, maxSize.Height) / 2;
 
-        var xCount = GetXCount(Children.Count);
-        var yCount = GetYCount(Children.Count);
+        var xCount = GetXCount(layoutChildren.Count);
+        var yCount = GetYCount(layoutChildren.Count);
 
         var availableWidth = xCount * _unitLength;
         var availableHeight = yCount * Math.Pow(3, 0.5) * _unitLength + _unitLength * 2;
@@ -85,6 +84,7 @@ protected override Size ArrangeOverride(Size finalSize)
 
         foreach (UIElement child in Children)
         {
+            if (child == null || child.Visibility == Visibility.Collapsed) continue;
             child.Arrange(_stuffer.Move());
         }
 
