From 16a47dac6150c4a78045c46f562cb93dcc2edc9f Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 26 May 2017 00:49:28 +0200 Subject: [PATCH] Apply margin before width/height. Fixes #993. --- src/Avalonia.Layout/Layoutable.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Layout/Layoutable.cs b/src/Avalonia.Layout/Layoutable.cs index 5abd6c52f7..95a0dd625c 100644 --- a/src/Avalonia.Layout/Layoutable.cs +++ b/src/Avalonia.Layout/Layoutable.cs @@ -456,10 +456,9 @@ namespace Avalonia.Layout 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;