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

feat: prepare for RenderMore.

Browse Source
This commit is contained in:
Zhang Dian
2024-06-24 23:07:04 +08:00
parent e3c85d80ef
commit 2ad7aa62d5
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Ursa/Controls/Avatar/AvatarGroupPanel.cs
View File

@@ -8,23 +8,22 @@ public class AvatarGroupPanel : Panel
{ {
protected override Size MeasureOverride(Size availableSize) protected override Size MeasureOverride(Size availableSize)
{ {
Size size = new Size();
availableSize = availableSize.WithWidth(double.PositiveInfinity);
var children = Children; var children = Children;
if (children.Count <= 0) return size; if (children.Count <= 0) return new Size();
availableSize = availableSize.WithWidth(double.PositiveInfinity);
children[0].Measure(availableSize); children[0].Measure(availableSize);
Size first = children[0].DesiredSize; Size first = children[0].DesiredSize;
var group = this.GetLogicalAncestors().OfType<AvatarGroup>().FirstOrDefault(); var group = this.GetLogicalAncestors().OfType<AvatarGroup>().FirstOrDefault();
var maxCount = group?.MaxCount;
var count = children.Count; var count = children.Count;
if (group?.MaxCount is not null && group.MaxCount >= 0) if (maxCount >= 0 && maxCount < count)
{ {
count = group.MaxCount.Value + 1; count = maxCount.Value + 1;
} }
var width = first.Width + first.Width * (count - 1) * 0.75; var width = first.Width + first.Width * (count - 1) * 0.75;
size = size.WithWidth(width); return new Size(width, first.Height);
size = size.WithHeight(first.Height);
return size;
} }
protected override Size ArrangeOverride(Size finalSize) protected override Size ArrangeOverride(Size finalSize)
@@ -34,19 +33,14 @@ public class AvatarGroupPanel : Panel
var children = Children; var children = Children;
var group = this.GetLogicalAncestors().OfType<AvatarGroup>().FirstOrDefault(); var group = this.GetLogicalAncestors().OfType<AvatarGroup>().FirstOrDefault();
var overlapFrom = group?.OverlapFrom; var overlapFrom = group?.OverlapFrom;
int? maxCount = null; var maxCount = group?.MaxCount;
var count = children.Count; var childrenCount = children.Count;
if (group?.MaxCount is not null && group.MaxCount >= 0) var count = maxCount < childrenCount ? maxCount.Value : childrenCount;
{
maxCount = group.MaxCount;
count = maxCount.Value + 1;
}
for (var i = 0; i < count; i++) for (var i = 0; i < count; i++)
{ {
if (overlapFrom is OverlapFromType.Start) if (overlapFrom is OverlapFromType.Start)
{ {
children[i].ZIndex = children.Count - i; children[i].ZIndex = childrenCount - i;
} }
children[i].Measure(finalSize); children[i].Measure(finalSize);
@@ -60,12 +54,9 @@ public class AvatarGroupPanel : Panel
children[i].Arrange(rect); children[i].Arrange(rect);
} }
if (maxCount is not null && children.Count > 0) if (maxCount is not null)
{ {
if (children[maxCount.Value] is Avatar avatar) //TODO: RenderMore
{
avatar.Content = $"+{children.Count - maxCount}";
}
} }
return finalSize; return finalSize;