Fix #222: ContentDialog is not centered when MaxWidth/MaxHeight not set

Kinnara · Dec 17, 2020 · d5d2266 · d5d2266
1 parent 27c10fa
commit d5d2266
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/ModernWpf.Controls/ContentDialog/ContentDialog.cs b/ModernWpf.Controls/ContentDialog/ContentDialog.cs
@@ -1163,12 +1163,15 @@ protected override Visual GetVisualChild(int index)
 
             protected override Size MeasureOverride(Size constraint)
             {
+                var desiredSize = AdornedElement.RenderSize;
+                constraint = desiredSize;
                 Child?.Measure(constraint);
-                return constraint;
+                return desiredSize;
             }
 
-            protected override Size ArrangeOverride(Size finalSize)
+            protected override Size ArrangeOverride(Size size)
             {
+                var finalSize = base.ArrangeOverride(size);
                 Child?.Arrange(new Rect(new Point(), finalSize));
                 return finalSize;
             }