Fix SimpleStackPanel issue with hidden children (#74)

Kinnara · Apr 22, 2020 · e0443a3 · e0443a3
1 parent 084a562
commit e0443a3
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/ModernWpf/Controls/SimpleStackPanel.cs b/ModernWpf/Controls/SimpleStackPanel.cs
@@ -107,7 +107,7 @@ protected override Size MeasureOverride(Size constraint)
 
                 if (child == null) { continue; }
 
-                bool isVisible = child.Visibility == Visibility.Visible;
+                bool isVisible = child.Visibility != Visibility.Collapsed;
 
                 if (isVisible && !hasVisibleChild)
                 {
@@ -178,7 +178,10 @@ protected override Size ArrangeOverride(Size arrangeSize)
                     rcChild.Width = Math.Max(arrangeSize.Width, child.DesiredSize.Width);
                 }
 
-                previousChildSize += spacing;
+                if (child.Visibility != Visibility.Collapsed)
+                {
+                    previousChildSize += spacing;
+                }
 
                 child.Arrange(rcChild);
             }