Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

optimize UniformStaggeredColumnLayout

Browse Source
This commit is contained in:
DismissedLight
2023-11-03 23:32:52 +08:00
parent aeb6962ae4
commit 24086ee4d0
2 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/Snap.Hutao/Snap.Hutao/Control/Layout/UniformStaggeredLayout.cs
View File

@@ -4,6 +4,7 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using System.Collections.Specialized;
using System.Runtime.InteropServices;
using Windows.Foundation;
namespace Snap.Hutao.Control.Layout;
@@ -37,20 +38,22 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
case NotifyCollectionChangedAction.Add:
state.RemoveFromIndex(args.NewStartingIndex);
break;
case NotifyCollectionChangedAction.Replace:
state.RemoveFromIndex(args.NewStartingIndex);
// We must recycle the element to ensure that it gets the correct context
state.RecycleElementAt(args.NewStartingIndex);
state.RecycleElementAt(args.NewStartingIndex); // We must recycle the element to ensure that it gets the correct context
break;
case NotifyCollectionChangedAction.Move:
int minIndex = Math.Min(args.NewStartingIndex, args.OldStartingIndex);
int maxIndex = Math.Max(args.NewStartingIndex, args.OldStartingIndex);
state.RemoveRange(minIndex, maxIndex);
break;
case NotifyCollectionChangedAction.Remove:
state.RemoveFromIndex(args.OldStartingIndex);
break;
case NotifyCollectionChangedAction.Reset:
state.Clear();
break;
@@ -77,7 +80,7 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
double availableWidth = availableSize.Width;
double availableHeight = availableSize.Height;
(int columnCount, double columnWidth) = GetColumnInfo(availableWidth, MinItemWidth, MinColumnSpacing);
(int numberOfColumns, double columnWidth) = GetNumberOfColumnsAndWidth(availableWidth, MinItemWidth, MinColumnSpacing);
if (columnWidth != state.ColumnWidth)
{
@@ -88,17 +91,17 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
state.ColumnWidth = columnWidth;
// adjust for column spacing on all columns expect the first
double totalWidth = state.ColumnWidth + ((columnCount - 1) * (state.ColumnWidth + MinColumnSpacing));
double totalWidth = state.ColumnWidth + ((numberOfColumns - 1) * (state.ColumnWidth + MinColumnSpacing));
if (totalWidth > availableWidth)
{
columnCount--;
numberOfColumns--;
}
else if (double.IsInfinity(availableWidth))
{
availableWidth = totalWidth;
}
if (columnCount != state.NumberOfColumns)
if (numberOfColumns != state.NumberOfColumns)
{
// The items will not need to be remeasured, but they will need to go into new columns
state.ClearColumns();
@@ -113,22 +116,23 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
state.RowSpacing = MinRowSpacing;
}
double[] columnHeights = new double[columnCount];
int[] itemsPerColumn = new int[columnCount];
Span<double> columnHeights = new double[numberOfColumns];
Span<int> itemsPerColumn = new int[numberOfColumns];
HashSet<int> deadColumns = new();
for (int i = 0; i < context.ItemCount; i++)
{
int columnIndex = GetColumnIndex(columnHeights);
int columnIndex = GetLowestColumnIndex(columnHeights);
bool measured = false;
UniformStaggeredItem item = state.GetItemAt(i);
if (item.Height == 0)
{
// Item has not been measured yet. Get the element and store the values
item.Element = context.GetOrCreateElementAt(i);
item.Element.Measure(new Size((float)state.ColumnWidth, (float)availableHeight));
item.Height = item.Element.DesiredSize.Height;
UIElement element = context.GetOrCreateElementAt(i);
element.Measure(new Size(state.ColumnWidth, availableHeight));
item.Height = element.DesiredSize.Height;
item.Element = element;
measured = true;
}
@@ -163,7 +167,7 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
{
// We ALWAYS want to measure an item that will be in the bounds
item.Element = context.GetOrCreateElementAt(i);
item.Element.Measure(new Size((float)state.ColumnWidth, (float)availableHeight));
item.Element.Measure(new Size(state.ColumnWidth, availableHeight));
if (item.Height != item.Element.DesiredSize.Height)
{
// this item changed size; we need to recalculate layout for everything after this
@@ -173,7 +177,7 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
}
}
if (deadColumns.Count == columnCount)
if (deadColumns.Count == numberOfColumns)
{
break;
}
@@ -181,7 +185,7 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
double desiredHeight = state.GetHeight();
return new Size((float)availableWidth, (float)desiredHeight);
return new Size(availableWidth, desiredHeight);
}
/// <inheritdoc/>
@@ -198,9 +202,10 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
for (int columnIndex = 0; columnIndex < state.NumberOfColumns; columnIndex++)
{
UniformStaggeredColumnLayout layout = state.GetColumnLayout(columnIndex);
for (int i = 0; i < layout.Count; i++)
Span<UniformStaggeredItem> layoutSpan = CollectionsMarshal.AsSpan(layout);
for (int i = 0; i < layoutSpan.Length; i++)
{
UniformStaggeredItem item = layout[i];
ref readonly UniformStaggeredItem item = ref layoutSpan[i];
double bottom = item.Top + item.Height;
if (bottom < context.RealizationRect.Top)
@@ -213,7 +218,7 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
{
double itemHorizontalOffset = (state.ColumnWidth * columnIndex) + (MinColumnSpacing * columnIndex);
Rect bounds = new((float)itemHorizontalOffset, (float)item.Top, (float)state.ColumnWidth, (float)item.Height);
Rect bounds = new(itemHorizontalOffset, item.Top, state.ColumnWidth, item.Height);
UIElement element = context.GetOrCreateElementAt(item.Index);
element.Arrange(bounds);
}
@@ -227,32 +232,20 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
return finalSize;
}
private static (int ColumnCount, double ColumnWidth) GetColumnInfo(double availableWidth, double minItemWidth, double minColumnSpacing)
private static (int NumberOfColumns, double ColumnWidth) GetNumberOfColumnsAndWidth(double availableWidth, double minItemWidth, double minColumnSpacing)
{
// less than 2 item per row
// test if the width can fit in 2 items
if ((2 * minItemWidth) + minColumnSpacing > availableWidth)
{
return (1, availableWidth);
}
int columnCount = (int)Math.Max(1, Math.Floor((availableWidth + minColumnSpacing) / (minItemWidth + minColumnSpacing)));
int columnCount = Math.Max(1, (int)((availableWidth + minColumnSpacing) / (minItemWidth + minColumnSpacing)));
double columnWidthAddSpacing = (availableWidth + minColumnSpacing) / columnCount;
return (columnCount, columnWidthAddSpacing - minColumnSpacing);
}
private static void OnMinItemWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
UniformStaggeredLayout panel = (UniformStaggeredLayout)d;
panel.InvalidateMeasure();
}
private static void OnSpacingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
UniformStaggeredLayout panel = (UniformStaggeredLayout)d;
panel.InvalidateMeasure();
}
private static int GetColumnIndex(double[] columnHeights)
private static int GetLowestColumnIndex(in ReadOnlySpan<double> columnHeights)
{
int columnIndex = 0;
double height = columnHeights[0];
@@ -267,4 +260,16 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
return columnIndex;
}
private static void OnMinItemWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
UniformStaggeredLayout panel = (UniformStaggeredLayout)d;
panel.InvalidateMeasure();
}
private static void OnSpacingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
UniformStaggeredLayout panel = (UniformStaggeredLayout)d;
panel.InvalidateMeasure();
}
}

39
src/Snap.Hutao/Snap.Hutao/Control/Layout/UniformStaggeredLayoutState.cs
View File

@@ -3,6 +3,7 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using System.Runtime.InteropServices;
namespace Snap.Hutao.Control.Layout;
@@ -29,18 +30,19 @@ internal sealed class UniformStaggeredLayoutState
internal void AddItemToColumn(UniformStaggeredItem item, int columnIndex)
{
if (this.columnLayout.TryGetValue(columnIndex, out UniformStaggeredColumnLayout? columnLayout) == false)
if (!this.columnLayout.TryGetValue(columnIndex, out UniformStaggeredColumnLayout? columnLayout))
{
columnLayout = new UniformStaggeredColumnLayout();
columnLayout = new();
this.columnLayout[columnIndex] = columnLayout;
}
if (columnLayout.Contains(item) == false)
if (!columnLayout.Contains(item))
{
columnLayout.Add(item);
}
}
[SuppressMessage("", "CA2201")]
internal UniformStaggeredItem GetItemAt(int index)
{
if (index < 0)
@@ -93,18 +95,18 @@ internal sealed class UniformStaggeredLayoutState
/// </remarks>
internal double GetHeight()
{
double desiredHeight = Enumerable.Max(columnLayout.Values, c => c.Height);
double desiredHeight = columnLayout.Values.Max(c => c.Height);
int itemCount = columnLayout.Values.Sum(c => c.Count);
int itemCount = Enumerable.Sum(columnLayout.Values, c => c.Count);
if (itemCount == context.ItemCount)
{
return desiredHeight;
}
double averageHeight = 0;
foreach (KeyValuePair<int, UniformStaggeredColumnLayout> kvp in columnLayout)
foreach ((_, UniformStaggeredColumnLayout layout) in columnLayout)
{
averageHeight += kvp.Value.Height / kvp.Value.Count;
averageHeight += layout.Height / layout.Count;
}
averageHeight /= columnLayout.Count;
@@ -114,7 +116,7 @@ internal sealed class UniformStaggeredLayoutState
desiredHeight = estimatedHeight;
}
if (Math.Abs(desiredHeight - lastAverageHeight) < 5)
if (Math.Abs(desiredHeight - lastAverageHeight) < 5) // Why 5?
{
return lastAverageHeight;
}
@@ -140,14 +142,14 @@ internal sealed class UniformStaggeredLayoutState
int numToRemove = items.Count - index;
items.RemoveRange(index, numToRemove);
foreach (KeyValuePair<int, UniformStaggeredColumnLayout> kvp in columnLayout)
foreach ((_, UniformStaggeredColumnLayout layout) in columnLayout)
{
UniformStaggeredColumnLayout layout = kvp.Value;
for (int i = 0; i < layout.Count; i++)
Span<UniformStaggeredItem> layoutSpan = CollectionsMarshal.AsSpan(layout);
for (int i = 0; i < layoutSpan.Length; i++)
{
if (layout[i].Index >= index)
if (layoutSpan[i].Index >= index)
{
numToRemove = layout.Count - i;
numToRemove = layoutSpan.Length - i;
layout.RemoveRange(i, numToRemove);
break;
}
@@ -164,7 +166,7 @@ internal sealed class UniformStaggeredLayoutState
break;
}
UniformStaggeredItem item = items[i];
ref readonly UniformStaggeredItem item = ref CollectionsMarshal.AsSpan(items)[i];
item.Height = 0;
item.Top = 0;
@@ -172,13 +174,14 @@ internal sealed class UniformStaggeredLayoutState
RecycleElementAt(i);
}
foreach ((int key, UniformStaggeredColumnLayout layout) in columnLayout)
foreach ((_, UniformStaggeredColumnLayout layout) in columnLayout)
{
for (int i = 0; i < layout.Count; i++)
Span<UniformStaggeredItem> layoutSpan = CollectionsMarshal.AsSpan(layout);
for (int i = 0; i < layoutSpan.Length; i++)
{
if ((startIndex <= layout[i].Index) && (layout[i].Index <= endIndex))
if ((startIndex <= layoutSpan[i].Index) && (layoutSpan[i].Index <= endIndex))
{
int numToRemove = layout.Count - i;
int numToRemove = layoutSpan.Length - i;
layout.RemoveRange(i, numToRemove);
break;
}