From 4768124962baae85757fc32cc26bd210eae478ac Mon Sep 17 00:00:00 2001 From: walterlv Date: Tue, 1 May 2018 15:38:18 +0800 Subject: [PATCH] Fix the AggregateAdditionalConventionsForStars method. --- src/Avalonia.Controls/Utils/GridLayout.cs | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/Avalonia.Controls/Utils/GridLayout.cs b/src/Avalonia.Controls/Utils/GridLayout.cs index 9a886d60c9..eba23a3d8e 100644 --- a/src/Avalonia.Controls/Utils/GridLayout.cs +++ b/src/Avalonia.Controls/Utils/GridLayout.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using System.Runtime.CompilerServices; using Avalonia.Layout; using JetBrains.Annotations; @@ -348,10 +349,19 @@ namespace Avalonia.Controls.Utils return Math.Min(conventions[index].MaxLength, more); } - [Pure] + /// + /// Calculate the total desired length of all the * length. + /// Bug Warning: + /// - The behavior of this method is undefined! Different UI Frameworks have different behaviors. + /// - We ignore all the span columns/rows and just take single cells into consideration. + /// + /// All the conventions that have almost been fixed except the rest *. + /// The total desired length of all the * length. + [Pure, MethodImpl(MethodImplOptions.AggressiveInlining)] private double AggregateAdditionalConventionsForStars( IReadOnlyList conventions) { + // Note: The comment in this method is just a draft. // +-----------------------------------------------------------+ // | * | P | * | P | P | * | P | * | * | // +-----------------------------------------------------------+ @@ -361,11 +371,10 @@ namespace Avalonia.Controls.Utils // _additionalConventions 是上面的 x、y、z…… 集合，只有最小值是可用的。 // 需要返回所有标记为 * 的方格的累加和的最小值。 - var additionalConventions = _additionalConventions; - - // TODO Calculate the min length of all the desired size. - - return 0; + // Before we determine the behavior of this method, we just aggregate the one-span * columns. + return _additionalConventions + .Where(x => x.Span == 1 && conventions[x.Index].Length.IsStar) + .Sum(x => x.Min); } ///