Apply margin before width/height.

Fixes #993.
AvaloniaUI · May 25, 2017 · 16a47da · 16a47da
1 parent 15c3ef4
commit 16a47da
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/Avalonia.Layout/Layoutable.cs b/src/Avalonia.Layout/Layoutable.cs
@@ -456,10 +456,9 @@ protected virtual Size MeasureCore(Size availableSize)
 
                 ApplyTemplate();
 
-                var constrained = LayoutHelper
-                    .ApplyLayoutConstraints(this, availableSize)
-                    .Deflate(margin);
-
+                var constrained = LayoutHelper.ApplyLayoutConstraints(
+                    this,
+                    availableSize.Deflate(margin));
                 var measured = MeasureOverride(constrained);
 
                 var width = measured.Width;