From 66894aa56924ed18cdcaa8a75ff15dc5239e724d Mon Sep 17 00:00:00 2001 From: rabbitism Date: Thu, 11 Jan 2024 02:41:58 +0800 Subject: [PATCH] feat: add default buttons. --- .../ViewModels/MessageBoxDemoViewModel.cs | 2 +- demo/Ursa.Demo/Views/MainWindow.axaml | 2 - .../Controls/MessageBoxWindow.axaml | 63 ++++++---- src/Ursa/Controls/MessageBox/MessageBox.cs | 10 +- .../Controls/MessageBox/MessageBoxButton.cs | 9 ++ .../Controls/MessageBox/MessageBoxResult.cs | 10 ++ .../Controls/MessageBox/MessageBoxWindow.cs | 117 ++++++++++++++++++ 7 files changed, 183 insertions(+), 30 deletions(-) create mode 100644 src/Ursa/Controls/MessageBox/MessageBoxButton.cs create mode 100644 src/Ursa/Controls/MessageBox/MessageBoxResult.cs diff --git a/demo/Ursa.Demo/ViewModels/MessageBoxDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/MessageBoxDemoViewModel.cs index 809b95a..3d95040 100644 --- a/demo/Ursa.Demo/ViewModels/MessageBoxDemoViewModel.cs +++ b/demo/Ursa.Demo/ViewModels/MessageBoxDemoViewModel.cs @@ -17,6 +17,6 @@ public class MessageBoxDemoViewModel: ObservableObject private async Task OnDefaultMessageAsync() { - await MessageBox.ShowAsync("Hello Message Box"); + var result = await MessageBox.ShowAsync("Hello Message Box"); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Views/MainWindow.axaml b/demo/Ursa.Demo/Views/MainWindow.axaml index 5504e4a..054e043 100644 --- a/demo/Ursa.Demo/Views/MainWindow.axaml +++ b/demo/Ursa.Demo/Views/MainWindow.axaml @@ -10,8 +10,6 @@ d:DesignHeight="450" d:DesignWidth="800" x:CompileBindings="True" - ExtendClientAreaTitleBarHeightHint="48" - ExtendClientAreaToDecorationsHint="True" x:DataType="viewModels:MainWindowViewModel" Icon="/Assets/Ursa.ico" mc:Ignorable="d"> diff --git a/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml b/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml index 82ff018..a2c496f 100644 --- a/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml +++ b/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml @@ -1,39 +1,52 @@ - - - + + + + - - - - - - - - + + + + + + + - - - - - - + + + +