Merge pull request #690 from irihitech/tagInput
replace PathIcon with Button in ClosableTag
This commit is contained in:
@@ -2,16 +2,14 @@ using System.Windows.Input;
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Metadata;
|
||||
using Avalonia.Controls.Primitives;
|
||||
using Avalonia.Input;
|
||||
|
||||
namespace Ursa.Controls;
|
||||
|
||||
[TemplatePart(PART_CloseButton, typeof(PathIcon))]
|
||||
public class ClosableTag: ContentControl
|
||||
[TemplatePart(PART_CloseButton, typeof(Button))]
|
||||
public class ClosableTag : ContentControl
|
||||
{
|
||||
public const string PART_CloseButton = "PART_CloseButton";
|
||||
private PathIcon? _icon;
|
||||
|
||||
public static readonly StyledProperty<ICommand?> CommandProperty = AvaloniaProperty.Register<ClosableTag, ICommand?>(
|
||||
nameof(Command));
|
||||
|
||||
@@ -20,27 +18,4 @@ public class ClosableTag: ContentControl
|
||||
get => GetValue(CommandProperty);
|
||||
set => SetValue(CommandProperty, value);
|
||||
}
|
||||
|
||||
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
|
||||
{
|
||||
base.OnApplyTemplate(e);
|
||||
if (_icon != null)
|
||||
{
|
||||
_icon.PointerPressed -= OnPointerPressed;
|
||||
}
|
||||
_icon = e.NameScope.Find<PathIcon>(PART_CloseButton);
|
||||
if (_icon != null)
|
||||
{
|
||||
_icon.PointerPressed += OnPointerPressed;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void OnPointerPressed(object? sender, PointerPressedEventArgs args)
|
||||
{
|
||||
if (Command != null && Command.CanExecute(null))
|
||||
{
|
||||
Command.Execute(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user