From b81d6c69a773d41924646827bf03a6ae299eba3a Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Mon, 2 Jun 2025 02:12:24 +0800
Subject: [PATCH] feat: replace PathIcon with Button.

---
 src/Ursa.Themes.Semi/Controls/TagInput.axaml | 19 ++++++++--------
 src/Ursa/Controls/TagInput/ClosableTag.cs    | 24 +++-----------------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/TagInput.axaml b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
index 3638c06..1e865f6 100644
--- a/src/Ursa.Themes.Semi/Controls/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
@@ -124,16 +124,17 @@
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="3">
                     <DockPanel LastChildFill="True">
-                        <PathIcon
+                        <Button
                             Name="{x:Static u:ClosableTag.PART_CloseButton}"
-                            Theme="{StaticResource InnerPathIcon}"
-                            Classes="Small"
-                            Margin="4,0,0,0"
-                            Background="Transparent"
-                            Data="{DynamicResource ClosableTagCloseIconGlyph}"
+                            Theme="{DynamicResource InnerIconButton}"
                             DockPanel.Dock="Right"
+                            Width="12"
+                            Height="12"
+                            Margin="4,0,0,0"
                             Foreground="{DynamicResource SemiColorText2}"
-                            Cursor="Hand" />
+                            Command="{TemplateBinding Command}"
+                            CommandParameter="{TemplateBinding}"
+                            Content="{StaticResource ClosableTagCloseIconGlyph}" />
                         <ContentPresenter
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding Content}"
@@ -145,10 +146,10 @@
                 </Border>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^ /template/ PathIcon#PART_CloseButton:pointerover">
+        <Style Selector="^ /template/ Button#PART_CloseButton:pointerover">
             <Setter Property="Foreground" Value="{DynamicResource SemiColorText1}" />
         </Style>
-        <Style Selector="^ /template/ PathIcon#PART_CloseButton:pressed">
+        <Style Selector="^ /template/ Button#PART_CloseButton:pressed">
             <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" />
         </Style>
     </ControlTheme>
diff --git a/src/Ursa/Controls/TagInput/ClosableTag.cs b/src/Ursa/Controls/TagInput/ClosableTag.cs
index 45980b8..c37417e 100644
--- a/src/Ursa/Controls/TagInput/ClosableTag.cs
+++ b/src/Ursa/Controls/TagInput/ClosableTag.cs
@@ -3,15 +3,14 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
-using Avalonia.Input;
 
 namespace Ursa.Controls;
 
-[TemplatePart(PART_CloseButton, typeof(PathIcon))]
+[TemplatePart(PART_CloseButton, typeof(Button))]
 public class ClosableTag : ContentControl
 {
     public const string PART_CloseButton = "PART_CloseButton";
-    private PathIcon? _icon;
+    private Button? _closeButton;
 
     public static readonly StyledProperty<ICommand?> CommandProperty = AvaloniaProperty.Register<ClosableTag, ICommand?>(
         nameof(Command));
@@ -25,23 +24,6 @@ public class ClosableTag : ContentControl
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        if (_icon is not null)
-        {
-            _icon.PointerReleased -= OnPointerReleased;
-        }
-
-        _icon = e.NameScope.Find<PathIcon>(PART_CloseButton);
-        if (_icon is not null)
-        {
-            _icon.PointerReleased += OnPointerReleased;
-        }
-    }
-
-    private void OnPointerReleased(object? sender, PointerReleasedEventArgs args)
-    {
-        if (Command is not null && Command.CanExecute(null))
-        {
-            Command.Execute(this);
-        }
+        _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
     }
 }
\ No newline at end of file