From 75503b8055419db419196530cc16685a054aebac Mon Sep 17 00:00:00 2001 From: rabbitism Date: Fri, 2 Feb 2024 19:58:52 +0800 Subject: [PATCH] feat: advanced dialog layout. --- .../ViewModels/DialogDemoViewModel.cs | 4 + demo/Ursa.Demo/Views/MainView.axaml | 2 +- src/Ursa.Themes.Semi/Controls/Dialog.axaml | 69 +++++++- .../Controls/MessageBox.axaml | 16 +- src/Ursa.Themes.Semi/Locale/en-us.axaml | 1 + src/Ursa.Themes.Semi/Locale/zh-cn.axaml | 1 + src/Ursa/Controls/Dialog/DialogControl.cs | 20 ++- src/Ursa/Controls/Dialog/OverlayDialog.cs | 12 +- src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 167 ++++++++++++++++-- 9 files changed, 260 insertions(+), 32 deletions(-) diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs index e26fb45..7376432 100644 --- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs +++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs @@ -119,6 +119,10 @@ public class DialogDemoViewModel: ObservableObject Mode = SelectedMode, Buttons = SelectedButton, CanClickOnMaskToClose = CanCloseMaskToClose, + HorizontalAnchor = HorizontalPosition.Right, + HorizontalOffset = 50, + VerticalAnchor = VerticalPosition.Top, + VerticalOffset = 50, } ); Date = vm.Date; diff --git a/demo/Ursa.Demo/Views/MainView.axaml b/demo/Ursa.Demo/Views/MainView.axaml index e038f33..375bf68 100644 --- a/demo/Ursa.Demo/Views/MainView.axaml +++ b/demo/Ursa.Demo/Views/MainView.axaml @@ -93,7 +93,7 @@ - + diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml index bf11f76..61fed7a 100644 --- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml +++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml @@ -46,6 +46,23 @@ + @@ -115,11 +143,13 @@ Theme="{DynamicResource CardBorder}"> - + + + - + diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml index b79a3e0..dc06e21 100644 --- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml +++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml @@ -81,7 +81,7 @@