From 5fc2c33fed08d7a5f0f3bb576fea7d654c1d7157 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 20 Jun 2024 16:14:05 +0800
Subject: [PATCH] feat: simple avatar group.

---
 demo/Ursa.Demo/Pages/AvatarDemo.axaml      |  9 +++++++++
 src/Ursa.Themes.Semi/Controls/Avatar.axaml | 13 +++++++++----
 src/Ursa/Controls/Avatar/AvatarGroup.cs    | 15 +++++++++++++--
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/AvatarDemo.axaml b/demo/Ursa.Demo/Pages/AvatarDemo.axaml
index f8459f5..a561b3b 100644
--- a/demo/Ursa.Demo/Pages/AvatarDemo.axaml
+++ b/demo/Ursa.Demo/Pages/AvatarDemo.axaml
@@ -64,5 +64,14 @@
             <u:Avatar Classes="Large" />
             <u:Avatar Classes="ExtraLarge" />
         </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <u:AvatarGroup>
+                <u:Avatar Classes="Red" Content="LL" />
+                <u:Avatar Classes="" Content="CX" />
+                <u:Avatar Classes="Amber" Content="RM" />
+                <u:Avatar Background="#FDE3CF" Foreground="#F56A00" Content="ZL" />
+                <u:Avatar Background="#87D068" Classes="" Content="YZ" />
+            </u:AvatarGroup>
+        </StackPanel>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Avatar.axaml b/src/Ursa.Themes.Semi/Controls/Avatar.axaml
index 0714791..0f5676c 100644
--- a/src/Ursa.Themes.Semi/Controls/Avatar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Avatar.axaml
@@ -21,9 +21,7 @@
                             RadiusX="{Binding #PART_Ellipse.Bounds.Width, Converter={StaticResource DivideByTwoConverter}}"
                             RadiusY="{Binding #PART_Ellipse.Bounds.Height, Converter={StaticResource DivideByTwoConverter}}" />
                     </Panel.Clip>
-                    <Ellipse
-                        Name="PART_Ellipse"
-                        Fill="Transparent"/>
+                    <Ellipse Name="PART_Ellipse" />
                     <Ellipse
                         Fill="{TemplateBinding Background}"
                         IsVisible="{TemplateBinding Source, Converter={x:Static ObjectConverters.IsNull}}" />
@@ -131,5 +129,12 @@
             <Setter Property="FontSize" Value="64" />
         </Style>
     </ControlTheme>
-    <ControlTheme x:Key="{x:Type u:AvatarGroup}" TargetType="{x:Type u:AvatarGroup}" />
+
+    <ControlTheme x:Key="{x:Type u:AvatarGroup}" TargetType="{x:Type u:AvatarGroup}">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:AvatarGroup">
+                <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa/Controls/Avatar/AvatarGroup.cs b/src/Ursa/Controls/Avatar/AvatarGroup.cs
index 60e86b7..300a3f6 100644
--- a/src/Ursa/Controls/Avatar/AvatarGroup.cs
+++ b/src/Ursa/Controls/Avatar/AvatarGroup.cs
@@ -1,5 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Layout;
 
 namespace Ursa.Controls;
 
@@ -7,11 +9,15 @@ public class AvatarGroup : ItemsControl
 {
     public const string PART_RenderMore = "PART_RenderMore";
 
+    private static readonly FuncTemplate<Panel?> DefaultPanel =
+        new(() => new StackPanel { Orientation = Orientation.Horizontal });
+
     public static readonly StyledProperty<int> MaxCountProperty = AvaloniaProperty.Register<AvatarGroup, int>(
         nameof(MaxCount));
 
-    public static readonly StyledProperty<OverlapFromType> OverlapFromProperty = AvaloniaProperty.Register<AvatarGroup, OverlapFromType>(
-        nameof(OverlapFrom));
+    public static readonly StyledProperty<OverlapFromType> OverlapFromProperty =
+        AvaloniaProperty.Register<AvatarGroup, OverlapFromType>(
+            nameof(OverlapFrom));
 
     public int MaxCount
     {
@@ -24,6 +30,11 @@ public class AvatarGroup : ItemsControl
         get => GetValue(OverlapFromProperty);
         set => SetValue(OverlapFromProperty, value);
     }
+
+    static AvatarGroup()
+    {
+        ItemsPanelProperty.OverrideDefaultValue<AvatarGroup>(DefaultPanel);
+    }
 }
 
 public enum OverlapFromType