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

feat: polish popup open.

Browse Source
This commit is contained in:
Dong Bin
2025-04-18 12:44:55 +08:00
parent 5da5e0626a
commit 713c1731c9
2 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Ursa.Themes.Semi/Controls/PopConfirm.axaml
View File

@@ -6,8 +6,10 @@
<Setter Property="Template">
<ControlTemplate TargetType="u:PopConfirm">
<Panel>
<ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
<Popup IsOpen="True"
<ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
<Popup
IsLightDismissEnabled="True"
OverlayInputPassThroughElement="{Binding #PART_ContentPresenter}"
Name="{x:Static u:PopConfirm.PART_Popup}"
Placement="Bottom" >
<Border Theme="{DynamicResource CardBorder}">

63
src/Ursa/Controls/PopConfirm/PopConfirm.cs
View File

@@ -1,4 +1,5 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Windows.Input;
using Avalonia;
using Avalonia.Controls;
@@ -103,6 +104,15 @@ public class PopConfirm: ContentControl
set => SetValue(TriggerModeProperty, value);
}
public static readonly StyledProperty<bool> HandleAsyncCommandProperty = AvaloniaProperty.Register<PopConfirm, bool>(
nameof(HandleAsyncCommand), true);
public bool HandleAsyncCommand
{
get => GetValue(HandleAsyncCommandProperty);
set => SetValue(HandleAsyncCommandProperty, value);
}
static PopConfirm()
{
ConfirmCommandProperty.Changed.AddClassHandler<PopConfirm, ICommand?>((popconfirm, args) => popconfirm.OnCommandChanged(args));
@@ -140,20 +150,44 @@ public class PopConfirm: ContentControl
private void OnButtonClicked(object sender, RoutedEventArgs e)
{
// This is a hack for MVVM toolkit that uses INotifyPropertyChanged for async command. It counts the number of
// IsRunning property changes to determine when the command is finished.
if (sender is Button button && button.Command is INotifyPropertyChanged inpc)
if (!HandleAsyncCommand)
{
var count = 0;
void OnCommandPropertyChanged(object? sender, PropertyChangedEventArgs args)
{
if (args.PropertyName != "IsRunning") return;
count++;
if (count != 2) return;
inpc.PropertyChanged -= OnCommandPropertyChanged;
_popup?.SetValue(Popup.IsOpenProperty, false);
}
inpc.PropertyChanged += OnCommandPropertyChanged;
// This is a hack for MVVM toolkit and Prism that uses INotifyPropertyChanged for async command. It counts the number of
// IsRunning property changes to determine when the command is finished.
if (sender is Button button && button.Command is { } command and INotifyPropertyChanged)
{
var count = 0;
void OnCanExecuteChanged(object? _, System.EventArgs e)
{
count++;
if (count != 2) return;
var canExecute = command.CanExecute(button.CommandParameter);
if (canExecute == true)
{
command.CanExecuteChanged -= OnCanExecuteChanged;
_popup?.SetValue(Popup.IsOpenProperty, false);
}
}
command.CanExecuteChanged += OnCanExecuteChanged;
}
// TODO: This is a hack for ReactiveUI that ReactiveCommand is an IDisposable.
else if (sender is Button b2 && b2.Command is { } command2 and IDisposable)
{
var count = 0;
void OnCanExecuteChanged2(object? _, System.EventArgs e)
{
count++;
if (count != 2) return;
var canExecute = command2.CanExecute(b2.CommandParameter);
if (canExecute == true)
{
command2.CanExecuteChanged -= OnCanExecuteChanged2;
_popup?.SetValue(Popup.IsOpenProperty, false);
}
}
command2.CanExecuteChanged += OnCanExecuteChanged2;
}
else
{
@@ -175,6 +209,13 @@ public class PopConfirm: ContentControl
private void OnChildChanged(AvaloniaPropertyChangedEventArgs arg)
{
if (arg.GetNewValue<Control?>() is null) return;
if (arg.GetNewValue<Control?>() is Button button)
{
button.Click+= (o, e) =>
{
_popup?.SetValue(Popup.IsOpenProperty, !_popup.IsOpen);
};
}
}
protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)