Browse Source
Merge pull request #9364 from out4blood88/issue-7175-uniformgridlayout-itemsstretch
Fix UniformGridLayout ItemsStretch Fill and Uniform
pull/9368/head
Jumar Macato
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
src/Avalonia.Base/Layout/UniformGridLayoutState.cs
|
|
|
@ -117,12 +117,12 @@ namespace Avalonia.Layout |
|
|
|
double extraMinorPixelsForEachItem = 0.0; |
|
|
|
if (!double.IsInfinity(availableSizeMinor)) |
|
|
|
{ |
|
|
|
var numItemsPerColumn = Math.Min( |
|
|
|
var numItemsPerColumn = (int)Math.Min( |
|
|
|
maxItemsPerLine, |
|
|
|
Math.Max(1.0, availableSizeMinor / (itemSizeMinor + minorItemSpacing))); |
|
|
|
var usedSpace = (numItemsPerColumn * (itemSizeMinor + minorItemSpacing)) - minorItemSpacing; |
|
|
|
var remainingSpace = ((int)(availableSizeMinor - usedSpace)); |
|
|
|
extraMinorPixelsForEachItem = remainingSpace / ((int)numItemsPerColumn); |
|
|
|
var remainingSpace = availableSizeMinor - usedSpace; |
|
|
|
extraMinorPixelsForEachItem = (int)(remainingSpace / numItemsPerColumn); |
|
|
|
} |
|
|
|
|
|
|
|
if (stretch == UniformGridLayoutItemsStretch.Fill) |
|
|
|
|
