From ceb855df0db5dc357d2fca8d5aec8d73313c1537 Mon Sep 17 00:00:00 2001 From: chinboy Date: Tue, 23 Dec 2025 09:25:27 +0800 Subject: [PATCH] Refatcor MessageBox Result --- .../MessageBox/MessageBox.cs | 16 ++-------------- .../MessageBox/Themes/MessageBoxTheme.axaml | 3 ++- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/AtomUI.Desktop.Controls/MessageBox/MessageBox.cs b/src/AtomUI.Desktop.Controls/MessageBox/MessageBox.cs index 5ccfffbd4..caa1788e2 100644 --- a/src/AtomUI.Desktop.Controls/MessageBox/MessageBox.cs +++ b/src/AtomUI.Desktop.Controls/MessageBox/MessageBox.cs @@ -21,8 +21,8 @@ public enum MessageBoxOkButtonStyle Primary } -public class MessageBox : TemplatedControl, - IMotionAwareControl, +public class MessageBox : TemplatedControl, + IMotionAwareControl, IControlSharedTokenResourcesHost { #region 公共属性定义 @@ -294,13 +294,6 @@ public class MessageBox : TemplatedControl, { ConfigureOkButton(); } - else if (change.Property == ResultProperty && _dialog != null) - { - if (!Equals(_dialog.Result, change.NewValue)) - { - _dialog.SetCurrentValue(Dialog.ResultProperty, change.NewValue); - } - } else if (change.Property == IsCenterOnStartupProperty) { ConfigurePositionOnStartup(); @@ -329,10 +322,6 @@ public class MessageBox : TemplatedControl, _dialog.Finished += HandleDialogFinished; _dialog.ButtonsConfigure = ButtonsConfigure; _dialog.CustomButtons.AddRange(CustomButtons); - if (!Equals(Result, _dialog.Result)) - { - _dialog.SetCurrentValue(Dialog.ResultProperty, Result); - } } ConfigureIcon(); @@ -342,7 +331,6 @@ public class MessageBox : TemplatedControl, private void HandleDialogOpened(object? sender, EventArgs e) { - SetCurrentValue(ResultProperty, null); Opened?.Invoke(this, EventArgs.Empty); } diff --git a/src/AtomUI.Desktop.Controls/MessageBox/Themes/MessageBoxTheme.axaml b/src/AtomUI.Desktop.Controls/MessageBox/Themes/MessageBoxTheme.axaml index f64395ab7..9e1ef7c35 100644 --- a/src/AtomUI.Desktop.Controls/MessageBox/Themes/MessageBoxTheme.axaml +++ b/src/AtomUI.Desktop.Controls/MessageBox/Themes/MessageBoxTheme.axaml @@ -27,7 +27,8 @@ Height="{TemplateBinding Height}" MinHeight="{TemplateBinding MinHeight}" IsLoading="{TemplateBinding IsLoading}" - IsConfirmLoading="{TemplateBinding IsConfirmLoading}"/> + IsConfirmLoading="{TemplateBinding IsConfirmLoading}" + Result="{TemplateBinding Result, Mode=TwoWay}"/>