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

fix: pass default value when close from control.

Browse Source
This commit is contained in:
rabbitism
2024-01-23 00:30:24 +08:00
parent 611e2bc84e
commit 7c29320ad9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
View File

@@ -56,7 +56,6 @@ public class DialogDemoViewModel: ObservableObject
var vm = new DialogWithActionViewModel(); var vm = new DialogWithActionViewModel();
var result = await DialogBox.ShowOverlayAsync<DialogWithAction, DialogWithActionViewModel, bool>( var result = await DialogBox.ShowOverlayAsync<DialogWithAction, DialogWithActionViewModel, bool>(
DialogViewModel, "LocalHost"); DialogViewModel, "LocalHost");
Date = vm.Date;
Result = result; Result = result;
} }
} }

3
src/Ursa/Controls/Dialog/DialogControl.cs
View File

@@ -74,8 +74,9 @@ public class DialogControl: ContentControl
{ {
if (this.DataContext is IDialogContext context) if (this.DataContext is IDialogContext context)
{ {
OnClose?.Invoke(this, args); OnClose?.Invoke(this, Equals(sender, _closeButton) ? context.DefaultCloseResult : args);
} }
else else
{ {
OnClose?.Invoke(this, null); OnClose?.Invoke(this, null);