From cc3422b4c39ea2cf52e14bf23ec02664a41fcf2a Mon Sep 17 00:00:00 2001 From: Jumar Macato Date: Mon, 27 May 2019 15:08:40 +0800 Subject: [PATCH] Reset MinSize on DefinitionsLayout validation. --- src/Avalonia.Controls/GridWPF.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/GridWPF.cs b/src/Avalonia.Controls/GridWPF.cs index aa08dd8469..d86ec4c1c0 100644 --- a/src/Avalonia.Controls/GridWPF.cs +++ b/src/Avalonia.Controls/GridWPF.cs @@ -707,7 +707,8 @@ namespace Avalonia.Controls { for (int i = 0; i < definitions.Length; ++i) { - // definitions[i].OnBeforeLayout(this); + // Reset minimum size. + definitions[i].SetMinSize(0); double userMinSize = definitions[i].UserMinSize; double userMaxSize = definitions[i].UserMaxSize; @@ -718,6 +719,7 @@ namespace Avalonia.Controls case (GridUnitType.Pixel): definitions[i].SizeType = LayoutTimeSizeType.Pixel; userSize = definitions[i].UserSize.Value; + // this was brought with NewLayout and defeats squishy behavior userMinSize = Math.Max(userMinSize, Math.Min(userSize, userMaxSize)); break;