chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: add TrailingWrapWidth.

Browse Source
This commit is contained in:
Dong Bin
2025-09-03 21:18:00 +08:00
parent 9ee89b7ce5
commit 8147a05b5c
2 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/Ursa/Controls/Panels/WrapPanelWithTrailingItem.cs
View File

@@ -6,18 +6,15 @@ using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls;
public class WrapPanelWithTrailingItem: Panel
public class WrapPanelWithTrailingItem : Panel
{
public static readonly StyledProperty<Layoutable?> TrailingItemProperty = AvaloniaProperty.Register<WrapPanelWithTrailingItem, Layoutable?>(
nameof(TrailingItem));
public static readonly StyledProperty<Layoutable?> TrailingItemProperty =
AvaloniaProperty.Register<WrapPanelWithTrailingItem, Layoutable?>(
nameof(TrailingItem));
public Layoutable? TrailingItem
{
get => GetValue(TrailingItemProperty);
set => SetValue(TrailingItemProperty, value);
}
public static readonly StyledProperty<double> TrailingWrapWidthProperty =
AvaloniaProperty.Register<WrapPanelWithTrailingItem, double>(
nameof(TrailingWrapWidth));
static WrapPanelWithTrailingItem()
{
@@ -25,52 +22,55 @@ public class WrapPanelWithTrailingItem: Panel
AffectsArrange<WrapPanelWithTrailingItem>(TrailingItemProperty);
}
public Layoutable? TrailingItem
{
get => GetValue(TrailingItemProperty);
set => SetValue(TrailingItemProperty, value);
}
public double TrailingWrapWidth
{
get => GetValue(TrailingWrapWidthProperty);
set => SetValue(TrailingWrapWidthProperty, value);
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
if (change.Property == TrailingItemProperty)
{
if(change.GetOldValue<Layoutable?>() is { } oldValue)
if (change.GetOldValue<Layoutable?>() is { } oldValue)
{
VisualChildren.Remove(oldValue);
if (!IsItemsHost)
{
LogicalChildren.Remove(oldValue);
}
if (!IsItemsHost) LogicalChildren.Remove(oldValue);
}
if(change.GetNewValue<Layoutable?>() is {} newValue)
if (change.GetNewValue<Layoutable?>() is { } newValue)
{
VisualChildren.Add(newValue);
if (!IsItemsHost)
{
LogicalChildren.Add(newValue);
}
if (!IsItemsHost) LogicalChildren.Add(newValue);
}
}
WrapPanel p = new WrapPanel();
}
protected override void ChildrenChanged(object? sender, NotifyCollectionChangedEventArgs e)
{
base.ChildrenChanged(sender, e);
}
protected override Size MeasureOverride(Size availableSize)
{
double currentLineX = 0;
double currentLineHeight = 0;
double totalHeight = 0;
var children = Children;
foreach (var child in children)
{
child.Measure(availableSize);
double deltaX = availableSize.Width - currentLineX;
var deltaX = availableSize.Width - currentLineX;
// Width is enough to place next child
if (MathHelpers.GreaterThan(deltaX, child.DesiredSize.Width))
{
currentLineX+=child.DesiredSize.Width;
currentLineX += child.DesiredSize.Width;
currentLineHeight = Math.Max(currentLineHeight, child.DesiredSize.Height);
}
// Width is not enough to place next child
@@ -88,11 +88,11 @@ public class WrapPanelWithTrailingItem: Panel
var last = TrailingItem;
if (last is null) return new Size(availableSize.Width, totalHeight);
last.Measure(availableSize);
double lastDeltaX = availableSize.Width - currentLineX;
var lastDeltaX = availableSize.Width - currentLineX;
// If width is not enough, add a new line, and recalculate total height
if (lastDeltaX < 30)
if (lastDeltaX < TrailingWrapWidth)
{
totalHeight+=currentLineHeight;
totalHeight += currentLineHeight;
totalHeight += last.DesiredSize.Height;
}
else
@@ -103,23 +103,24 @@ public class WrapPanelWithTrailingItem: Panel
return new Size(availableSize.Width, totalHeight);
}
protected override Size ArrangeOverride(Size finalSize)
{
double currentLineX = 0;
double currentLineHeight = 0;
double totalHeight = 0;
var children = Children;
for (int i = 0; i < children.Count; i++)
foreach (var child in children)
{
var child = children[i];
double deltaX = finalSize.Width - currentLineX;
// Width is enough to place next child
if (MathHelpers.GreaterThan(deltaX, child.DesiredSize.Width))
{
child.Arrange(new Rect(currentLineX, totalHeight, child.DesiredSize.Width, Math.Max(child.DesiredSize.Height, currentLineHeight)));
currentLineX += child.DesiredSize.Width;
currentLineHeight = Math.Max(currentLineHeight, child.DesiredSize.Height);
child.Arrange(new Rect(currentLineX, totalHeight, child.DesiredSize.Width,
Math.Max(child.DesiredSize.Height, currentLineHeight)));
currentLineX += child.Bounds.Width;
currentLineHeight = Math.Max(currentLineHeight, child.Bounds.Height);
}
// Width is not enough to place next child
// reset currentLineX and currentLineHeight
@@ -128,17 +129,18 @@ public class WrapPanelWithTrailingItem: Panel
else
{
totalHeight += currentLineHeight;
child.Arrange(new Rect(0, totalHeight, Math.Min(child.DesiredSize.Width, finalSize.Width), child.DesiredSize.Height));
currentLineX = child.DesiredSize.Width;
currentLineHeight = child.DesiredSize.Height;
child.Arrange(new Rect(0, totalHeight, Math.Min(child.DesiredSize.Width, finalSize.Width),
child.DesiredSize.Height));
currentLineX = child.Bounds.Width;
currentLineHeight = child.Bounds.Height;
}
}
var last = TrailingItem;
if (last is null) return new Size(finalSize.Width, totalHeight);
double lastDeltaX = finalSize.Width - currentLineX;
var lastDeltaX = finalSize.Width - currentLineX;
// If width is not enough, add a new line, and recalculate total height
if (lastDeltaX < 30)
if (lastDeltaX < TrailingWrapWidth)
{
totalHeight += currentLineHeight;
last.Arrange(new Rect(0, totalHeight, finalSize.Width, last.DesiredSize.Height));