From 0e91c844a70265223699468f985fc858275a8dd7 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 19 Jan 2024 15:31:30 +0800
Subject: [PATCH 01/28] feat: initialize dialog.

---
 src/Ursa/Controls/Dialog/DialogBox.cs      | 20 +++++++++++
 src/Ursa/Controls/Dialog/DialogControl.cs  |  8 +++++
 src/Ursa/Controls/Dialog/DialogHost.cs     | 39 ++++++++++++++++++++++
 src/Ursa/Controls/Dialog/IDialogContext.cs |  6 ++++
 4 files changed, 73 insertions(+)
 create mode 100644 src/Ursa/Controls/Dialog/DialogBox.cs
 create mode 100644 src/Ursa/Controls/Dialog/DialogControl.cs
 create mode 100644 src/Ursa/Controls/Dialog/DialogHost.cs
 create mode 100644 src/Ursa/Controls/Dialog/IDialogContext.cs

diff --git a/src/Ursa/Controls/Dialog/DialogBox.cs b/src/Ursa/Controls/Dialog/DialogBox.cs
new file mode 100644
index 0000000..996ee88
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/DialogBox.cs
@@ -0,0 +1,20 @@
+using Avalonia.Controls;
+
+namespace Ursa.Controls;
+
+public static class DialogBox
+{
+    public static async Task ShowAsync()
+    {
+        return;
+    }
+
+    public static async Task ShowAsync<TView, TViewModel>(TViewModel vm) 
+        where TView: Control, new()
+        where TViewModel: new()
+    {
+        TView t = new TView();
+        t.DataContext = vm;
+        return;
+    }
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
new file mode 100644
index 0000000..d46adc5
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Ursa.Controls;
+
+public class DialogControl: ContentControl
+{
+    
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogHost.cs b/src/Ursa/Controls/Dialog/DialogHost.cs
new file mode 100644
index 0000000..7166146
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/DialogHost.cs
@@ -0,0 +1,39 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Utilities;
+
+namespace Ursa.Controls;
+
+public class DialogHost: Canvas
+{
+    private Point _lastPoint;
+    
+    protected override void OnPointerMoved(PointerEventArgs e)
+    {
+        base.OnPointerMoved(e);
+        if (e.Source is DialogControl item)
+        {
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            {
+                var p = e.GetPosition(this);
+                var left=  p.X - _lastPoint.X;
+                var top = p.Y - _lastPoint.Y;
+                left = MathUtilities.Clamp(left, 0, Bounds.Width - item.Bounds.Width);
+                top = MathUtilities.Clamp(top, 0, Bounds.Height - item.Bounds.Height);
+                Canvas.SetLeft(item, left);
+                Canvas.SetTop(item, top);
+            }
+        }
+    }
+
+    protected override void OnPointerPressed(PointerPressedEventArgs e)
+    {
+        base.OnPointerPressed(e);
+        if (e.Source is DialogControl item)
+        {
+            _lastPoint = e.GetPosition(item);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/IDialogContext.cs b/src/Ursa/Controls/Dialog/IDialogContext.cs
new file mode 100644
index 0000000..b88b355
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/IDialogContext.cs
@@ -0,0 +1,6 @@
+namespace Ursa.Controls;
+
+public interface IDialogContext
+{
+    
+}
\ No newline at end of file

From 497a8c2d027602804ec5c52b1efe3466d41085e3 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sat, 20 Jan 2024 22:46:23 +0800
Subject: [PATCH 02/28] feat: setup demo.

---
 demo/Ursa.Demo/Models/MenuKeys.cs             |  1 +
 demo/Ursa.Demo/Pages/DialogDemo.axaml         | 29 +++++++++++++++++
 demo/Ursa.Demo/Pages/DialogDemo.axaml.cs      | 13 ++++++++
 .../ViewModels/DialogDemoViewModel.cs         | 31 +++++++++++++++++++
 .../Ursa.Demo/ViewModels/MainViewViewModel.cs |  1 +
 demo/Ursa.Demo/ViewModels/MenuViewModel.cs    |  1 +
 demo/Ursa.Demo/Views/MainView.axaml           |  1 +
 src/Ursa/Controls/Dialog/DialogBox.cs         | 19 +++++++++++-
 .../{DialogHost.cs => OverlayDialogHost.cs}   | 28 +++++++++++++++--
 .../Controls/Dialog/OverlayDialogManager.cs   | 23 ++++++++++++++
 10 files changed, 143 insertions(+), 4 deletions(-)
 create mode 100644 demo/Ursa.Demo/Pages/DialogDemo.axaml
 create mode 100644 demo/Ursa.Demo/Pages/DialogDemo.axaml.cs
 create mode 100644 demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
 rename src/Ursa/Controls/Dialog/{DialogHost.cs => OverlayDialogHost.cs} (54%)
 create mode 100644 src/Ursa/Controls/Dialog/OverlayDialogManager.cs

diff --git a/demo/Ursa.Demo/Models/MenuKeys.cs b/demo/Ursa.Demo/Models/MenuKeys.cs
index b3e2753..64c2e37 100644
--- a/demo/Ursa.Demo/Models/MenuKeys.cs
+++ b/demo/Ursa.Demo/Models/MenuKeys.cs
@@ -6,6 +6,7 @@ public static class MenuKeys
     public const string MenuKeyBadge = "Badge";
     public const string MenuKeyBanner = "Banner";
     public const string MenuKeyButtonGroup = "ButtonGroup";
+    public const string MenuKeyDialog = "Dialog";
     public const string MenuKeyDivider = "Divider";
     public const string MenuKeyDualBadge = "DualBadge";
     public const string MenuKeyImageViewer = "ImageViewer";
diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
new file mode 100644
index 0000000..4bc5427
--- /dev/null
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -0,0 +1,29 @@
+<UserControl
+    x:Class="Ursa.Demo.Pages.DialogDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:u="https://irihi.tech/ursa"
+    xmlns:vm="using:Ursa.Demo.ViewModels"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    x:CompileBindings="True"
+    x:DataType="vm:DialogDemoViewModel"
+    mc:Ignorable="d">
+    <Grid ColumnDefinitions="Auto, *">
+        <StackPanel Grid.Column="0">
+            <Button Command="{Binding ShowLocalOverlayDialogCommand}">Show Local Overlay Dialog</Button>
+            <Button Command="{Binding ShowGlobalOverlayDialogCommand}"> Show Global Overlay Dialog </Button>
+        </StackPanel>
+        <Grid Grid.Column="1">
+            <Button
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Command="{Binding ShowLocalOverlayDialogCommand}">
+                Show Local Overlay Dialog
+            </Button>
+            <u:OverlayDialogHost HostId="LocalHost" />
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml.cs b/demo/Ursa.Demo/Pages/DialogDemo.axaml.cs
new file mode 100644
index 0000000..2453f1a
--- /dev/null
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Ursa.Demo.Pages;
+
+public partial class DialogDemo : UserControl
+{
+    public DialogDemo()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
new file mode 100644
index 0000000..7210529
--- /dev/null
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Windows.Input;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Ursa.Controls;
+
+namespace Ursa.Demo.ViewModels;
+
+public class DialogDemoViewModel: ObservableObject
+{
+    public ICommand ShowLocalOverlayDialogCommand { get; }
+    public ICommand ShowGlobalOverlayDialogCommand { get; }
+
+    public DialogDemoViewModel()
+    {
+        ShowLocalOverlayDialogCommand = new RelayCommand(ShowLocalOverlayDialog);
+        ShowGlobalOverlayDialogCommand = new RelayCommand(ShowGlobalOverlayDialog);
+    }
+
+    private async void ShowGlobalOverlayDialog()
+    {
+        await DialogBox.ShowOverlayAsync<Banner, DateTime>(DateTime.Now, "GlobalHost");
+    }
+
+    private async void ShowLocalOverlayDialog()
+    {
+        await DialogBox.ShowOverlayAsync<Banner, DateTime>(DateTime.Now, "LocalHost");
+    }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
index 85312ef..a4a24ab 100644
--- a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
@@ -28,6 +28,7 @@ public class MainViewViewModel : ViewModelBase
             MenuKeys.MenuKeyBadge => new BadgeDemoViewModel(),
             MenuKeys.MenuKeyBanner => new BannerDemoViewModel(),
             MenuKeys.MenuKeyButtonGroup => new ButtonGroupDemoViewModel(),
+            MenuKeys.MenuKeyDialog => new DialogDemoViewModel(),
             MenuKeys.MenuKeyDivider => new DividerDemoViewModel(),
             MenuKeys.MenuKeyDualBadge => new DualBadgeDemoViewModel(),
             MenuKeys.MenuKeyImageViewer => new ImageViewerDemoViewModel(),
diff --git a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
index ea66a5e..0195ee8 100644
--- a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
@@ -15,6 +15,7 @@ public class MenuViewModel: ViewModelBase
             new() { MenuHeader = "Badge", Key = MenuKeys.MenuKeyBadge },
             new() { MenuHeader = "Banner", Key = MenuKeys.MenuKeyBanner },
             new() { MenuHeader = "ButtonGroup", Key = MenuKeys.MenuKeyButtonGroup },
+            new() { MenuHeader = "Dialog", Key = MenuKeys.MenuKeyDialog },
             new() { MenuHeader = "Divider", Key = MenuKeys.MenuKeyDivider },
             new() { MenuHeader = "DualBadge", Key = MenuKeys.MenuKeyDualBadge },
             new() { MenuHeader = "IconButton", Key = MenuKeys.MenuKeyIconButton },
diff --git a/demo/Ursa.Demo/Views/MainView.axaml b/demo/Ursa.Demo/Views/MainView.axaml
index 710026c..b6f6bb6 100644
--- a/demo/Ursa.Demo/Views/MainView.axaml
+++ b/demo/Ursa.Demo/Views/MainView.axaml
@@ -80,6 +80,7 @@
                 <converters:ViewLocator />
             </ContentControl.ContentTemplate>
         </ContentControl>
+        <u:OverlayDialogHost Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2" HostId="GlobalHost" />
     </Grid>
 
 </UserControl>
diff --git a/src/Ursa/Controls/Dialog/DialogBox.cs b/src/Ursa/Controls/Dialog/DialogBox.cs
index 996ee88..278a065 100644
--- a/src/Ursa/Controls/Dialog/DialogBox.cs
+++ b/src/Ursa/Controls/Dialog/DialogBox.cs
@@ -1,4 +1,7 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
 
 namespace Ursa.Controls;
 
@@ -15,6 +18,20 @@ public static class DialogBox
     {
         TView t = new TView();
         t.DataContext = vm;
-        return;
+    }
+
+    public static async Task<object?> ShowOverlayAsync<TView, TViewModel>(TViewModel vm, string hostId)
+        where TView : Control, new()
+        where TViewModel: new()
+    {
+        var t = new Border()
+        {
+            Width = 100, Height = 100, Background = Brushes.Aqua, BorderBrush = Brushes.Yellow,
+            BorderThickness = new Thickness(1)
+        };
+        t.DataContext = vm;
+        var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
+        host?.Children.Add(t);
+        return null;
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
similarity index 54%
rename from src/Ursa/Controls/Dialog/DialogHost.cs
rename to src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 7166146..cdef578 100644
--- a/src/Ursa/Controls/Dialog/DialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -2,18 +2,40 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
+using Avalonia.Media;
 using Avalonia.Utilities;
 
 namespace Ursa.Controls;
 
-public class DialogHost: Canvas
+public class OverlayDialogHost: Canvas
 {
+    public static readonly StyledProperty<string> HostIdProperty = AvaloniaProperty.Register<OverlayDialogHost, string>(
+        nameof(HostId));
+
+    public string HostId
+    {
+        get => GetValue(HostIdProperty);
+        set => SetValue(HostIdProperty, value);
+    }
+    
     private Point _lastPoint;
     
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToVisualTree(e);
+        OverlayDialogManager.RegisterOverlayDialogHost(this, HostId);
+    }
+
+    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        OverlayDialogManager.UnregisterOverlayDialogHost(HostId);
+        base.OnDetachedFromVisualTree(e);
+    }
+
     protected override void OnPointerMoved(PointerEventArgs e)
     {
         base.OnPointerMoved(e);
-        if (e.Source is DialogControl item)
+        if (e.Source is Control item)
         {
             if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
@@ -31,7 +53,7 @@ public class DialogHost: Canvas
     protected override void OnPointerPressed(PointerPressedEventArgs e)
     {
         base.OnPointerPressed(e);
-        if (e.Source is DialogControl item)
+        if (e.Source is Control item)
         {
             _lastPoint = e.GetPosition(item);
         }
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogManager.cs b/src/Ursa/Controls/Dialog/OverlayDialogManager.cs
new file mode 100644
index 0000000..1dc1480
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/OverlayDialogManager.cs
@@ -0,0 +1,23 @@
+using System.Collections.Concurrent;
+
+namespace Ursa.Controls;
+
+internal static class OverlayDialogManager
+{
+    private static ConcurrentDictionary<string, OverlayDialogHost> _hosts = new();
+    
+    public static void RegisterOverlayDialogHost(OverlayDialogHost host, string id)
+    {
+        _hosts.TryAdd(id, host);
+    }
+    
+    public static void UnregisterOverlayDialogHost(string id)
+    {
+        _hosts.TryRemove(id, out _);
+    }
+    
+    public static OverlayDialogHost? GetOverlayDialogHost(string id)
+    {
+        return _hosts.TryGetValue(id, out var host) ? host : null;
+    }
+}
\ No newline at end of file

From a0598b6a47e0624138aaff4133511a9d8380262c Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sun, 21 Jan 2024 15:45:12 +0800
Subject: [PATCH 03/28] WIP

---
 src/Ursa/Controls/Dialog/DialogBox.cs            | 6 +++---
 src/Ursa/Controls/Dialog/OverlayDialogOptions.cs | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 src/Ursa/Controls/Dialog/OverlayDialogOptions.cs

diff --git a/src/Ursa/Controls/Dialog/DialogBox.cs b/src/Ursa/Controls/Dialog/DialogBox.cs
index 278a065..38a3641 100644
--- a/src/Ursa/Controls/Dialog/DialogBox.cs
+++ b/src/Ursa/Controls/Dialog/DialogBox.cs
@@ -24,10 +24,10 @@ public static class DialogBox
         where TView : Control, new()
         where TViewModel: new()
     {
-        var t = new Border()
+        var t = new DialogControl()
         {
-            Width = 100, Height = 100, Background = Brushes.Aqua, BorderBrush = Brushes.Yellow,
-            BorderThickness = new Thickness(1)
+            Content = new TView(){ DataContext = vm },
+            DataContext = vm,
         };
         t.DataContext = vm;
         var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogOptions.cs b/src/Ursa/Controls/Dialog/OverlayDialogOptions.cs
new file mode 100644
index 0000000..0f6c489
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/OverlayDialogOptions.cs
@@ -0,0 +1,6 @@
+namespace Ursa.Controls;
+
+public record OverlayDialogOptions
+{
+    public bool ShowCloseButton { get; set; } = true;
+}
\ No newline at end of file

From 2c361f9f3c53d3968f92ac3f1b47989f1078a8c2 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Sun, 21 Jan 2024 23:40:06 +0800
Subject: [PATCH 04/28] feat: WIP dialog window.

---
 demo/Ursa.Demo/Pages/DialogDemo.axaml         |  1 +
 .../ViewModels/DialogDemoViewModel.cs         | 17 ++++--
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 52 +++++++++++++++++++
 src/Ursa.Themes.Semi/Controls/_index.axaml    |  1 +
 src/Ursa/Controls/Dialog/DialogBox.cs         | 45 +++++++++++++---
 src/Ursa/Controls/Dialog/DialogControl.cs     | 19 +++++++
 src/Ursa/Controls/Dialog/DialogWindow.cs      | 30 +++++++++++
 src/Ursa/Controls/Dialog/IDialogContext.cs    |  3 +-
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 44 +++++++++++++---
 9 files changed, 193 insertions(+), 19 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Controls/Dialog.axaml
 create mode 100644 src/Ursa/Controls/Dialog/DialogWindow.cs

diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 4bc5427..24e36eb 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -13,6 +13,7 @@
     mc:Ignorable="d">
     <Grid ColumnDefinitions="Auto, *">
         <StackPanel Grid.Column="0">
+            <Button Command="{Binding ShowGlobalDialogCommand}">Show Dialog</Button>
             <Button Command="{Binding ShowLocalOverlayDialogCommand}">Show Local Overlay Dialog</Button>
             <Button Command="{Binding ShowGlobalOverlayDialogCommand}"> Show Global Overlay Dialog </Button>
         </StackPanel>
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 7210529..e96ee23 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia.Controls;
 using Avalonia.Controls.Shapes;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Ursa.Controls;
+using Ursa.Demo.Pages;
 
 namespace Ursa.Demo.ViewModels;
 
@@ -12,19 +14,26 @@ public class DialogDemoViewModel: ObservableObject
 {
     public ICommand ShowLocalOverlayDialogCommand { get; }
     public ICommand ShowGlobalOverlayDialogCommand { get; }
+    public ICommand ShowGlobalDialogCommand { get; }
 
     public DialogDemoViewModel()
     {
-        ShowLocalOverlayDialogCommand = new RelayCommand(ShowLocalOverlayDialog);
-        ShowGlobalOverlayDialogCommand = new RelayCommand(ShowGlobalOverlayDialog);
+        ShowLocalOverlayDialogCommand = new AsyncRelayCommand(ShowLocalOverlayDialog);
+        ShowGlobalOverlayDialogCommand = new AsyncRelayCommand(ShowGlobalOverlayDialog);
+        ShowGlobalDialogCommand = new AsyncRelayCommand(ShowGlobalDialog);
     }
 
-    private async void ShowGlobalOverlayDialog()
+    private async Task ShowGlobalDialog()
+    {
+        await DialogBox.ShowAsync<BadgeDemo, BadgeDemoViewModel, string>(new BadgeDemoViewModel());
+    }
+
+    private async Task ShowGlobalOverlayDialog()
     {
         await DialogBox.ShowOverlayAsync<Banner, DateTime>(DateTime.Now, "GlobalHost");
     }
 
-    private async void ShowLocalOverlayDialog()
+    private async Task ShowLocalOverlayDialog()
     {
         await DialogBox.ShowOverlayAsync<Banner, DateTime>(DateTime.Now, "LocalHost");
     }
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
new file mode 100644
index 0000000..62355cb
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -0,0 +1,52 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:u="https://irihi.tech/ursa">
+    <!-- Add Resources Here -->
+    <ControlTheme x:Key="{x:Type u:DialogControl}" TargetType="u:DialogControl">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:DialogControl">
+                <Border HorizontalAlignment="Center" VerticalAlignment="Center" Theme="{DynamicResource CardBorder}" Width="100" Height="100" IsHitTestVisible="True">
+                    <Grid RowDefinitions="Auto, *, Auto">
+                        <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter>
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+    
+    <ControlTheme x:Key="{x:Type u:DialogWindow}" TargetType="u:DialogWindow">
+        <Setter Property="Title" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
+        <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
+        <Setter Property="Padding" Value="48 24" />
+        <Setter Property="SizeToContent" Value="WidthAndHeight" />
+        <Setter Property="WindowStartupLocation" Value="CenterOwner" />
+        <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="1" />
+        <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
+        <Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome"/>
+        <Setter Property="SystemDecorations">
+            <OnPlatform >
+                <OnPlatform.Windows><SystemDecorations>Full</SystemDecorations></OnPlatform.Windows>
+                <OnPlatform.Default><SystemDecorations>BorderOnly</SystemDecorations></OnPlatform.Default>
+            </OnPlatform>
+        </Setter>
+        <Setter Property="CanResize" Value="False" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:DialogWindow">
+                <Panel>
+                    <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+                    <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
+                    <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
+                    <ChromeOverlayLayer></ChromeOverlayLayer>
+                    <Grid RowDefinitions="Auto, *, Auto">
+                        <Button Name="{x:Static u:DialogWindow.PART_CloseButton}" VerticalAlignment="Top">Close</Button>
+                        <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter>
+                    </Grid>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/_index.axaml b/src/Ursa.Themes.Semi/Controls/_index.axaml
index edf9abb..e9ab67e 100644
--- a/src/Ursa.Themes.Semi/Controls/_index.axaml
+++ b/src/Ursa.Themes.Semi/Controls/_index.axaml
@@ -4,6 +4,7 @@
         <ResourceInclude Source="Badge.axaml" />
         <ResourceInclude Source="Banner.axaml" />
         <ResourceInclude Source="ButtonGroup.axaml" />
+        <ResourceInclude Source="Dialog.axaml" />
         <ResourceInclude Source="Divider.axaml" />
         <ResourceInclude Source="DualBadge.axaml" />
         <ResourceInclude Source="IconButton.axaml" />
diff --git a/src/Ursa/Controls/Dialog/DialogBox.cs b/src/Ursa/Controls/Dialog/DialogBox.cs
index 38a3641..980cf57 100644
--- a/src/Ursa/Controls/Dialog/DialogBox.cs
+++ b/src/Ursa/Controls/Dialog/DialogBox.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Shapes;
 using Avalonia.Media;
 
@@ -7,18 +8,46 @@ namespace Ursa.Controls;
 
 public static class DialogBox
 {
-    public static async Task ShowAsync()
+    public static async Task<TResult?> ShowAsync<TView, TViewModel, TResult>(TViewModel vm) where TView : Control, new()
     {
-        return;
+        var window = new DialogWindow()
+        {
+            Content = new TView()
+            {
+                DataContext = vm,
+            },
+            DataContext = vm,
+        };
+        var lifetime = Application.Current?.ApplicationLifetime;
+        if (lifetime is IClassicDesktopStyleApplicationLifetime classLifetime)
+        {
+            var main = classLifetime.MainWindow;
+            if (main is null)
+            {
+                window.Show();
+                return default(TResult);
+            }
+            else
+            {
+                var result = await window.ShowDialog<TResult>(main);
+                return result;
+            }
+        }
+        else
+        {
+            return default(TResult);
+        }
     }
-
-    public static async Task ShowAsync<TView, TViewModel>(TViewModel vm) 
-        where TView: Control, new()
-        where TViewModel: new()
+    
+    public static async Task<TResult> ShowAsync<TView, TViewModel, TResult>(Window owner, TViewModel vm) where 
+        TView: Control, new()
     {
-        TView t = new TView();
-        t.DataContext = vm;
+        var window = new DialogWindow();
+        window.Content = new TView();
+        window.DataContext = vm;
+        return await window.ShowDialog<TResult>(owner);
     }
+    
 
     public static async Task<object?> ShowOverlayAsync<TView, TViewModel>(TViewModel vm, string hostId)
         where TView : Control, new()
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index d46adc5..e3cae7a 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -1,8 +1,27 @@
 using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
 
 namespace Ursa.Controls;
 
+[TemplatePart(PART_CloseButton, typeof(Button))]
 public class DialogControl: ContentControl
 {
+    public const string PART_CloseButton = "PART_CloseButton";
     
+    
+    
+    private Button? _closeButton;
+    public event EventHandler OnClose;
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+    }
+
+    public void Show()
+    {
+        
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
new file mode 100644
index 0000000..9ec685e
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -0,0 +1,30 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+
+namespace Ursa.Controls;
+
+[TemplatePart(PART_CloseButton, typeof(Button))]
+public class DialogWindow: Window
+{
+    public const string PART_CloseButton = "PART_CloseButton";
+    
+    protected override Type StyleKeyOverride { get; } = typeof(DialogWindow);
+
+    private Button? _closeButton;
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
+        
+        if (_closeButton != null)
+        {
+            _closeButton.Click += (sender, args) =>
+            {
+                Close();
+            };
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/IDialogContext.cs b/src/Ursa/Controls/Dialog/IDialogContext.cs
index b88b355..ffcaeef 100644
--- a/src/Ursa/Controls/Dialog/IDialogContext.cs
+++ b/src/Ursa/Controls/Dialog/IDialogContext.cs
@@ -2,5 +2,6 @@ namespace Ursa.Controls;
 
 public interface IDialogContext
 {
-    
+    object Close();
+    T? Close<T>();
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index cdef578..8b87abd 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -1,14 +1,26 @@
+using System.Collections.Specialized;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Media;
 using Avalonia.Utilities;
+using Avalonia.VisualTree;
 
-namespace Ursa.Controls;
+namespace Ursa.Controls; 
 
 public class OverlayDialogHost: Canvas
 {
+    private readonly List<DialogControl> _dialogs = new();
+    private readonly List<DialogControl> _modalDialogs = new();
+
+    private Rectangle _overlayMask = new()
+    {
+        Fill = new SolidColorBrush(new Color(1, 0, 0, 0)),
+        [Rectangle.ZIndexProperty] = 0,
+    };
+    
     public static readonly StyledProperty<string> HostIdProperty = AvaloniaProperty.Register<OverlayDialogHost, string>(
         nameof(HostId));
 
@@ -39,13 +51,18 @@ public class OverlayDialogHost: Canvas
         {
             if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
+                var parent  = item.FindAncestorOfType<DialogControl>();
+                if (parent is null)
+                {
+                    return;
+                }
                 var p = e.GetPosition(this);
                 var left=  p.X - _lastPoint.X;
                 var top = p.Y - _lastPoint.Y;
-                left = MathUtilities.Clamp(left, 0, Bounds.Width - item.Bounds.Width);
-                top = MathUtilities.Clamp(top, 0, Bounds.Height - item.Bounds.Height);
-                Canvas.SetLeft(item, left);
-                Canvas.SetTop(item, top);
+                left = MathUtilities.Clamp(left, 0, Bounds.Width - parent.Bounds.Width);
+                top = MathUtilities.Clamp(top, 0, Bounds.Height - parent.Bounds.Height);
+                Canvas.SetLeft(parent, left);
+                Canvas.SetTop(parent, top);
             }
         }
     }
@@ -55,7 +72,22 @@ public class OverlayDialogHost: Canvas
         base.OnPointerPressed(e);
         if (e.Source is Control item)
         {
-            _lastPoint = e.GetPosition(item);
+            var parent  = item.FindAncestorOfType<DialogControl>();
+            if (parent is null)
+            {
+                return;
+            }
+            _lastPoint = e.GetPosition(parent);
         }
     }
+
+    public void AddDialog(DialogControl control)
+    {
+        this.Children.Add(control);
+    }
+
+    public void AddModalDialog(DialogControl control)
+    {
+        this.Children.Add(control);
+    }
 }
\ No newline at end of file

From 9cff01c0323891475acbf23c05e111f60e053928 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Mon, 22 Jan 2024 11:36:45 +0800
Subject: [PATCH 05/28] feat: WIP

---
 .../ViewModels/DialogDemoViewModel.cs         |  2 +-
 src/Ursa/Controls/Dialog/DialogBox.cs         |  8 ++--
 src/Ursa/Controls/Dialog/DialogWindow.cs      | 42 ++++++++++++++++---
 src/Ursa/Controls/Dialog/IDialogContext.cs    |  4 +-
 4 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index e96ee23..9fe6f00 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -25,7 +25,7 @@ public class DialogDemoViewModel: ObservableObject
 
     private async Task ShowGlobalDialog()
     {
-        await DialogBox.ShowAsync<BadgeDemo, BadgeDemoViewModel, string>(new BadgeDemoViewModel());
+        var result = await DialogBox.ShowAsync<ButtonGroupDemo, ButtonGroupDemoViewModel, string>(new ButtonGroupDemoViewModel());
     }
 
     private async Task ShowGlobalOverlayDialog()
diff --git a/src/Ursa/Controls/Dialog/DialogBox.cs b/src/Ursa/Controls/Dialog/DialogBox.cs
index 980cf57..f92e848 100644
--- a/src/Ursa/Controls/Dialog/DialogBox.cs
+++ b/src/Ursa/Controls/Dialog/DialogBox.cs
@@ -8,14 +8,12 @@ namespace Ursa.Controls;
 
 public static class DialogBox
 {
-    public static async Task<TResult?> ShowAsync<TView, TViewModel, TResult>(TViewModel vm) where TView : Control, new()
+    public static async Task<TResult?> ShowAsync<TView, TViewModel, TResult>(TViewModel vm) 
+        where TView : Control, new()
     {
         var window = new DialogWindow()
         {
-            Content = new TView()
-            {
-                DataContext = vm,
-            },
+            Content = new TView(),
             DataContext = vm,
         };
         var lifetime = Application.Current?.ApplicationLifetime;
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
index 9ec685e..72ce67c 100644
--- a/src/Ursa/Controls/Dialog/DialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
 
 namespace Ursa.Controls;
 
@@ -13,6 +14,24 @@ public class DialogWindow: Window
 
     private Button? _closeButton;
 
+    protected override void OnDataContextBeginUpdate()
+    {
+        base.OnDataContextBeginUpdate();
+        if (DataContext is IDialogContext context)
+        {
+            context.Closed-= OnDialogClose;
+        }
+    }
+
+    protected override void OnDataContextEndUpdate()
+    {
+        base.OnDataContextEndUpdate();
+        if (DataContext is IDialogContext context)
+        {
+            context.Closed += OnDialogClose;
+        }
+    }
+
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
@@ -20,11 +39,24 @@ public class DialogWindow: Window
         
         if (_closeButton != null)
         {
-            _closeButton.Click += (sender, args) =>
-            {
-                Close();
-            };
+            _closeButton.Click += OnDefaultClose;
+        }
+    }
+
+    private void OnDialogClose(object? sender, object? args)
+    {
+        Close(args);
+    }
+
+    private void OnDefaultClose(object sender, RoutedEventArgs args)
+    {
+        if (DataContext is IDialogContext context)
+        {
+            Close(context.DefaultCloseResult);
+        }
+        else
+        {
+            Close(null);
         }
-        
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/IDialogContext.cs b/src/Ursa/Controls/Dialog/IDialogContext.cs
index ffcaeef..6920f46 100644
--- a/src/Ursa/Controls/Dialog/IDialogContext.cs
+++ b/src/Ursa/Controls/Dialog/IDialogContext.cs
@@ -2,6 +2,6 @@ namespace Ursa.Controls;
 
 public interface IDialogContext
 {
-    object Close();
-    T? Close<T>();
+    object? DefaultCloseResult { get; set; }
+    event EventHandler<object> Closed;
 }
\ No newline at end of file

From 5c62131a0a744f6ec397b29d1222c4ee402b38a1 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Mon, 22 Jan 2024 17:27:11 +0800
Subject: [PATCH 06/28] feat: implement closing related features.

---
 .../ViewModels/DialogDemoViewModel.cs         |  6 +--
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 46 +++++++++++++------
 src/Ursa/Controls/Dialog/DialogBox.cs         |  2 +-
 src/Ursa/Controls/Dialog/DialogControl.cs     | 23 +++++++++-
 ...erlayDialogOptions.cs => DialogOptions.cs} |  2 +-
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 11 +++++
 6 files changed, 70 insertions(+), 20 deletions(-)
 rename src/Ursa/Controls/Dialog/{OverlayDialogOptions.cs => DialogOptions.cs} (70%)

diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 9fe6f00..f1ca5f6 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Ursa.Controls;
@@ -30,11 +28,11 @@ public class DialogDemoViewModel: ObservableObject
 
     private async Task ShowGlobalOverlayDialog()
     {
-        await DialogBox.ShowOverlayAsync<Banner, DateTime>(DateTime.Now, "GlobalHost");
+        await DialogBox.ShowOverlayAsync<ButtonGroupDemo, ButtonGroupDemoViewModel>(new ButtonGroupDemoViewModel(), "GlobalHost");
     }
 
     private async Task ShowLocalOverlayDialog()
     {
-        await DialogBox.ShowOverlayAsync<Banner, DateTime>(DateTime.Now, "LocalHost");
+        await DialogBox.ShowOverlayAsync<ButtonGroupDemo, ButtonGroupDemoViewModel>(new ButtonGroupDemoViewModel(), "LocalHost");
     }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 62355cb..6774e5c 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -1,19 +1,35 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:u="https://irihi.tech/ursa">
-    <!-- Add Resources Here -->
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:u="https://irihi.tech/ursa">
+    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:DialogControl}" TargetType="u:DialogControl">
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DialogControl">
-                <Border HorizontalAlignment="Center" VerticalAlignment="Center" Theme="{DynamicResource CardBorder}" Width="100" Height="100" IsHitTestVisible="True">
+                <Border
+                    Classes="Shadow"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsHitTestVisible="True"
+                    Theme="{DynamicResource CardBorder}">
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter>
+                        <StackPanel Grid.Row="0" HorizontalAlignment="Right">
+                            <Button Name="{x:Static u:DialogControl.PART_CloseButton}">Close</Button>
+                        </StackPanel>
+                        <ContentPresenter
+                            Grid.Row="0"
+                            Grid.RowSpan="2"
+                            Content="{TemplateBinding Content}" />
+                        <StackPanel Grid.Row="2">
+                            <Button>OK</Button>
+                            <Button>Cancel</Button>
+                        </StackPanel>
                     </Grid>
                 </Border>
             </ControlTemplate>
         </Setter>
     </ControlTheme>
-    
+
     <ControlTheme x:Key="{x:Type u:DialogWindow}" TargetType="u:DialogWindow">
         <Setter Property="Title" Value="{x:Null}" />
         <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
@@ -26,11 +42,15 @@
         <Setter Property="WindowStartupLocation" Value="CenterOwner" />
         <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="1" />
         <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
-        <Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome"/>
+        <Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome" />
         <Setter Property="SystemDecorations">
-            <OnPlatform >
-                <OnPlatform.Windows><SystemDecorations>Full</SystemDecorations></OnPlatform.Windows>
-                <OnPlatform.Default><SystemDecorations>BorderOnly</SystemDecorations></OnPlatform.Default>
+            <OnPlatform>
+                <OnPlatform.Windows>
+                    <SystemDecorations>Full</SystemDecorations>
+                </OnPlatform.Windows>
+                <OnPlatform.Default>
+                    <SystemDecorations>BorderOnly</SystemDecorations>
+                </OnPlatform.Default>
             </OnPlatform>
         </Setter>
         <Setter Property="CanResize" Value="False" />
@@ -40,10 +60,10 @@
                     <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
                     <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
-                    <ChromeOverlayLayer></ChromeOverlayLayer>
+                    <ChromeOverlayLayer />
                     <Grid RowDefinitions="Auto, *, Auto">
                         <Button Name="{x:Static u:DialogWindow.PART_CloseButton}" VerticalAlignment="Top">Close</Button>
-                        <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter>
+                        <ContentPresenter Content="{TemplateBinding Content}" />
                     </Grid>
                 </Panel>
             </ControlTemplate>
diff --git a/src/Ursa/Controls/Dialog/DialogBox.cs b/src/Ursa/Controls/Dialog/DialogBox.cs
index f92e848..90e68d7 100644
--- a/src/Ursa/Controls/Dialog/DialogBox.cs
+++ b/src/Ursa/Controls/Dialog/DialogBox.cs
@@ -58,7 +58,7 @@ public static class DialogBox
         };
         t.DataContext = vm;
         var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
-        host?.Children.Add(t);
+        host?.AddDialog(t);
         return null;
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index e3cae7a..d544674 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -13,15 +13,36 @@ public class DialogControl: ContentControl
     
     
     private Button? _closeButton;
-    public event EventHandler OnClose;
+    public event EventHandler<object?> OnClose;
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
+        if (_closeButton != null)
+        {
+            _closeButton.Click -= Close;
+        }
+        _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
+        if (_closeButton is not null)
+        {
+            _closeButton.Click += Close;
+        }
     }
 
     public void Show()
     {
         
     }
+
+    private void Close(object sender, object args)
+    {
+        if (this.DataContext is IDialogContext context)
+        {
+            OnClose?.Invoke(this, context.DefaultCloseResult);
+        }
+        else
+        {
+            OnClose?.Invoke(this, null);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogOptions.cs b/src/Ursa/Controls/Dialog/DialogOptions.cs
similarity index 70%
rename from src/Ursa/Controls/Dialog/OverlayDialogOptions.cs
rename to src/Ursa/Controls/Dialog/DialogOptions.cs
index 0f6c489..74130e7 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogOptions.cs
+++ b/src/Ursa/Controls/Dialog/DialogOptions.cs
@@ -1,6 +1,6 @@
 namespace Ursa.Controls;
 
-public record OverlayDialogOptions
+public record DialogOptions
 {
     public bool ShowCloseButton { get; set; } = true;
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 8b87abd..1b8eb2a 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -84,6 +84,17 @@ public class OverlayDialogHost: Canvas
     public void AddDialog(DialogControl control)
     {
         this.Children.Add(control);
+        control.OnClose += OnDialogClose;
+    }
+
+    private void OnDialogClose(object sender, object? e)
+    {
+        if (sender is DialogControl control)
+        {
+            this.Children.Remove(control);
+            control.OnClose -= OnDialogClose;
+        }
+        
     }
 
     public void AddModalDialog(DialogControl control)

From f0ec32c8702d2de1858db9aba5048fb608b3b045 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Mon, 22 Jan 2024 18:32:24 +0800
Subject: [PATCH 07/28] feat: add overlay dialog sample.

---
 demo/Ursa.Demo/Dialogs/DialogWithAction.axaml | 18 ++++++++++
 .../Dialogs/DialogWithAction.axaml.cs         | 13 +++++++
 .../Dialogs/DialogWithActionViewModel.cs      | 36 +++++++++++++++++++
 demo/Ursa.Demo/Dialogs/PlainDialog.axaml      |  8 +++++
 demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs   | 13 +++++++
 .../Ursa.Demo/Dialogs/PlainDialogViewModel.cs |  8 +++++
 demo/Ursa.Demo/Pages/DialogDemo.axaml         |  4 +++
 .../ViewModels/DialogDemoViewModel.cs         | 18 ++++++++--
 src/Ursa/Controls/Dialog/DialogBox.cs         |  4 +--
 src/Ursa/Controls/Dialog/DialogControl.cs     | 26 +++++++++++---
 10 files changed, 139 insertions(+), 9 deletions(-)
 create mode 100644 demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
 create mode 100644 demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs
 create mode 100644 demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
 create mode 100644 demo/Ursa.Demo/Dialogs/PlainDialog.axaml
 create mode 100644 demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs
 create mode 100644 demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs

diff --git a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
new file mode 100644
index 0000000..022fed8
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
@@ -0,0 +1,18 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="clr-namespace:Ursa.Demo.Dialogs"
+             x:DataType="local:DialogWithActionViewModel"
+             x:CompileBindings="True"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Ursa.Demo.Dialogs.DialogWithAction">
+    <StackPanel Margin="0 16 0 0">
+        <TextBlock Text="{Binding Title}"></TextBlock>
+        <Calendar SelectedDate="{Binding Date}" ></Calendar>
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Spacing="20">
+            <Button Content="OK" Command="{Binding OKCommand}"></Button>
+            <Button Content="Cancel" Command="{Binding CancelCommand}"></Button>
+        </StackPanel>
+    </StackPanel>
+</UserControl>
diff --git a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs
new file mode 100644
index 0000000..783f47b
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Ursa.Demo.Dialogs;
+
+public partial class DialogWithAction : UserControl
+{
+    public DialogWithAction()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
new file mode 100644
index 0000000..d5a3b58
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Windows.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Ursa.Controls;
+
+namespace Ursa.Demo.Dialogs;
+
+public partial class DialogWithActionViewModel: ObservableObject, IDialogContext
+{
+    [ObservableProperty] private string _title;
+    [ObservableProperty] private DateTime _date;
+    public object? DefaultCloseResult { get; set; } = true;
+    public event EventHandler<object>? Closed;
+    
+    public ICommand OKCommand { get; set; }
+    public ICommand CancelCommand { get; set; }
+    
+    public DialogWithActionViewModel()
+    {
+        OKCommand = new RelayCommand(OK);
+        CancelCommand = new RelayCommand(Cancel);
+        Title = "Please select a date";
+        Date = DateTime.Now;
+    }
+
+    private void OK()
+    {
+        Closed?.Invoke(this, true);
+    }
+
+    private void Cancel()
+    {
+        Closed?.Invoke(this, false);
+    }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
new file mode 100644
index 0000000..7879fe4
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
@@ -0,0 +1,8 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Ursa.Demo.Dialogs.PlainDialog">
+    
+</UserControl>
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs
new file mode 100644
index 0000000..1e4be06
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Ursa.Demo.Dialogs;
+
+public partial class PlainDialog : UserControl
+{
+    public PlainDialog()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs b/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs
new file mode 100644
index 0000000..e7105f2
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs
@@ -0,0 +1,8 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Ursa.Demo.Dialogs;
+
+public class PlainDialogViewModel: ObservableObject
+{
+    
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 24e36eb..ef5dc49 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -13,6 +13,10 @@
     mc:Ignorable="d">
     <Grid ColumnDefinitions="Auto, *">
         <StackPanel Grid.Column="0">
+            <TextBlock>
+                <Run Text="Result: "></Run>
+                <Run Text="{Binding Result}"></Run>
+            </TextBlock>
             <Button Command="{Binding ShowGlobalDialogCommand}">Show Dialog</Button>
             <Button Command="{Binding ShowLocalOverlayDialogCommand}">Show Local Overlay Dialog</Button>
             <Button Command="{Binding ShowGlobalOverlayDialogCommand}"> Show Global Overlay Dialog </Button>
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index f1ca5f6..f9144e2 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -4,6 +4,7 @@ using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Ursa.Controls;
+using Ursa.Demo.Dialogs;
 using Ursa.Demo.Pages;
 
 namespace Ursa.Demo.ViewModels;
@@ -14,6 +15,14 @@ public class DialogDemoViewModel: ObservableObject
     public ICommand ShowGlobalOverlayDialogCommand { get; }
     public ICommand ShowGlobalDialogCommand { get; }
 
+    private object? _result;
+
+    public object? Result
+    {
+        get => _result;
+        set => SetProperty(ref _result, value);
+    }
+
     public DialogDemoViewModel()
     {
         ShowLocalOverlayDialogCommand = new AsyncRelayCommand(ShowLocalOverlayDialog);
@@ -23,16 +32,19 @@ public class DialogDemoViewModel: ObservableObject
 
     private async Task ShowGlobalDialog()
     {
-        var result = await DialogBox.ShowAsync<ButtonGroupDemo, ButtonGroupDemoViewModel, string>(new ButtonGroupDemoViewModel());
+        var result = await DialogBox.ShowAsync<DialogWithAction, DialogWithActionViewModel, bool>(new DialogWithActionViewModel());
+        Result = result;
     }
 
     private async Task ShowGlobalOverlayDialog()
     {
-        await DialogBox.ShowOverlayAsync<ButtonGroupDemo, ButtonGroupDemoViewModel>(new ButtonGroupDemoViewModel(), "GlobalHost");
+        await DialogBox.ShowOverlayAsync<DialogWithAction, DialogWithActionViewModel, bool>(new DialogWithActionViewModel(), "GlobalHost");
     }
 
     private async Task ShowLocalOverlayDialog()
     {
-        await DialogBox.ShowOverlayAsync<ButtonGroupDemo, ButtonGroupDemoViewModel>(new ButtonGroupDemoViewModel(), "LocalHost");
+        var result = await DialogBox.ShowOverlayAsync<DialogWithAction, DialogWithActionViewModel, bool>(
+            new DialogWithActionViewModel(), "LocalHost");
+        Result = result;
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogBox.cs b/src/Ursa/Controls/Dialog/DialogBox.cs
index 90e68d7..a5d4fa7 100644
--- a/src/Ursa/Controls/Dialog/DialogBox.cs
+++ b/src/Ursa/Controls/Dialog/DialogBox.cs
@@ -47,7 +47,7 @@ public static class DialogBox
     }
     
 
-    public static async Task<object?> ShowOverlayAsync<TView, TViewModel>(TViewModel vm, string hostId)
+    public static Task<TResult> ShowOverlayAsync<TView, TViewModel, TResult>(TViewModel vm, string hostId)
         where TView : Control, new()
         where TViewModel: new()
     {
@@ -59,6 +59,6 @@ public static class DialogBox
         t.DataContext = vm;
         var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
         host?.AddDialog(t);
-        return null;
+        return t.ShowAsync<TResult>();
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index d544674..7aeae47 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -27,18 +27,36 @@ public class DialogControl: ContentControl
         {
             _closeButton.Click += Close;
         }
-    }
 
-    public void Show()
+        if (this.DataContext is IDialogContext context)
+        {
+            context.Closed += Close;
+        }
+    }
+    
+
+    public Task<T> ShowAsync<T>()
     {
-        
+        var tcs = new TaskCompletionSource<T>();
+        this.OnClose+= (sender, args) =>
+        {
+            if (args is T result)
+            {
+                tcs.SetResult(result);
+            }
+            else
+            {
+                tcs.SetResult(default);
+            }
+        };
+        return tcs.Task;
     }
 
     private void Close(object sender, object args)
     {
         if (this.DataContext is IDialogContext context)
         {
-            OnClose?.Invoke(this, context.DefaultCloseResult);
+            OnClose?.Invoke(this, args);
         }
         else
         {

From 0a3f7dbf5f194c37499bb824a255a93fdd9d947e Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Mon, 22 Jan 2024 19:00:12 +0800
Subject: [PATCH 08/28] feat: fix memory leakage.

---
 demo/Ursa.Demo/Pages/DialogDemo.axaml            |  4 ++++
 demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs | 14 +++++++++++++-
 src/Ursa.Themes.Semi/Controls/Dialog.axaml       |  4 ----
 src/Ursa/Controls/Dialog/DialogControl.cs        | 13 ++++++++-----
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index ef5dc49..072edcb 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -17,6 +17,10 @@
                 <Run Text="Result: "></Run>
                 <Run Text="{Binding Result}"></Run>
             </TextBlock>
+            <TextBlock>
+                <Run Text="Date: "></Run>
+                <Run Text="{Binding DialogViewModel.Date}"></Run>
+            </TextBlock>
             <Button Command="{Binding ShowGlobalDialogCommand}">Show Dialog</Button>
             <Button Command="{Binding ShowLocalOverlayDialogCommand}">Show Local Overlay Dialog</Button>
             <Button Command="{Binding ShowGlobalOverlayDialogCommand}"> Show Global Overlay Dialog </Button>
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index f9144e2..02ad255 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -23,6 +23,16 @@ public class DialogDemoViewModel: ObservableObject
         set => SetProperty(ref _result, value);
     }
 
+    private DateTime _date;
+
+    public DateTime Date
+    {
+        get => _date;
+        set => SetProperty(ref _date, value);
+    }
+
+    public DialogWithActionViewModel DialogViewModel { get; set; } = new DialogWithActionViewModel();
+
     public DialogDemoViewModel()
     {
         ShowLocalOverlayDialogCommand = new AsyncRelayCommand(ShowLocalOverlayDialog);
@@ -43,8 +53,10 @@ public class DialogDemoViewModel: ObservableObject
 
     private async Task ShowLocalOverlayDialog()
     {
+        var vm = new DialogWithActionViewModel();
         var result = await DialogBox.ShowOverlayAsync<DialogWithAction, DialogWithActionViewModel, bool>(
-            new DialogWithActionViewModel(), "LocalHost");
+            DialogViewModel, "LocalHost");
+        Date = vm.Date;
         Result = result;
     }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 6774e5c..9e4662a 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -20,10 +20,6 @@
                             Grid.Row="0"
                             Grid.RowSpan="2"
                             Content="{TemplateBinding Content}" />
-                        <StackPanel Grid.Row="2">
-                            <Button>OK</Button>
-                            <Button>Cancel</Button>
-                        </StackPanel>
                     </Grid>
                 </Border>
             </ControlTemplate>
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index 7aeae47..5e1f408 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -10,8 +10,6 @@ public class DialogControl: ContentControl
 {
     public const string PART_CloseButton = "PART_CloseButton";
     
-    
-    
     private Button? _closeButton;
     public event EventHandler<object?> OnClose;
 
@@ -38,17 +36,22 @@ public class DialogControl: ContentControl
     public Task<T> ShowAsync<T>()
     {
         var tcs = new TaskCompletionSource<T>();
-        this.OnClose+= (sender, args) =>
+
+        void OnCloseHandler(object sender, object? args)
         {
             if (args is T result)
             {
                 tcs.SetResult(result);
+                OnClose-= OnCloseHandler;
             }
             else
             {
-                tcs.SetResult(default);
+                tcs.SetResult(default(T));
+                OnClose-= OnCloseHandler;
             }
-        };
+        }
+
+        this.OnClose += OnCloseHandler;
         return tcs.Task;
     }
 

From c9698428701faa416c789ed05772f364a93b4175 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Mon, 22 Jan 2024 19:55:20 +0800
Subject: [PATCH 09/28] feat: set result.

---
 .../ViewModels/DialogDemoViewModel.cs         |  4 +--
 src/Ursa/Controls/Dialog/DialogControl.cs     | 27 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 02ad255..05df4a7 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -42,13 +42,13 @@ public class DialogDemoViewModel: ObservableObject
 
     private async Task ShowGlobalDialog()
     {
-        var result = await DialogBox.ShowAsync<DialogWithAction, DialogWithActionViewModel, bool>(new DialogWithActionViewModel());
+        var result = await DialogBox.ShowAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
         Result = result;
     }
 
     private async Task ShowGlobalOverlayDialog()
     {
-        await DialogBox.ShowOverlayAsync<DialogWithAction, DialogWithActionViewModel, bool>(new DialogWithActionViewModel(), "GlobalHost");
+        Result = await DialogBox.ShowOverlayAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel, "GlobalHost");
     }
 
     private async Task ShowLocalOverlayDialog()
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index 5e1f408..2436104 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -1,3 +1,4 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
@@ -11,7 +12,26 @@ public class DialogControl: ContentControl
     public const string PART_CloseButton = "PART_CloseButton";
     
     private Button? _closeButton;
-    public event EventHandler<object?> OnClose;
+    public event EventHandler<object?>? OnClose;
+
+    static DialogControl()
+    {
+        DataContextProperty.Changed.AddClassHandler<DialogControl, object?>((o, e) => o.OnDataContextChange(e));
+    }
+
+    private void OnDataContextChange(AvaloniaPropertyChangedEventArgs<object?> args)
+    {
+        if (args.OldValue.Value is IDialogContext oldContext)
+        {
+            oldContext.Closed-= Close;
+        }
+
+        if (args.NewValue.Value is IDialogContext newContext)
+        {
+            newContext.Closed += Close;
+        }
+        
+    }
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
@@ -25,11 +45,6 @@ public class DialogControl: ContentControl
         {
             _closeButton.Click += Close;
         }
-
-        if (this.DataContext is IDialogContext context)
-        {
-            context.Closed += Close;
-        }
     }
     
 

From 611e2bc84e1ae08a269fc913021016a80d035a11 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Mon, 22 Jan 2024 21:35:01 +0800
Subject: [PATCH 10/28] feat: WIP

---
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    |  6 ++---
 src/Ursa/Controls/Dialog/DialogWindow.cs      |  6 +++++
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 27 +++++++++++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 9e4662a..2b8df2a 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -14,7 +14,7 @@
                     Theme="{DynamicResource CardBorder}">
                     <Grid RowDefinitions="Auto, *, Auto">
                         <StackPanel Grid.Row="0" HorizontalAlignment="Right">
-                            <Button Name="{x:Static u:DialogControl.PART_CloseButton}">Close</Button>
+                            <Button Name="{x:Static u:DialogControl.PART_CloseButton}" >Close</Button>
                         </StackPanel>
                         <ContentPresenter
                             Grid.Row="0"
@@ -58,8 +58,8 @@
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
                     <ChromeOverlayLayer />
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <Button Name="{x:Static u:DialogWindow.PART_CloseButton}" VerticalAlignment="Top">Close</Button>
-                        <ContentPresenter Content="{TemplateBinding Content}" />
+                        <Button Name="{x:Static u:DialogWindow.PART_CloseButton}" VerticalAlignment="Top" HorizontalAlignment="Right">Close</Button>
+                        <ContentPresenter Grid.Row="0" Grid.RowSpan="2" Content="{TemplateBinding Content}" />
                     </Grid>
                 </Panel>
             </ControlTemplate>
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
index 72ce67c..33bec5f 100644
--- a/src/Ursa/Controls/Dialog/DialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace Ursa.Controls;
@@ -59,4 +60,9 @@ public class DialogWindow: Window
             Close(null);
         }
     }
+
+    protected override void OnPointerPressed(PointerPressedEventArgs e)
+    {
+        this.BeginMoveDrag(e);
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 1b8eb2a..0fee47c 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;
+using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
@@ -36,6 +37,24 @@ public class OverlayDialogHost: Canvas
     {
         base.OnAttachedToVisualTree(e);
         OverlayDialogManager.RegisterOverlayDialogHost(this, HostId);
+        this.Children.Add(new Border()
+        {
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+            VerticalAlignment = VerticalAlignment.Stretch,
+            Background = Brushes.Black,
+            Opacity = 0.3,
+            IsVisible = false,
+        });
+    }
+
+    protected override void OnSizeChanged(SizeChangedEventArgs e)
+    {
+        base.OnSizeChanged(e);
+        if (this.Children.Count > 0)
+        {
+            this.Children[0].Width = this.Bounds.Width;
+            this.Children[0].Height = this.Bounds.Height;
+        }
     }
 
     protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
@@ -85,6 +104,10 @@ public class OverlayDialogHost: Canvas
     {
         this.Children.Add(control);
         control.OnClose += OnDialogClose;
+        if (this.Children.Count > 1)
+        {
+            this.Children[0].IsVisible = true;
+        }
     }
 
     private void OnDialogClose(object sender, object? e)
@@ -93,6 +116,10 @@ public class OverlayDialogHost: Canvas
         {
             this.Children.Remove(control);
             control.OnClose -= OnDialogClose;
+            if (this.Children.Count == 1)
+            {
+                this.Children[0].IsVisible = false;
+            }
         }
         
     }

From 7c29320ad9ef709af5ef41feed59b565839871f9 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Tue, 23 Jan 2024 00:30:24 +0800
Subject: [PATCH 11/28] fix: pass default value when close from control.

---
 demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs | 1 -
 src/Ursa/Controls/Dialog/DialogControl.cs        | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 05df4a7..28b0d3f 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -56,7 +56,6 @@ public class DialogDemoViewModel: ObservableObject
         var vm = new DialogWithActionViewModel();
         var result = await DialogBox.ShowOverlayAsync<DialogWithAction, DialogWithActionViewModel, bool>(
             DialogViewModel, "LocalHost");
-        Date = vm.Date;
         Result = result;
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index 2436104..10a4ef5 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -74,8 +74,9 @@ public class DialogControl: ContentControl
     {
         if (this.DataContext is IDialogContext context)
         {
-            OnClose?.Invoke(this, args);
+            OnClose?.Invoke(this, Equals(sender, _closeButton) ? context.DefaultCloseResult : args);
         }
+        
         else
         {
             OnClose?.Invoke(this, null);

From 61ebba897b2cb65161e62b64116873d7744faa7f Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Tue, 23 Jan 2024 19:55:23 +0800
Subject: [PATCH 12/28] feat: extract common button style.

---
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 33 +++++++++++----
 .../Controls/DialogShared.axaml               | 42 +++++++++++++++++++
 .../Controls/MessageBoxWindow.axaml           | 18 +-------
 src/Ursa.Themes.Semi/Controls/_index.axaml    |  1 +
 src/Ursa/Common/DialogButton.cs               | 11 +++++
 src/Ursa/Common/DialogIcon.cs                 | 15 +++++++
 src/Ursa/Common/DialogResult.cs               | 10 +++++
 src/Ursa/Controls/Dialog/DialogControl.cs     | 24 ++++++++++-
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 32 ++++----------
 9 files changed, 137 insertions(+), 49 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Controls/DialogShared.axaml
 create mode 100644 src/Ursa/Common/DialogButton.cs
 create mode 100644 src/Ursa/Common/DialogIcon.cs
 create mode 100644 src/Ursa/Common/DialogResult.cs

diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 2b8df2a..160f6b8 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -7,18 +7,29 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DialogControl">
                 <Border
-                    Classes="Shadow"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
+                    Classes="Hover"
                     IsHitTestVisible="True"
+                    Padding="2"
                     Theme="{DynamicResource CardBorder}">
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <StackPanel Grid.Row="0" HorizontalAlignment="Right">
-                            <Button Name="{x:Static u:DialogControl.PART_CloseButton}" >Close</Button>
-                        </StackPanel>
+                        <DockPanel
+                            Name="{x:Static u:DialogControl.PART_TitleArea}"
+                            Grid.Row="0"
+                            LastChildFill="False"
+                            Background="Transparent">
+                            <TextBlock DockPanel.Dock="Left" Text="Title" Margin="8 8 0 0" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                DockPanel.Dock="Right"
+                                Margin="0,4,4,0"
+                                Theme="{DynamicResource CloseButton}">
+                            </Button>
+                        </DockPanel>
                         <ContentPresenter
                             Grid.Row="0"
-                            Grid.RowSpan="2"
+                            Grid.RowSpan="3"
                             Content="{TemplateBinding Content}" />
                     </Grid>
                 </Border>
@@ -58,8 +69,16 @@
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
                     <ChromeOverlayLayer />
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <Button Name="{x:Static u:DialogWindow.PART_CloseButton}" VerticalAlignment="Top" HorizontalAlignment="Right">Close</Button>
-                        <ContentPresenter Grid.Row="0" Grid.RowSpan="2" Content="{TemplateBinding Content}" />
+                        <Button
+                            Name="{x:Static u:DialogWindow.PART_CloseButton}"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top">
+                            Close
+                        </Button>
+                        <ContentPresenter
+                            Grid.Row="0"
+                            Grid.RowSpan="2"
+                            Content="{TemplateBinding Content}" />
                     </Grid>
                 </Panel>
             </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Controls/DialogShared.axaml b/src/Ursa.Themes.Semi/Controls/DialogShared.axaml
new file mode 100644
index 0000000..e4a1fd2
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Controls/DialogShared.axaml
@@ -0,0 +1,42 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    
+    <ControlTheme x:Key="CloseButton" TargetType="Button">
+        <Setter Property="CornerRadius" Value="6" />
+        <Setter Property="Margin" Value="0, 4" />
+        <Setter Property="Padding" Value="4" />
+        <Setter Property="Height" Value="28" />
+        <Setter Property="Width" Value="28" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="Button">
+                <Border
+                    Name="PART_Border"
+                    Padding="{TemplateBinding Padding}"
+                    Background="Transparent"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <PathIcon
+                        Width="12"
+                        Height="12"
+                        Data="{DynamicResource WindowCloseIconGlyph}"/>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pointerover /template/ Border">
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePointeroverBackground}" />
+        </Style>
+        <Style Selector="^:pointerover /template/ PathIcon">
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+
+        <Style Selector="^:pressed /template/ Border">
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePressedBackground}" />
+        </Style>
+        <Style Selector="^:pressed /template/ PathIcon">
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+    </ControlTheme>
+    
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml b/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml
index c0f4913..7e5bd25 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml
@@ -45,23 +45,7 @@
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
                                 Grid.Column="1"
                                 Margin="0,4,4,0"
-                                Background="{DynamicResource CaptionButtonClosePointeroverBackground}"
-                                BorderBrush="{DynamicResource CaptionButtonClosePressedBackground}"
-                                Theme="{DynamicResource CaptionButton}">
-                                <Button.Styles>
-                                    <Style Selector="Button:pointerover">
-                                        <Setter Property="Foreground" Value="White" />
-                                    </Style>
-                                    <Style Selector="Button:pressed">
-                                        <Setter Property="Foreground" Value="White" />
-                                    </Style>
-                                </Button.Styles>
-                                <PathIcon
-                                    Width="12"
-                                    Height="12"
-                                    Data="{DynamicResource WindowCloseIconGlyph}"
-                                    Foreground="{Binding $parent[Button].Foreground}" />
-                            </Button>
+                                Theme="{DynamicResource CloseButton}"/>
                         </Grid>
                         <Grid
                             Grid.Row="1"
diff --git a/src/Ursa.Themes.Semi/Controls/_index.axaml b/src/Ursa.Themes.Semi/Controls/_index.axaml
index e9ab67e..53bd125 100644
--- a/src/Ursa.Themes.Semi/Controls/_index.axaml
+++ b/src/Ursa.Themes.Semi/Controls/_index.axaml
@@ -5,6 +5,7 @@
         <ResourceInclude Source="Banner.axaml" />
         <ResourceInclude Source="ButtonGroup.axaml" />
         <ResourceInclude Source="Dialog.axaml" />
+        <ResourceInclude Source="DialogShared.axaml" />
         <ResourceInclude Source="Divider.axaml" />
         <ResourceInclude Source="DualBadge.axaml" />
         <ResourceInclude Source="IconButton.axaml" />
diff --git a/src/Ursa/Common/DialogButton.cs b/src/Ursa/Common/DialogButton.cs
new file mode 100644
index 0000000..32e9e4c
--- /dev/null
+++ b/src/Ursa/Common/DialogButton.cs
@@ -0,0 +1,11 @@
+namespace Ursa.Common;
+
+public enum DialogButton
+{
+    None,
+    OK,
+    OKCancel,
+    YesNo,
+    YesNoCancel,
+}
+
diff --git a/src/Ursa/Common/DialogIcon.cs b/src/Ursa/Common/DialogIcon.cs
new file mode 100644
index 0000000..e8a0deb
--- /dev/null
+++ b/src/Ursa/Common/DialogIcon.cs
@@ -0,0 +1,15 @@
+namespace Ursa.Common;
+
+public enum DialogIcon
+{
+    Asterisk, // Same as Information
+    Error,
+    Exclamation, // Same as Warning
+    Hand, // Same as Error
+    Information,
+    None,
+    Question,
+    Stop, // Same as Error
+    Warning,
+    Success,
+}
\ No newline at end of file
diff --git a/src/Ursa/Common/DialogResult.cs b/src/Ursa/Common/DialogResult.cs
new file mode 100644
index 0000000..36b8df4
--- /dev/null
+++ b/src/Ursa/Common/DialogResult.cs
@@ -0,0 +1,10 @@
+namespace Ursa.Common;
+
+public enum DialogResult
+{
+    Cancel,
+    No,
+    None,
+    OK,
+    Yes,
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index 10a4ef5..967d0a9 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -2,16 +2,20 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace Ursa.Controls;
 
 [TemplatePart(PART_CloseButton, typeof(Button))]
+[TemplatePart(PART_TitleArea, typeof(Panel))]
 public class DialogControl: ContentControl
 {
     public const string PART_CloseButton = "PART_CloseButton";
+    public const string PART_TitleArea = "PART_TitleArea";
     
     private Button? _closeButton;
+    private Panel? _titleArea;
     public event EventHandler<object?>? OnClose;
 
     static DialogControl()
@@ -32,6 +36,7 @@ public class DialogControl: ContentControl
         }
         
     }
+    
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
@@ -40,13 +45,30 @@ public class DialogControl: ContentControl
         {
             _closeButton.Click -= Close;
         }
+        _titleArea?.RemoveHandler(PointerMovedEvent, OnTitlePointerMove);
+        _titleArea?.RemoveHandler(PointerPressedEvent, OnTitlePointerPressed);
+        
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
+        _titleArea = e.NameScope.Find<Panel>(PART_TitleArea);
         if (_closeButton is not null)
         {
             _closeButton.Click += Close;
         }
+        _titleArea?.AddHandler(PointerMovedEvent, OnTitlePointerMove, RoutingStrategies.Bubble);
+        _titleArea?.AddHandler(PointerPressedEvent, OnTitlePointerPressed, RoutingStrategies.Bubble);
+        
     }
-    
+
+    private void OnTitlePointerPressed(object sender, PointerPressedEventArgs e)
+    {
+        e.Source = this;
+    }
+
+    private void OnTitlePointerMove(object sender, PointerEventArgs e)
+    {
+        e.Source = this;
+    }
+
 
     public Task<T> ShowAsync<T>()
     {
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 0fee47c..fabc8aa 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -15,12 +15,6 @@ public class OverlayDialogHost: Canvas
 {
     private readonly List<DialogControl> _dialogs = new();
     private readonly List<DialogControl> _modalDialogs = new();
-
-    private Rectangle _overlayMask = new()
-    {
-        Fill = new SolidColorBrush(new Color(1, 0, 0, 0)),
-        [Rectangle.ZIndexProperty] = 0,
-    };
     
     public static readonly StyledProperty<string> HostIdProperty = AvaloniaProperty.Register<OverlayDialogHost, string>(
         nameof(HostId));
@@ -66,37 +60,27 @@ public class OverlayDialogHost: Canvas
     protected override void OnPointerMoved(PointerEventArgs e)
     {
         base.OnPointerMoved(e);
-        if (e.Source is Control item)
+        if (e.Source is DialogControl item)
         {
             if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
-                var parent  = item.FindAncestorOfType<DialogControl>();
-                if (parent is null)
-                {
-                    return;
-                }
                 var p = e.GetPosition(this);
                 var left=  p.X - _lastPoint.X;
                 var top = p.Y - _lastPoint.Y;
-                left = MathUtilities.Clamp(left, 0, Bounds.Width - parent.Bounds.Width);
-                top = MathUtilities.Clamp(top, 0, Bounds.Height - parent.Bounds.Height);
-                Canvas.SetLeft(parent, left);
-                Canvas.SetTop(parent, top);
+                left = MathUtilities.Clamp(left, 0, Bounds.Width - item.Bounds.Width);
+                top = MathUtilities.Clamp(top, 0, Bounds.Height - item.Bounds.Height);
+                Canvas.SetLeft(item, left);
+                Canvas.SetTop(item, top);
             }
         }
     }
 
     protected override void OnPointerPressed(PointerPressedEventArgs e)
     {
-        base.OnPointerPressed(e);
-        if (e.Source is Control item)
+        // base.OnPointerPressed(e);
+        if (e.Source is DialogControl item)
         {
-            var parent  = item.FindAncestorOfType<DialogControl>();
-            if (parent is null)
-            {
-                return;
-            }
-            _lastPoint = e.GetPosition(parent);
+            _lastPoint = e.GetPosition(item);
         }
     }
 

From c8540feeb3775dda994c3c79560bf6fac20c2a43 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Tue, 23 Jan 2024 22:48:30 +0800
Subject: [PATCH 13/28] feat: implement multi layer dialog.

---
 demo/Ursa.Demo/Dialogs/DialogWithAction.axaml |  7 +-
 .../Dialogs/DialogWithActionViewModel.cs      |  9 +++
 demo/Ursa.Demo/Pages/DialogDemo.axaml         |  9 ++-
 .../ViewModels/DialogDemoViewModel.cs         | 32 +++++---
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 65 ++++++++++------
 src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml |  5 ++
 src/Ursa.Themes.Semi/Themes/Dark/_index.axaml |  1 +
 .../Themes/Light/Dialog.axaml                 |  5 ++
 .../Themes/Light/_index.axaml                 |  1 +
 src/Ursa/Common/DialogIcon.cs                 | 15 ----
 src/Ursa/Controls/Dialog/DialogBox.cs         | 58 +++++++++++---
 src/Ursa/Controls/Dialog/DialogControl.cs     | 22 +++++-
 src/Ursa/Controls/Dialog/DialogOptions.cs     |  5 ++
 src/Ursa/Controls/Dialog/DialogWindow.cs      | 25 +++---
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 76 ++++++++++++-------
 15 files changed, 231 insertions(+), 104 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
 delete mode 100644 src/Ursa/Common/DialogIcon.cs

diff --git a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
index 022fed8..b3132df 100644
--- a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
+++ b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
@@ -7,10 +7,11 @@
              x:CompileBindings="True"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ursa.Demo.Dialogs.DialogWithAction">
-    <StackPanel Margin="0 16 0 0">
-        <TextBlock Text="{Binding Title}"></TextBlock>
+    <StackPanel Margin="8">
+        <TextBlock Classes="Strong" Margin="8"  Text="{Binding Title}"></TextBlock>
         <Calendar SelectedDate="{Binding Date}" ></Calendar>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Spacing="20">
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Spacing="8">
+            <Button Content="Dialog" Command="{Binding DialogCommand}"></Button>
             <Button Content="OK" Command="{Binding OKCommand}"></Button>
             <Button Content="Cancel" Command="{Binding CancelCommand}"></Button>
         </StackPanel>
diff --git a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
index d5a3b58..f846146 100644
--- a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
+++ b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -16,10 +17,13 @@ public partial class DialogWithActionViewModel: ObservableObject, IDialogContext
     public ICommand OKCommand { get; set; }
     public ICommand CancelCommand { get; set; }
     
+    public ICommand DialogCommand { get; set; }
+    
     public DialogWithActionViewModel()
     {
         OKCommand = new RelayCommand(OK);
         CancelCommand = new RelayCommand(Cancel);
+        DialogCommand = new AsyncRelayCommand(ShowDialog);
         Title = "Please select a date";
         Date = DateTime.Now;
     }
@@ -33,4 +37,9 @@ public partial class DialogWithActionViewModel: ObservableObject, IDialogContext
     {
         Closed?.Invoke(this, false);
     }
+    
+    private async Task ShowDialog()
+    {
+        await DialogBox.ShowOverlayModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(new DialogWithActionViewModel(), "GlobalHost");
+    }
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 072edcb..3474c87 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -21,15 +21,16 @@
                 <Run Text="Date: "></Run>
                 <Run Text="{Binding DialogViewModel.Date}"></Run>
             </TextBlock>
-            <Button Command="{Binding ShowGlobalDialogCommand}">Show Dialog</Button>
-            <Button Command="{Binding ShowLocalOverlayDialogCommand}">Show Local Overlay Dialog</Button>
-            <Button Command="{Binding ShowGlobalOverlayDialogCommand}"> Show Global Overlay Dialog </Button>
+            <Button Command="{Binding ShowGlobalModalDialogCommand}">Show Modal Dialog</Button>
+            <Button Command="{Binding ShowLocalOverlayModalDialogCommand}">Show Local Overlay Modal Dialog</Button>
+            <Button Command="{Binding ShowGlobalOverlayModalDialogCommand}"> Show Global Overlay Modal Dialog </Button>
+            <Button Command="{Binding ShowGlobalOverlayDialogCommand}">Show Global Overlay Dialog</Button>
         </StackPanel>
         <Grid Grid.Column="1">
             <Button
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                Command="{Binding ShowLocalOverlayDialogCommand}">
+                Command="{Binding ShowLocalOverlayModalDialogCommand}">
                 Show Local Overlay Dialog
             </Button>
             <u:OverlayDialogHost HostId="LocalHost" />
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 28b0d3f..342ab0a 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -11,9 +11,11 @@ namespace Ursa.Demo.ViewModels;
 
 public class DialogDemoViewModel: ObservableObject
 {
-    public ICommand ShowLocalOverlayDialogCommand { get; }
+    public ICommand ShowLocalOverlayModalDialogCommand { get; }
+    public ICommand ShowGlobalOverlayModalDialogCommand { get; }
+    public ICommand ShowGlobalModalDialogCommand { get; }
+    
     public ICommand ShowGlobalOverlayDialogCommand { get; }
-    public ICommand ShowGlobalDialogCommand { get; }
 
     private object? _result;
 
@@ -35,27 +37,33 @@ public class DialogDemoViewModel: ObservableObject
 
     public DialogDemoViewModel()
     {
-        ShowLocalOverlayDialogCommand = new AsyncRelayCommand(ShowLocalOverlayDialog);
-        ShowGlobalOverlayDialogCommand = new AsyncRelayCommand(ShowGlobalOverlayDialog);
-        ShowGlobalDialogCommand = new AsyncRelayCommand(ShowGlobalDialog);
+        ShowLocalOverlayModalDialogCommand = new AsyncRelayCommand(ShowLocalOverlayModalDialog);
+        ShowGlobalOverlayModalDialogCommand = new AsyncRelayCommand(ShowGlobalOverlayModalDialog);
+        ShowGlobalModalDialogCommand = new AsyncRelayCommand(ShowGlobalModalDialog);
+        ShowGlobalOverlayDialogCommand = new RelayCommand(ShowGlobalOverlayDialog);
     }
 
-    private async Task ShowGlobalDialog()
+    private void ShowGlobalOverlayDialog()
     {
-        var result = await DialogBox.ShowAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
+        DialogBox.ShowOverlay<DialogWithAction, DialogWithActionViewModel>(new DialogWithActionViewModel(), "GlobalHost");
+    }
+
+    private async Task ShowGlobalModalDialog()
+    {
+        var result = await DialogBox.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
         Result = result;
     }
 
-    private async Task ShowGlobalOverlayDialog()
+    private async Task ShowGlobalOverlayModalDialog()
     {
-        Result = await DialogBox.ShowOverlayAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel, "GlobalHost");
+        Result = await DialogBox.ShowOverlayModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel, "GlobalHost");
     }
 
-    private async Task ShowLocalOverlayDialog()
+    private async Task ShowLocalOverlayModalDialog()
     {
         var vm = new DialogWithActionViewModel();
-        var result = await DialogBox.ShowOverlayAsync<DialogWithAction, DialogWithActionViewModel, bool>(
-            DialogViewModel, "LocalHost");
+        var result = await DialogBox.ShowOverlayModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
+            DialogViewModel, "LocalHost", new DialogOptions(){ ExtendToClientArea = true });
         Result = result;
     }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 160f6b8..b894472 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -3,38 +3,58 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
     <!--  Add Resources Here  -->
+    <ControlTheme x:Key="{x:Type u:OverlayDialogHost}" TargetType="u:OverlayDialogHost">
+        <Setter Property="OverlayMaskBrush" Value="{DynamicResource OverlayDialogMaskBrush}"></Setter>
+    </ControlTheme>
     <ControlTheme x:Key="{x:Type u:DialogControl}" TargetType="u:DialogControl">
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DialogControl">
                 <Border
+                    Padding="0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    Classes="Hover"
                     IsHitTestVisible="True"
-                    Padding="2"
                     Theme="{DynamicResource CardBorder}">
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <DockPanel
-                            Name="{x:Static u:DialogControl.PART_TitleArea}"
-                            Grid.Row="0"
-                            LastChildFill="False"
-                            Background="Transparent">
-                            <TextBlock DockPanel.Dock="Left" Text="Title" Margin="8 8 0 0" />
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            Grid.Row="1"
+                            Content="{TemplateBinding Content}" />
+                        <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                            <Panel
+                                Name="{x:Static u:DialogControl.PART_TitleArea}"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2"
+                                Background="Transparent" >
+                                <Panel.ContextFlyout>
+                                    <MenuFlyout>
+                                        <MenuItem Header="Bring to Top"></MenuItem>
+                                    </MenuFlyout>
+                                </Panel.ContextFlyout>
+                            </Panel>
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="8,8,0,0"
+                                DockPanel.Dock="Left"
+                                Text="{TemplateBinding Title}"
+                                Classes="Strong"
+                                IsVisible="{TemplateBinding Title, Converter={x:Static ObjectConverters.IsNotNull}}"
+                                />
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                DockPanel.Dock="Right"
+                                Grid.Column="1"
                                 Margin="0,4,4,0"
-                                Theme="{DynamicResource CloseButton}">
-                            </Button>
-                        </DockPanel>
-                        <ContentPresenter
-                            Grid.Row="0"
-                            Grid.RowSpan="3"
-                            Content="{TemplateBinding Content}" />
+                                DockPanel.Dock="Right"
+                                Theme="{DynamicResource CloseButton}" />
+                        </Grid>
                     </Grid>
                 </Border>
             </ControlTemplate>
         </Setter>
+        <Style Selector="^:extend /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Grid.Row" Value="0" />
+            <Setter Property="Grid.RowSpan" Value="3" />
+        </Style>
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type u:DialogWindow}" TargetType="u:DialogWindow">
@@ -69,16 +89,17 @@
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
                     <ChromeOverlayLayer />
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <Button
-                            Name="{x:Static u:DialogWindow.PART_CloseButton}"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Top">
-                            Close
-                        </Button>
                         <ContentPresenter
                             Grid.Row="0"
                             Grid.RowSpan="2"
                             Content="{TemplateBinding Content}" />
+                        <Button
+                            Name="{x:Static u:DialogWindow.PART_CloseButton}"
+                            Grid.Row="0"
+                            Margin="0,4,4,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            Theme="{DynamicResource CloseButton}" />
                     </Grid>
                 </Panel>
             </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
new file mode 100644
index 0000000..4fa7dc4
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FFA7ABB0" Opacity="0.2"></SolidColorBrush>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
index c2ff413..f42dc2f 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
@@ -4,6 +4,7 @@
         <MergeResourceInclude Source="Badge.axaml" />
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="ButtonGroup.axaml" />
+        <MergeResourceInclude Source="Dialog.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml b/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
new file mode 100644
index 0000000..28110a2
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FF555B61" Opacity="0.2"></SolidColorBrush>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
index c2ff413..f42dc2f 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
@@ -4,6 +4,7 @@
         <MergeResourceInclude Source="Badge.axaml" />
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="ButtonGroup.axaml" />
+        <MergeResourceInclude Source="Dialog.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
diff --git a/src/Ursa/Common/DialogIcon.cs b/src/Ursa/Common/DialogIcon.cs
deleted file mode 100644
index e8a0deb..0000000
--- a/src/Ursa/Common/DialogIcon.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Ursa.Common;
-
-public enum DialogIcon
-{
-    Asterisk, // Same as Information
-    Error,
-    Exclamation, // Same as Warning
-    Hand, // Same as Error
-    Information,
-    None,
-    Question,
-    Stop, // Same as Error
-    Warning,
-    Success,
-}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogBox.cs b/src/Ursa/Controls/Dialog/DialogBox.cs
index a5d4fa7..36e5e2b 100644
--- a/src/Ursa/Controls/Dialog/DialogBox.cs
+++ b/src/Ursa/Controls/Dialog/DialogBox.cs
@@ -8,7 +8,7 @@ namespace Ursa.Controls;
 
 public static class DialogBox
 {
-    public static async Task<TResult?> ShowAsync<TView, TViewModel, TResult>(TViewModel vm) 
+    public static async Task<TResult?> ShowModalAsync<TView, TViewModel, TResult>(TViewModel vm) 
         where TView : Control, new()
     {
         var window = new DialogWindow()
@@ -37,28 +37,68 @@ public static class DialogBox
         }
     }
     
-    public static async Task<TResult> ShowAsync<TView, TViewModel, TResult>(Window owner, TViewModel vm) where 
+    public static async Task<TResult> ShowModalAsync<TView, TViewModel, TResult>(Window owner, TViewModel vm) where 
         TView: Control, new()
     {
-        var window = new DialogWindow();
-        window.Content = new TView();
-        window.DataContext = vm;
+        var window = new DialogWindow
+        {
+            Content = new TView() { DataContext = vm },
+            DataContext = vm
+        };
         return await window.ShowDialog<TResult>(owner);
     }
     
 
-    public static Task<TResult> ShowOverlayAsync<TView, TViewModel, TResult>(TViewModel vm, string hostId)
+    public static Task<TResult> ShowOverlayModalAsync<TView, TViewModel, TResult>(TViewModel vm, string hostId)
         where TView : Control, new()
-        where TViewModel: new()
     {
         var t = new DialogControl()
         {
             Content = new TView(){ DataContext = vm },
             DataContext = vm,
         };
-        t.DataContext = vm;
         var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
-        host?.AddDialog(t);
+        host?.AddModalDialog(t);
         return t.ShowAsync<TResult>();
     }
+
+    public static Task<TResult> ShowOverlayModalAsync<TView, TViewModel, TResult>(TViewModel vm, string hostId,
+        DialogOptions options)
+        where TView : Control, new()
+    {
+        var t = new DialogControl()
+        {
+            Content = new TView() { DataContext = vm },
+            DataContext = vm,
+            ExtendToClientArea = options.ExtendToClientArea,
+            Title = options.Title,
+        };
+        var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
+        host?.AddModalDialog(t);
+        return t.ShowAsync<TResult>();
+    }
+
+    public static void ShowOverlay<TView, TViewModel>(TViewModel vm, string hostId)
+        where TView: Control, new()
+    {
+        var t = new DialogControl()
+        {
+            Content = new TView() { DataContext = vm },
+            DataContext = vm,
+        };
+        var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
+        host?.AddDialog(t);
+    }
+
+    public static void ShowOverlay<TView, TViewModel>(TViewModel vm, string hostId, DialogOptions options)
+        where TView: Control, new()
+    {
+        var t = new DialogControl()
+        {
+            Content = new TView() { DataContext = vm },
+            DataContext = vm,
+        };
+        var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
+        host?.AddModalDialog(t);
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index 967d0a9..945f81a 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -9,18 +9,39 @@ namespace Ursa.Controls;
 
 [TemplatePart(PART_CloseButton, typeof(Button))]
 [TemplatePart(PART_TitleArea, typeof(Panel))]
+[PseudoClasses(PC_ExtendClientArea)]
 public class DialogControl: ContentControl
 {
     public const string PART_CloseButton = "PART_CloseButton";
     public const string PART_TitleArea = "PART_TitleArea";
+    public const string PC_ExtendClientArea = ":extend";
     
     private Button? _closeButton;
     private Panel? _titleArea;
     public event EventHandler<object?>? OnClose;
 
+    public static readonly StyledProperty<string?> TitleProperty = AvaloniaProperty.Register<DialogControl, string?>(
+        nameof(Title));
+
+    public string? Title
+    {
+        get => GetValue(TitleProperty);
+        set => SetValue(TitleProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> ExtendToClientAreaProperty = AvaloniaProperty.Register<DialogControl, bool>(
+        nameof(ExtendToClientArea));
+
+    public bool ExtendToClientArea
+    {
+        get => GetValue(ExtendToClientAreaProperty);
+        set => SetValue(ExtendToClientAreaProperty, value);
+    }
+
     static DialogControl()
     {
         DataContextProperty.Changed.AddClassHandler<DialogControl, object?>((o, e) => o.OnDataContextChange(e));
+        ExtendToClientAreaProperty.Changed.AddClassHandler<DialogControl, bool>((o, e) => o.PseudoClasses.Set(PC_ExtendClientArea, e.NewValue.Value));
     }
 
     private void OnDataContextChange(AvaloniaPropertyChangedEventArgs<object?> args)
@@ -34,7 +55,6 @@ public class DialogControl: ContentControl
         {
             newContext.Closed += Close;
         }
-        
     }
     
 
diff --git a/src/Ursa/Controls/Dialog/DialogOptions.cs b/src/Ursa/Controls/Dialog/DialogOptions.cs
index 74130e7..5e3e934 100644
--- a/src/Ursa/Controls/Dialog/DialogOptions.cs
+++ b/src/Ursa/Controls/Dialog/DialogOptions.cs
@@ -1,6 +1,11 @@
+using Ursa.Common;
+
 namespace Ursa.Controls;
 
 public record DialogOptions
 {
     public bool ShowCloseButton { get; set; } = true;
+    public string? Title { get; set; }
+    public bool ExtendToClientArea { get; set; } = false;
+    public DialogButton DefaultButtons { get; set; } = DialogButton.OKCancel;
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
index 33bec5f..52afb46 100644
--- a/src/Ursa/Controls/Dialog/DialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls;
+using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
@@ -15,21 +16,21 @@ public class DialogWindow: Window
 
     private Button? _closeButton;
 
-    protected override void OnDataContextBeginUpdate()
+    static DialogWindow()
     {
-        base.OnDataContextBeginUpdate();
-        if (DataContext is IDialogContext context)
-        {
-            context.Closed-= OnDialogClose;
-        }
+        DataContextProperty.Changed.AddClassHandler<DialogWindow, object?>((o, e) => o.OnDataContextChange(e));
     }
-
-    protected override void OnDataContextEndUpdate()
+    
+    private void OnDataContextChange(AvaloniaPropertyChangedEventArgs<object?> args)
     {
-        base.OnDataContextEndUpdate();
-        if (DataContext is IDialogContext context)
+        if (args.OldValue.Value is IDialogContext oldContext)
         {
-            context.Closed += OnDialogClose;
+            oldContext.Closed-= OnDialogClose;
+        }
+
+        if (args.NewValue.Value is IDialogContext newContext)
+        {
+            newContext.Closed += OnDialogClose;
         }
     }
 
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index fabc8aa..8a39e71 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -15,39 +15,44 @@ public class OverlayDialogHost: Canvas
 {
     private readonly List<DialogControl> _dialogs = new();
     private readonly List<DialogControl> _modalDialogs = new();
+    private readonly List<Border> _masks = new();
     
-    public static readonly StyledProperty<string> HostIdProperty = AvaloniaProperty.Register<OverlayDialogHost, string>(
-        nameof(HostId));
-
-    public string HostId
-    {
-        get => GetValue(HostIdProperty);
-        set => SetValue(HostIdProperty, value);
-    }
+    public string? HostId { get; set; }
     
     private Point _lastPoint;
+
+    public static readonly StyledProperty<IBrush?> OverlayMaskBrushProperty = AvaloniaProperty.Register<OverlayDialogHost, IBrush?>(
+        nameof(OverlayMaskBrush));
+
+    public IBrush? OverlayMaskBrush
+    {
+        get => GetValue(OverlayMaskBrushProperty);
+        set => SetValue(OverlayMaskBrushProperty, value);
+    }
+    
+    private Border CreateOverlayMask() => new()
+    {
+        HorizontalAlignment = HorizontalAlignment.Stretch,
+        VerticalAlignment = VerticalAlignment.Stretch,
+        Width = this.Bounds.Width,
+        Height =  this.Bounds.Height,
+        [!BackgroundProperty] = this[!OverlayMaskBrushProperty],
+        IsVisible = true,
+    };
     
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
         OverlayDialogManager.RegisterOverlayDialogHost(this, HostId);
-        this.Children.Add(new Border()
-        {
-            HorizontalAlignment = HorizontalAlignment.Stretch,
-            VerticalAlignment = VerticalAlignment.Stretch,
-            Background = Brushes.Black,
-            Opacity = 0.3,
-            IsVisible = false,
-        });
     }
 
     protected override void OnSizeChanged(SizeChangedEventArgs e)
     {
         base.OnSizeChanged(e);
-        if (this.Children.Count > 0)
+        for (int i = 0; i < _masks.Count; i++)
         {
-            this.Children[0].Width = this.Bounds.Width;
-            this.Children[0].Height = this.Bounds.Height;
+            _masks[i].Width = this.Bounds.Width;
+            _masks[i].Width = this.Bounds.Height;
         }
     }
 
@@ -87,11 +92,8 @@ public class OverlayDialogHost: Canvas
     public void AddDialog(DialogControl control)
     {
         this.Children.Add(control);
+        _dialogs.Add(control);
         control.OnClose += OnDialogClose;
-        if (this.Children.Count > 1)
-        {
-            this.Children[0].IsVisible = true;
-        }
     }
 
     private void OnDialogClose(object sender, object? e)
@@ -100,16 +102,38 @@ public class OverlayDialogHost: Canvas
         {
             this.Children.Remove(control);
             control.OnClose -= OnDialogClose;
-            if (this.Children.Count == 1)
+            if (_dialogs.Contains(control))
             {
-                this.Children[0].IsVisible = false;
+                _dialogs.Remove(control);
+            }
+            else if(_modalDialogs.Contains(control))
+            {
+                _modalDialogs.Remove(control);
+                if (_masks.Count > 0)
+                {
+                    var last = _masks.Last();
+                    this.Children.Remove(last);
+                    _masks.Remove(last);
+                    if (_masks.Count > 0)
+                    {
+                        _masks.Last().IsVisible= true;
+                    }
+                }
             }
         }
-        
     }
 
     public void AddModalDialog(DialogControl control)
     {
+        var mask = CreateOverlayMask();
+        this.Children.Add(mask);
         this.Children.Add(control);
+        _modalDialogs.Add(control);
+        for (int i = 0; i < _masks.Count; i++)
+        {
+            _masks[i].IsVisible = false;
+        }
+        _masks.Add(mask);
+        control.OnClose += OnDialogClose;
     }
 }
\ No newline at end of file

From b8d258c02a6a7a7e6f88b73cb3c2b667485abd00 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Tue, 23 Jan 2024 23:29:58 +0800
Subject: [PATCH 14/28] feat: implement layer change.

---
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 15 +++--
 src/Ursa/Controls/Dialog/DialogBox.cs         |  2 +
 src/Ursa/Controls/Dialog/DialogControl.cs     | 24 ++++++-
 .../Dialog/DialogLayerChangeEventArgs.cs      | 18 ++++++
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 62 +++++++++++++++----
 5 files changed, 103 insertions(+), 18 deletions(-)
 create mode 100644 src/Ursa/Controls/Dialog/DialogLayerChangeEventArgs.cs

diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index b894472..2b113fb 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -26,11 +26,6 @@
                                 Grid.Column="0"
                                 Grid.ColumnSpan="2"
                                 Background="Transparent" >
-                                <Panel.ContextFlyout>
-                                    <MenuFlyout>
-                                        <MenuItem Header="Bring to Top"></MenuItem>
-                                    </MenuFlyout>
-                                </Panel.ContextFlyout>
                             </Panel>
                             <TextBlock
                                 Grid.Column="0"
@@ -55,6 +50,16 @@
             <Setter Property="Grid.Row" Value="0" />
             <Setter Property="Grid.RowSpan" Value="3" />
         </Style>
+        <Style Selector="^:not(:modal) /template/ Panel#PART_TitleArea">
+            <Setter Property="ContextFlyout">
+                <MenuFlyout>
+                    <MenuItem Header="Bring Forward" Command="{Binding $parent[u:DialogControl].BringForward}"></MenuItem>
+                    <MenuItem Header="Send Backward" Command="{Binding $parent[u:DialogControl].SendBackward}" ></MenuItem>
+                    <MenuItem Header="Bring To Front" Command="{Binding $parent[u:DialogControl].BringToFront}"></MenuItem>
+                    <MenuItem Header="Send To Back" Command="{Binding $parent[u:DialogControl].SendToBack}"></MenuItem>
+                </MenuFlyout>
+            </Setter>
+        </Style>
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type u:DialogWindow}" TargetType="u:DialogWindow">
diff --git a/src/Ursa/Controls/Dialog/DialogBox.cs b/src/Ursa/Controls/Dialog/DialogBox.cs
index 36e5e2b..fe27fa7 100644
--- a/src/Ursa/Controls/Dialog/DialogBox.cs
+++ b/src/Ursa/Controls/Dialog/DialogBox.cs
@@ -97,6 +97,8 @@ public static class DialogBox
         {
             Content = new TView() { DataContext = vm },
             DataContext = vm,
+            ExtendToClientArea = options.ExtendToClientArea,
+            Title = options.Title,
         };
         var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
         host?.AddModalDialog(t);
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index 945f81a..737d4d6 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -15,10 +15,12 @@ public class DialogControl: ContentControl
     public const string PART_CloseButton = "PART_CloseButton";
     public const string PART_TitleArea = "PART_TitleArea";
     public const string PC_ExtendClientArea = ":extend";
+    public const string PC_Modal = ":modal";
     
     private Button? _closeButton;
     private Panel? _titleArea;
     public event EventHandler<object?>? OnClose;
+    public event EventHandler<DialogLayerChangeEventArgs>? OnLayerChange;
 
     public static readonly StyledProperty<string?> TitleProperty = AvaloniaProperty.Register<DialogControl, string?>(
         nameof(Title));
@@ -93,7 +95,7 @@ public class DialogControl: ContentControl
     public Task<T> ShowAsync<T>()
     {
         var tcs = new TaskCompletionSource<T>();
-
+        PseudoClasses.Set(PC_Modal, true);
         void OnCloseHandler(object sender, object? args)
         {
             if (args is T result)
@@ -124,4 +126,24 @@ public class DialogControl: ContentControl
             OnClose?.Invoke(this, null);
         }
     }
+
+    public void BringForward()
+    {
+        OnLayerChange?.Invoke(this, new DialogLayerChangeEventArgs(DialogLayerChangeType.BringForward));
+    }
+
+    public void SendBackward()
+    {
+        OnLayerChange?.Invoke(this, new DialogLayerChangeEventArgs(DialogLayerChangeType.SendBackward));
+    } 
+    
+    public void BringToFront()
+    {
+        OnLayerChange?.Invoke(this, new DialogLayerChangeEventArgs(DialogLayerChangeType.BringToFront));
+    }
+    
+    public void SendToBack()
+    {
+        OnLayerChange?.Invoke(this, new DialogLayerChangeEventArgs(DialogLayerChangeType.SendToBack));
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogLayerChangeEventArgs.cs b/src/Ursa/Controls/Dialog/DialogLayerChangeEventArgs.cs
new file mode 100644
index 0000000..12ec4ee
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/DialogLayerChangeEventArgs.cs
@@ -0,0 +1,18 @@
+namespace Ursa.Controls;
+
+public class DialogLayerChangeEventArgs
+{
+    public DialogLayerChangeType ChangeType { get; }
+    public DialogLayerChangeEventArgs(DialogLayerChangeType type)
+    {
+        ChangeType = type;
+    }
+}
+
+public enum DialogLayerChangeType
+{
+    BringForward,
+    SendBackward,
+    BringToFront,
+    SendToBack
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 8a39e71..5887964 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -9,37 +9,38 @@ using Avalonia.Media;
 using Avalonia.Utilities;
 using Avalonia.VisualTree;
 
-namespace Ursa.Controls; 
+namespace Ursa.Controls;
 
-public class OverlayDialogHost: Canvas
+public class OverlayDialogHost : Canvas
 {
     private readonly List<DialogControl> _dialogs = new();
     private readonly List<DialogControl> _modalDialogs = new();
     private readonly List<Border> _masks = new();
-    
+
     public string? HostId { get; set; }
-    
+
     private Point _lastPoint;
 
-    public static readonly StyledProperty<IBrush?> OverlayMaskBrushProperty = AvaloniaProperty.Register<OverlayDialogHost, IBrush?>(
-        nameof(OverlayMaskBrush));
+    public static readonly StyledProperty<IBrush?> OverlayMaskBrushProperty =
+        AvaloniaProperty.Register<OverlayDialogHost, IBrush?>(
+            nameof(OverlayMaskBrush));
 
     public IBrush? OverlayMaskBrush
     {
         get => GetValue(OverlayMaskBrushProperty);
         set => SetValue(OverlayMaskBrushProperty, value);
     }
-    
+
     private Border CreateOverlayMask() => new()
     {
         HorizontalAlignment = HorizontalAlignment.Stretch,
         VerticalAlignment = VerticalAlignment.Stretch,
         Width = this.Bounds.Width,
-        Height =  this.Bounds.Height,
+        Height = this.Bounds.Height,
         [!BackgroundProperty] = this[!OverlayMaskBrushProperty],
         IsVisible = true,
     };
-    
+
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
@@ -70,7 +71,7 @@ public class OverlayDialogHost: Canvas
             if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
                 var p = e.GetPosition(this);
-                var left=  p.X - _lastPoint.X;
+                var left = p.X - _lastPoint.X;
                 var top = p.Y - _lastPoint.Y;
                 left = MathUtilities.Clamp(left, 0, Bounds.Width - item.Bounds.Width);
                 top = MathUtilities.Clamp(top, 0, Bounds.Height - item.Bounds.Height);
@@ -93,7 +94,9 @@ public class OverlayDialogHost: Canvas
     {
         this.Children.Add(control);
         _dialogs.Add(control);
+        control.ZIndex = Children.Last().ZIndex + 1;
         control.OnClose += OnDialogClose;
+        control.OnLayerChange += OnDialogLayerChange;
     }
 
     private void OnDialogClose(object sender, object? e)
@@ -102,11 +105,12 @@ public class OverlayDialogHost: Canvas
         {
             this.Children.Remove(control);
             control.OnClose -= OnDialogClose;
+            control.OnLayerChange -= OnDialogLayerChange;
             if (_dialogs.Contains(control))
             {
                 _dialogs.Remove(control);
             }
-            else if(_modalDialogs.Contains(control))
+            else if (_modalDialogs.Contains(control))
             {
                 _modalDialogs.Remove(control);
                 if (_masks.Count > 0)
@@ -116,7 +120,7 @@ public class OverlayDialogHost: Canvas
                     _masks.Remove(last);
                     if (_masks.Count > 0)
                     {
-                        _masks.Last().IsVisible= true;
+                        _masks.Last().IsVisible = true;
                     }
                 }
             }
@@ -133,7 +137,41 @@ public class OverlayDialogHost: Canvas
         {
             _masks[i].IsVisible = false;
         }
+
         _masks.Add(mask);
         control.OnClose += OnDialogClose;
+        control.OnLayerChange += OnDialogLayerChange;
+    }
+
+    private void OnDialogLayerChange(object sender, DialogLayerChangeEventArgs e)
+    {
+        if (sender is not DialogControl control)
+            return;
+        if (!_dialogs.Contains(control))
+            return;
+        int index = _dialogs.IndexOf(control);
+        _dialogs.Remove(control);
+        int newIndex = index;
+        switch (e.ChangeType)
+        {
+            case DialogLayerChangeType.BringForward:
+                newIndex = MathUtilities.Clamp(index + 1, 0, _dialogs.Count);
+                break;
+            case DialogLayerChangeType.SendBackward:
+                newIndex = MathUtilities.Clamp(index - 1, 0, _dialogs.Count);
+                break;
+            case DialogLayerChangeType.BringToFront:
+                newIndex = _dialogs.Count;
+                break;
+            case DialogLayerChangeType.SendToBack:
+                newIndex = 0;
+                break;
+        }
+
+        _dialogs.Insert(newIndex, control);
+        for (int i = 0; i < _dialogs.Count; i++)
+        {
+            _dialogs[i].ZIndex = i;
+        }
     }
 }
\ No newline at end of file

From e06d6ffb259ec6d1d1c0d6e3912a38f197a270b5 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Wed, 24 Jan 2024 00:00:13 +0800
Subject: [PATCH 15/28] feat: improve layer calculation

---
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 24 +++++++++++---
 .../Themes/Shared/Dialog.axaml                |  8 +++++
 .../Themes/Shared/_index.axaml                |  1 +
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 32 +++++++++++++------
 4 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/Shared/Dialog.axaml

diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 2b113fb..4c1c951 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -53,10 +53,26 @@
         <Style Selector="^:not(:modal) /template/ Panel#PART_TitleArea">
             <Setter Property="ContextFlyout">
                 <MenuFlyout>
-                    <MenuItem Header="Bring Forward" Command="{Binding $parent[u:DialogControl].BringForward}"></MenuItem>
-                    <MenuItem Header="Send Backward" Command="{Binding $parent[u:DialogControl].SendBackward}" ></MenuItem>
-                    <MenuItem Header="Bring To Front" Command="{Binding $parent[u:DialogControl].BringToFront}"></MenuItem>
-                    <MenuItem Header="Send To Back" Command="{Binding $parent[u:DialogControl].SendToBack}"></MenuItem>
+                    <MenuItem Header="Bring Forward" Command="{Binding $parent[u:DialogControl].BringForward}">
+                        <MenuItem.Icon>
+                            <PathIcon Width="12" Height="12" Data="{DynamicResource DialogArrangeBringForwardGlyph}"></PathIcon>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem Header="Bring To Front" Command="{Binding $parent[u:DialogControl].BringToFront}">
+                        <MenuItem.Icon>
+                            <PathIcon Width="12" Height="12" Data="{DynamicResource DialogArrangeBringToFrontGlyph}"></PathIcon>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem Header="Send Backward" Command="{Binding $parent[u:DialogControl].SendBackward}" >
+                        <MenuItem.Icon>
+                            <PathIcon Width="12" Height="12" Data="{DynamicResource DialogArrangeSendBackwardGlyph}"></PathIcon>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem Header="Send To Back" Command="{Binding $parent[u:DialogControl].SendToBack}">
+                        <MenuItem.Icon>
+                            <PathIcon Width="12" Height="12" Data="{DynamicResource DialogArrangeSendToBackGlyph}"></PathIcon>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </MenuFlyout>
             </Setter>
         </Style>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/Dialog.axaml b/src/Ursa.Themes.Semi/Themes/Shared/Dialog.axaml
new file mode 100644
index 0000000..d067400
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Shared/Dialog.axaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <StreamGeometry x:Key="DialogArrangeBringForwardGlyph">M2,2H16V16H2V2M22,8V22H8V18H10V20H20V10H18V8H22Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogArrangeBringToFrontGlyph">M2,2H11V6H9V4H4V9H6V11H2V2M22,13V22H13V18H15V20H20V15H18V13H22M8,8H16V16H8V8Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogArrangeSendBackwardGlyph">M2,2H16V16H2V2M22,8V22H8V18H18V8H22M4,4V14H14V4H4Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogArrangeSendToBackGlyph">M2,2H11V11H2V2M9,4H4V9H9V4M22,13V22H13V13H22M15,20H20V15H15V20M16,8V11H13V8H16M11,16H8V13H11V16Z</StreamGeometry>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
index d26e06a..1e27845 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
@@ -4,6 +4,7 @@
         <MergeResourceInclude Source="Badge.axaml" />
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="ButtonGroup.axaml" />
+        <MergeResourceInclude Source="Dialog.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 5887964..edb928e 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -41,13 +41,13 @@ public class OverlayDialogHost : Canvas
         IsVisible = true,
     };
 
-    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    protected sealed override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
         OverlayDialogManager.RegisterOverlayDialogHost(this, HostId);
     }
 
-    protected override void OnSizeChanged(SizeChangedEventArgs e)
+    protected sealed override void OnSizeChanged(SizeChangedEventArgs e)
     {
         base.OnSizeChanged(e);
         for (int i = 0; i < _masks.Count; i++)
@@ -90,7 +90,7 @@ public class OverlayDialogHost : Canvas
         }
     }
 
-    public void AddDialog(DialogControl control)
+    internal void AddDialog(DialogControl control)
     {
         this.Children.Add(control);
         _dialogs.Add(control);
@@ -127,18 +127,25 @@ public class OverlayDialogHost : Canvas
         }
     }
 
-    public void AddModalDialog(DialogControl control)
+    internal void AddModalDialog(DialogControl control)
     {
         var mask = CreateOverlayMask();
-        this.Children.Add(mask);
-        this.Children.Add(control);
+        _masks.Add(mask);
         _modalDialogs.Add(control);
-        for (int i = 0; i < _masks.Count; i++)
+        int start = _dialogs.LastOrDefault()?.ZIndex ?? 1;
+        for (int i = 0; i < _masks.Count; i += 1)
         {
-            _masks[i].IsVisible = false;
+            _masks[i].ZIndex = start + 2 * i;
+            _modalDialogs[i].ZIndex = start + 2 * i + 1;
+        }
+        
+        for (int i = 0; i < _masks.Count-1; i++)
+        {
+            _masks[i].Opacity = 0.5;
         }
 
-        _masks.Add(mask);
+        this.Children.Add(mask);
+        this.Children.Add(control);
         control.OnClose += OnDialogClose;
         control.OnLayerChange += OnDialogLayerChange;
     }
@@ -173,5 +180,12 @@ public class OverlayDialogHost : Canvas
         {
             _dialogs[i].ZIndex = i;
         }
+
+        for (int i = 0; i < _masks.Count * 2; i += 2) 
+        {
+            _masks[i].ZIndex = _dialogs.Count + i;
+            _modalDialogs[i].ZIndex = _dialogs.Count + i + 1;
+        }
+        
     }
 }
\ No newline at end of file

From 9441d7577ec48686f57f82e0b00614418fda8332 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Wed, 24 Jan 2024 01:27:47 +0800
Subject: [PATCH 16/28] feat: clean up code, allow empty host, simplify z index
 calculation.

---
 .../Dialogs/DialogWithActionViewModel.cs      |  2 +-
 .../ViewModels/DialogDemoViewModel.cs         | 10 ++--
 demo/Ursa.Demo/Views/MainView.axaml           |  2 +-
 .../Dialog/{DialogBox.cs => Dialog.cs}        | 48 +++++++++----------
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 40 ++++++++++------
 .../Controls/Dialog/OverlayDialogManager.cs   | 33 ++++++++++---
 6 files changed, 81 insertions(+), 54 deletions(-)
 rename src/Ursa/Controls/Dialog/{DialogBox.cs => Dialog.cs} (69%)

diff --git a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
index f846146..87aa3b4 100644
--- a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
+++ b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
@@ -40,6 +40,6 @@ public partial class DialogWithActionViewModel: ObservableObject, IDialogContext
     
     private async Task ShowDialog()
     {
-        await DialogBox.ShowOverlayModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(new DialogWithActionViewModel(), "GlobalHost");
+        await OverlayDialog.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(new DialogWithActionViewModel());
     }
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 342ab0a..b1758dd 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -45,25 +45,25 @@ public class DialogDemoViewModel: ObservableObject
 
     private void ShowGlobalOverlayDialog()
     {
-        DialogBox.ShowOverlay<DialogWithAction, DialogWithActionViewModel>(new DialogWithActionViewModel(), "GlobalHost");
+        OverlayDialog.Show<DialogWithAction, DialogWithActionViewModel>(new DialogWithActionViewModel());
     }
 
     private async Task ShowGlobalModalDialog()
     {
-        var result = await DialogBox.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
+        var result = await Dialog.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
         Result = result;
     }
 
     private async Task ShowGlobalOverlayModalDialog()
     {
-        Result = await DialogBox.ShowOverlayModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel, "GlobalHost");
+        Result = await OverlayDialog.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
     }
 
     private async Task ShowLocalOverlayModalDialog()
     {
         var vm = new DialogWithActionViewModel();
-        var result = await DialogBox.ShowOverlayModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
-            DialogViewModel, "LocalHost", new DialogOptions(){ ExtendToClientArea = true });
+        var result = await OverlayDialog.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
+            DialogViewModel, new DialogOptions() { ExtendToClientArea = true }, "LocalHost");
         Result = result;
     }
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Views/MainView.axaml b/demo/Ursa.Demo/Views/MainView.axaml
index b6f6bb6..2a5bce2 100644
--- a/demo/Ursa.Demo/Views/MainView.axaml
+++ b/demo/Ursa.Demo/Views/MainView.axaml
@@ -80,7 +80,7 @@
                 <converters:ViewLocator />
             </ContentControl.ContentTemplate>
         </ContentControl>
-        <u:OverlayDialogHost Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2" HostId="GlobalHost" />
+        <u:OverlayDialogHost Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
     </Grid>
 
 </UserControl>
diff --git a/src/Ursa/Controls/Dialog/DialogBox.cs b/src/Ursa/Controls/Dialog/Dialog.cs
similarity index 69%
rename from src/Ursa/Controls/Dialog/DialogBox.cs
rename to src/Ursa/Controls/Dialog/Dialog.cs
index fe27fa7..a293f4d 100644
--- a/src/Ursa/Controls/Dialog/DialogBox.cs
+++ b/src/Ursa/Controls/Dialog/Dialog.cs
@@ -6,39 +6,34 @@ using Avalonia.Media;
 
 namespace Ursa.Controls;
 
-public static class DialogBox
+public static class Dialog
 {
     public static async Task<TResult?> ShowModalAsync<TView, TViewModel, TResult>(TViewModel vm) 
         where TView : Control, new()
     {
-        var window = new DialogWindow()
-        {
-            Content = new TView(),
-            DataContext = vm,
-        };
+
         var lifetime = Application.Current?.ApplicationLifetime;
         if (lifetime is IClassicDesktopStyleApplicationLifetime classLifetime)
         {
-            var main = classLifetime.MainWindow;
-            if (main is null)
+            var window = new DialogWindow
+            {
+                Content = new TView { DataContext = vm },
+                DataContext = vm,
+            };
+            if (classLifetime.MainWindow is not { } main)
             {
                 window.Show();
-                return default(TResult);
-            }
-            else
-            {
-                var result = await window.ShowDialog<TResult>(main);
-                return result;
+                return default;
             }
+            var result = await window.ShowDialog<TResult>(main);
+            return result;
         }
-        else
-        {
-            return default(TResult);
-        }
+
+        return default(TResult);
     }
     
-    public static async Task<TResult> ShowModalAsync<TView, TViewModel, TResult>(Window owner, TViewModel vm) where 
-        TView: Control, new()
+    public static async Task<TResult> ShowModalAsync<TView, TViewModel, TResult>(Window owner, TViewModel? vm) 
+        where TView: Control, new()
     {
         var window = new DialogWindow
         {
@@ -47,9 +42,11 @@ public static class DialogBox
         };
         return await window.ShowDialog<TResult>(owner);
     }
-    
+}
 
-    public static Task<TResult> ShowOverlayModalAsync<TView, TViewModel, TResult>(TViewModel vm, string hostId)
+public static class OverlayDialog
+{
+    public static Task<TResult> ShowModalAsync<TView, TViewModel, TResult>(TViewModel vm, string? hostId = null)
         where TView : Control, new()
     {
         var t = new DialogControl()
@@ -62,8 +59,7 @@ public static class DialogBox
         return t.ShowAsync<TResult>();
     }
 
-    public static Task<TResult> ShowOverlayModalAsync<TView, TViewModel, TResult>(TViewModel vm, string hostId,
-        DialogOptions options)
+    public static Task<TResult> ShowModalAsync<TView, TViewModel, TResult>(TViewModel vm, DialogOptions options, string? hostId = null)
         where TView : Control, new()
     {
         var t = new DialogControl()
@@ -78,7 +74,7 @@ public static class DialogBox
         return t.ShowAsync<TResult>();
     }
 
-    public static void ShowOverlay<TView, TViewModel>(TViewModel vm, string hostId)
+    public static void Show<TView, TViewModel>(TViewModel vm, string? hostId = null)
         where TView: Control, new()
     {
         var t = new DialogControl()
@@ -90,7 +86,7 @@ public static class DialogBox
         host?.AddDialog(t);
     }
 
-    public static void ShowOverlay<TView, TViewModel>(TViewModel vm, string hostId, DialogOptions options)
+    public static void Show<TView, TViewModel>(TViewModel vm, DialogOptions options, string? hostId)
         where TView: Control, new()
     {
         var t = new DialogControl()
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index edb928e..3cba9b6 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -1,13 +1,9 @@
-using System.Collections.Specialized;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Utilities;
-using Avalonia.VisualTree;
 
 namespace Ursa.Controls;
 
@@ -53,7 +49,7 @@ public class OverlayDialogHost : Canvas
         for (int i = 0; i < _masks.Count; i++)
         {
             _masks[i].Width = this.Bounds.Width;
-            _masks[i].Width = this.Bounds.Height;
+            _masks[i].Height = this.Bounds.Height;
         }
     }
 
@@ -94,9 +90,9 @@ public class OverlayDialogHost : Canvas
     {
         this.Children.Add(control);
         _dialogs.Add(control);
-        control.ZIndex = Children.Last().ZIndex + 1;
         control.OnClose += OnDialogClose;
         control.OnLayerChange += OnDialogLayerChange;
+        ResetZIndices();
     }
 
     private void OnDialogClose(object sender, object? e)
@@ -124,32 +120,31 @@ public class OverlayDialogHost : Canvas
                     }
                 }
             }
+            ResetZIndices();
         }
     }
 
+    /// <summary>
+    ///  Add a dialog as a modal dialog to the host
+    /// </summary>
+    /// <param name="control"></param>
     internal void AddModalDialog(DialogControl control)
     {
         var mask = CreateOverlayMask();
         _masks.Add(mask);
         _modalDialogs.Add(control);
-        int start = _dialogs.LastOrDefault()?.ZIndex ?? 1;
-        for (int i = 0; i < _masks.Count; i += 1)
-        {
-            _masks[i].ZIndex = start + 2 * i;
-            _modalDialogs[i].ZIndex = start + 2 * i + 1;
-        }
-        
         for (int i = 0; i < _masks.Count-1; i++)
         {
             _masks[i].Opacity = 0.5;
         }
-
+        ResetZIndices();
         this.Children.Add(mask);
         this.Children.Add(control);
         control.OnClose += OnDialogClose;
         control.OnLayerChange += OnDialogLayerChange;
     }
 
+    // Handle dialog layer change event
     private void OnDialogLayerChange(object sender, DialogLayerChangeEventArgs e)
     {
         if (sender is not DialogControl control)
@@ -188,4 +183,21 @@ public class OverlayDialogHost : Canvas
         }
         
     }
+
+    private void ResetZIndices()
+    {
+        int index = 0;
+        for ( int i = 0; i< _dialogs.Count; i++)
+        {
+            _dialogs[i].ZIndex = index;
+            index++;
+        }
+        for(int i = 0; i< _masks.Count; i++)
+        {
+            _masks[i].ZIndex = index;
+            index++;
+            _modalDialogs[i].ZIndex = index;
+            index++;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogManager.cs b/src/Ursa/Controls/Dialog/OverlayDialogManager.cs
index 1dc1480..1a0a0c0 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogManager.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogManager.cs
@@ -4,20 +4,39 @@ namespace Ursa.Controls;
 
 internal static class OverlayDialogManager
 {
-    private static ConcurrentDictionary<string, OverlayDialogHost> _hosts = new();
+    private static OverlayDialogHost? _defaultHost;
+    private static readonly ConcurrentDictionary<string, OverlayDialogHost> Hosts = new();
     
-    public static void RegisterOverlayDialogHost(OverlayDialogHost host, string id)
+    public static void RegisterOverlayDialogHost(OverlayDialogHost host, string? id)
     {
-        _hosts.TryAdd(id, host);
+        if (id == null)
+        {
+            if (_defaultHost != null)
+            {
+                throw new InvalidOperationException("Cannot register multiple OverlayDialogHost with empty HostId");
+            }
+            _defaultHost = host;
+            return;
+        }
+        Hosts.TryAdd(id, host);
     }
     
-    public static void UnregisterOverlayDialogHost(string id)
+    public static void UnregisterOverlayDialogHost(string? id)
     {
-        _hosts.TryRemove(id, out _);
+        if (id is null)
+        {
+            _defaultHost = null;
+            return;
+        }
+        Hosts.TryRemove(id, out _);
     }
     
-    public static OverlayDialogHost? GetOverlayDialogHost(string id)
+    public static OverlayDialogHost? GetOverlayDialogHost(string? id)
     {
-        return _hosts.TryGetValue(id, out var host) ? host : null;
+        if (id is null)
+        {
+            return _defaultHost;
+        }
+        return Hosts.TryGetValue(id, out var host) ? host : null;
     }
 }
\ No newline at end of file

From 564a53409ebf031463e9217383ef1987c6221698 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Wed, 24 Jan 2024 01:50:56 +0800
Subject: [PATCH 17/28] feat: simplify name, set to center by default.

---
 demo/Ursa.Demo/Pages/DialogDemo.axaml         |  4 +++-
 src/Ursa/Controls/Dialog/Dialog.cs            |  8 +++----
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 23 +++++++++++++++++--
 .../Controls/Dialog/OverlayDialogManager.cs   |  6 ++---
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 3474c87..9eb9357 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -33,7 +33,9 @@
                 Command="{Binding ShowLocalOverlayModalDialogCommand}">
                 Show Local Overlay Dialog
             </Button>
-            <u:OverlayDialogHost HostId="LocalHost" />
+            <Border CornerRadius="20" ClipToBounds="True">
+                <u:OverlayDialogHost HostId="LocalHost" />
+            </Border>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/src/Ursa/Controls/Dialog/Dialog.cs b/src/Ursa/Controls/Dialog/Dialog.cs
index a293f4d..0c3a845 100644
--- a/src/Ursa/Controls/Dialog/Dialog.cs
+++ b/src/Ursa/Controls/Dialog/Dialog.cs
@@ -54,7 +54,7 @@ public static class OverlayDialog
             Content = new TView(){ DataContext = vm },
             DataContext = vm,
         };
-        var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
+        var host = OverlayDialogManager.GetHost(hostId);
         host?.AddModalDialog(t);
         return t.ShowAsync<TResult>();
     }
@@ -69,7 +69,7 @@ public static class OverlayDialog
             ExtendToClientArea = options.ExtendToClientArea,
             Title = options.Title,
         };
-        var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
+        var host = OverlayDialogManager.GetHost(hostId);
         host?.AddModalDialog(t);
         return t.ShowAsync<TResult>();
     }
@@ -82,7 +82,7 @@ public static class OverlayDialog
             Content = new TView() { DataContext = vm },
             DataContext = vm,
         };
-        var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
+        var host = OverlayDialogManager.GetHost(hostId);
         host?.AddDialog(t);
     }
 
@@ -96,7 +96,7 @@ public static class OverlayDialog
             ExtendToClientArea = options.ExtendToClientArea,
             Title = options.Title,
         };
-        var host = OverlayDialogManager.GetOverlayDialogHost(hostId);
+        var host = OverlayDialogManager.GetHost(hostId);
         host?.AddModalDialog(t);
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 3cba9b6..67fec8c 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
@@ -40,7 +41,7 @@ public class OverlayDialogHost : Canvas
     protected sealed override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
-        OverlayDialogManager.RegisterOverlayDialogHost(this, HostId);
+        OverlayDialogManager.RegisterHost(this, HostId);
     }
 
     protected sealed override void OnSizeChanged(SizeChangedEventArgs e)
@@ -55,7 +56,7 @@ public class OverlayDialogHost : Canvas
 
     protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
     {
-        OverlayDialogManager.UnregisterOverlayDialogHost(HostId);
+        OverlayDialogManager.UnregisterHost(HostId);
         base.OnDetachedFromVisualTree(e);
     }
 
@@ -90,6 +91,9 @@ public class OverlayDialogHost : Canvas
     {
         this.Children.Add(control);
         _dialogs.Add(control);
+        control.Measure(this.Bounds.Size);
+        control.Arrange(new Rect(control.DesiredSize));
+        SetToCenter(control);
         control.OnClose += OnDialogClose;
         control.OnLayerChange += OnDialogLayerChange;
         ResetZIndices();
@@ -140,6 +144,9 @@ public class OverlayDialogHost : Canvas
         ResetZIndices();
         this.Children.Add(mask);
         this.Children.Add(control);
+        control.Measure(this.Bounds.Size);
+        control.Arrange(new Rect(control.DesiredSize));
+        SetToCenter(control);
         control.OnClose += OnDialogClose;
         control.OnLayerChange += OnDialogLayerChange;
     }
@@ -200,4 +207,16 @@ public class OverlayDialogHost : Canvas
             index++;
         }
     }
+
+    private void SetToCenter(DialogControl? control)
+    {
+        // return;
+        if (control is null) return;
+        double left = (this.Bounds.Width - control.Bounds.Width) / 2;
+        double top = (this.Bounds.Height - control.Bounds.Height) / 2;
+        left = MathUtilities.Clamp(left, 0, Bounds.Width);
+        top = MathUtilities.Clamp(top, 0, Bounds.Height);
+        Canvas.SetLeft(control, left);
+        Canvas.SetTop(control, top);
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogManager.cs b/src/Ursa/Controls/Dialog/OverlayDialogManager.cs
index 1a0a0c0..82e88af 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogManager.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogManager.cs
@@ -7,7 +7,7 @@ internal static class OverlayDialogManager
     private static OverlayDialogHost? _defaultHost;
     private static readonly ConcurrentDictionary<string, OverlayDialogHost> Hosts = new();
     
-    public static void RegisterOverlayDialogHost(OverlayDialogHost host, string? id)
+    public static void RegisterHost(OverlayDialogHost host, string? id)
     {
         if (id == null)
         {
@@ -21,7 +21,7 @@ internal static class OverlayDialogManager
         Hosts.TryAdd(id, host);
     }
     
-    public static void UnregisterOverlayDialogHost(string? id)
+    public static void UnregisterHost(string? id)
     {
         if (id is null)
         {
@@ -31,7 +31,7 @@ internal static class OverlayDialogManager
         Hosts.TryRemove(id, out _);
     }
     
-    public static OverlayDialogHost? GetOverlayDialogHost(string? id)
+    public static OverlayDialogHost? GetHost(string? id)
     {
         if (id is null)
         {

From a174f0cd85599d228163e96806126298b2030155 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Wed, 24 Jan 2024 11:32:07 +0800
Subject: [PATCH 18/28] feat: unify layer update code.

---
 src/Ursa.Themes.Semi/Controls/Dialog.axaml | 53 ++++++++++++++++------
 src/Ursa/Controls/Dialog/DialogControl.cs  | 22 ++-------
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 4c1c951..e64a8e6 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -4,7 +4,7 @@
     xmlns:u="https://irihi.tech/ursa">
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:OverlayDialogHost}" TargetType="u:OverlayDialogHost">
-        <Setter Property="OverlayMaskBrush" Value="{DynamicResource OverlayDialogMaskBrush}"></Setter>
+        <Setter Property="OverlayMaskBrush" Value="{DynamicResource OverlayDialogMaskBrush}" />
     </ControlTheme>
     <ControlTheme x:Key="{x:Type u:DialogControl}" TargetType="u:DialogControl">
         <Setter Property="Template">
@@ -25,16 +25,15 @@
                                 Name="{x:Static u:DialogControl.PART_TitleArea}"
                                 Grid.Column="0"
                                 Grid.ColumnSpan="2"
-                                Background="Transparent" >
-                            </Panel>
+                                Background="Transparent" />
                             <TextBlock
                                 Grid.Column="0"
                                 Margin="8,8,0,0"
-                                DockPanel.Dock="Left"
-                                Text="{TemplateBinding Title}"
                                 Classes="Strong"
-                                IsVisible="{TemplateBinding Title, Converter={x:Static ObjectConverters.IsNotNull}}"
-                                />
+                                DockPanel.Dock="Left"
+                                IsVisible="{TemplateBinding Title,
+                                                            Converter={x:Static ObjectConverters.IsNotNull}}"
+                                Text="{TemplateBinding Title}" />
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
                                 Grid.Column="1"
@@ -53,24 +52,48 @@
         <Style Selector="^:not(:modal) /template/ Panel#PART_TitleArea">
             <Setter Property="ContextFlyout">
                 <MenuFlyout>
-                    <MenuItem Header="Bring Forward" Command="{Binding $parent[u:DialogControl].BringForward}">
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.BringForward}"
+                        Header="Bring Forward">
                         <MenuItem.Icon>
-                            <PathIcon Width="12" Height="12" Data="{DynamicResource DialogArrangeBringForwardGlyph}"></PathIcon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeBringForwardGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
-                    <MenuItem Header="Bring To Front" Command="{Binding $parent[u:DialogControl].BringToFront}">
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.BringToFront}"
+                        Header="Bring To Front">
                         <MenuItem.Icon>
-                            <PathIcon Width="12" Height="12" Data="{DynamicResource DialogArrangeBringToFrontGlyph}"></PathIcon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeBringToFrontGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
-                    <MenuItem Header="Send Backward" Command="{Binding $parent[u:DialogControl].SendBackward}" >
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.SendBackward}"
+                        Header="Send Backward">
                         <MenuItem.Icon>
-                            <PathIcon Width="12" Height="12" Data="{DynamicResource DialogArrangeSendBackwardGlyph}"></PathIcon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeSendBackwardGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
-                    <MenuItem Header="Send To Back" Command="{Binding $parent[u:DialogControl].SendToBack}">
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.SendToBack}"
+                        Header="Send To Back">
                         <MenuItem.Icon>
-                            <PathIcon Width="12" Height="12" Data="{DynamicResource DialogArrangeSendToBackGlyph}"></PathIcon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeSendToBackGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
                 </MenuFlyout>
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index 737d4d6..2fe3175 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -127,23 +127,11 @@ public class DialogControl: ContentControl
         }
     }
 
-    public void BringForward()
+    public void UpdateLayer(object? o)
     {
-        OnLayerChange?.Invoke(this, new DialogLayerChangeEventArgs(DialogLayerChangeType.BringForward));
-    }
-
-    public void SendBackward()
-    {
-        OnLayerChange?.Invoke(this, new DialogLayerChangeEventArgs(DialogLayerChangeType.SendBackward));
-    } 
-    
-    public void BringToFront()
-    {
-        OnLayerChange?.Invoke(this, new DialogLayerChangeEventArgs(DialogLayerChangeType.BringToFront));
-    }
-    
-    public void SendToBack()
-    {
-        OnLayerChange?.Invoke(this, new DialogLayerChangeEventArgs(DialogLayerChangeType.SendToBack));
+        if (o is DialogLayerChangeType t)
+        {
+            OnLayerChange?.Invoke(this, new DialogLayerChangeEventArgs(t));
+        }
     }
 }
\ No newline at end of file

From a17f1076d07046d37bbe0462214119591a520792 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Wed, 24 Jan 2024 12:40:45 +0800
Subject: [PATCH 19/28] feat: implement default button for dialog control.

---
 .../Dialogs/DialogWithActionViewModel.cs      |   2 +-
 demo/Ursa.Demo/Dialogs/PlainDialog.axaml      |   5 +-
 demo/Ursa.Demo/Pages/DialogDemo.axaml         |   1 +
 .../ViewModels/DialogDemoViewModel.cs         |  17 ++-
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    |  26 ++++
 src/Ursa/Controls/Dialog/Dialog.cs            |   2 +
 src/Ursa/Controls/Dialog/DialogControl.cs     | 144 +++++++++++++++---
 src/Ursa/Controls/Dialog/DialogOptions.cs     |   2 +-
 src/Ursa/Controls/Dialog/IDialogContext.cs    |   2 +-
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs |   8 +-
 10 files changed, 181 insertions(+), 28 deletions(-)

diff --git a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
index 87aa3b4..37c0cdc 100644
--- a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
+++ b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
@@ -12,7 +12,7 @@ public partial class DialogWithActionViewModel: ObservableObject, IDialogContext
     [ObservableProperty] private string _title;
     [ObservableProperty] private DateTime _date;
     public object? DefaultCloseResult { get; set; } = true;
-    public event EventHandler<object>? Closed;
+    public event EventHandler<object?>? Closed;
     
     public ICommand OKCommand { get; set; }
     public ICommand CancelCommand { get; set; }
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
index 7879fe4..3888975 100644
--- a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
+++ b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
@@ -4,5 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ursa.Demo.Dialogs.PlainDialog">
-    
+    <StackPanel Margin="8">
+        <TextBlock Classes="Strong" Margin="8"  Text="{Binding Title}"></TextBlock>
+        <Calendar SelectedDate="{Binding Date}" ></Calendar>
+    </StackPanel>
 </UserControl>
diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 9eb9357..4fc535a 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -25,6 +25,7 @@
             <Button Command="{Binding ShowLocalOverlayModalDialogCommand}">Show Local Overlay Modal Dialog</Button>
             <Button Command="{Binding ShowGlobalOverlayModalDialogCommand}"> Show Global Overlay Modal Dialog </Button>
             <Button Command="{Binding ShowGlobalOverlayDialogCommand}">Show Global Overlay Dialog</Button>
+            <Button Command="{Binding ShowPlainGlobalOverlayDialogCommand}">Default Buttons</Button>
         </StackPanel>
         <Grid Grid.Column="1">
             <Button
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index b1758dd..558cd69 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Ursa.Common;
 using Ursa.Controls;
 using Ursa.Demo.Dialogs;
 using Ursa.Demo.Pages;
@@ -16,6 +17,8 @@ public class DialogDemoViewModel: ObservableObject
     public ICommand ShowGlobalModalDialogCommand { get; }
     
     public ICommand ShowGlobalOverlayDialogCommand { get; }
+    
+    public ICommand ShowPlainGlobalOverlayDialogCommand { get; }
 
     private object? _result;
 
@@ -41,6 +44,7 @@ public class DialogDemoViewModel: ObservableObject
         ShowGlobalOverlayModalDialogCommand = new AsyncRelayCommand(ShowGlobalOverlayModalDialog);
         ShowGlobalModalDialogCommand = new AsyncRelayCommand(ShowGlobalModalDialog);
         ShowGlobalOverlayDialogCommand = new RelayCommand(ShowGlobalOverlayDialog);
+        ShowPlainGlobalOverlayDialogCommand = new AsyncRelayCommand(ShowPlainGlobalOverlayDialog);
     }
 
     private void ShowGlobalOverlayDialog()
@@ -63,7 +67,18 @@ public class DialogDemoViewModel: ObservableObject
     {
         var vm = new DialogWithActionViewModel();
         var result = await OverlayDialog.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
-            DialogViewModel, new DialogOptions() { ExtendToClientArea = true }, "LocalHost");
+            DialogViewModel, new DialogOptions() { ExtendToClientArea = true}, "LocalHost");
         Result = result;
     }
+    
+    public async Task ShowPlainGlobalOverlayDialog()
+    {
+        var result = await OverlayDialog.ShowModalAsync<PlainDialog, PlainDialogViewModel, object?>(
+            new PlainDialogViewModel(),
+            new DialogOptions()
+            {
+                DefaultButtons = DialogButton.OKCancel,
+            }, 
+            "LocalHost");
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index e64a8e6..c9d55c4 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -41,6 +41,32 @@
                                 DockPanel.Dock="Right"
                                 Theme="{DynamicResource CloseButton}" />
                         </Grid>
+                        <StackPanel
+                            Grid.Row="2"
+                            Margin="0,0,8,8"
+                            HorizontalAlignment="Right"
+                            Orientation="Horizontal">
+                            <Button
+                                Name="{x:Static u:DialogControl.PART_CancelButton}"
+                                Margin="8,0,0,0"
+                                Classes="Tertiary"
+                                Content="Cancel" />
+                            <Button
+                                Name="{x:Static u:DialogControl.PART_NoButton}"
+                                Margin="8,0,0,0"
+                                Classes="Danger"
+                                Content="No" />
+                            <Button
+                                Name="{x:Static u:DialogControl.PART_YesButton}"
+                                Margin="8,0,0,0"
+                                Classes="Primary"
+                                Content="Yes" />
+                            <Button
+                                Name="{x:Static u:DialogControl.PART_OKButton}"
+                                Margin="8,0,0,0"
+                                Classes="Primary"
+                                Content="OK" />
+                        </StackPanel>
                     </Grid>
                 </Border>
             </ControlTemplate>
diff --git a/src/Ursa/Controls/Dialog/Dialog.cs b/src/Ursa/Controls/Dialog/Dialog.cs
index 0c3a845..ed63a58 100644
--- a/src/Ursa/Controls/Dialog/Dialog.cs
+++ b/src/Ursa/Controls/Dialog/Dialog.cs
@@ -68,6 +68,7 @@ public static class OverlayDialog
             DataContext = vm,
             ExtendToClientArea = options.ExtendToClientArea,
             Title = options.Title,
+            Buttons = options.DefaultButtons,
         };
         var host = OverlayDialogManager.GetHost(hostId);
         host?.AddModalDialog(t);
@@ -95,6 +96,7 @@ public static class OverlayDialog
             DataContext = vm,
             ExtendToClientArea = options.ExtendToClientArea,
             Title = options.Title,
+            Buttons = options.DefaultButtons,
         };
         var host = OverlayDialogManager.GetHost(hostId);
         host?.AddModalDialog(t);
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index 2fe3175..bbdb8a0 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -4,22 +4,36 @@ using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Ursa.Common;
 
 namespace Ursa.Controls;
 
 [TemplatePart(PART_CloseButton, typeof(Button))]
+[TemplatePart(PART_OKButton, typeof(Button))]
+[TemplatePart(PART_CancelButton, typeof(Button))]
+[TemplatePart(PART_YesButton, typeof(Button))]
+[TemplatePart(PART_NoButton, typeof(Button))]
 [TemplatePart(PART_TitleArea, typeof(Panel))]
 [PseudoClasses(PC_ExtendClientArea)]
 public class DialogControl: ContentControl
 {
     public const string PART_CloseButton = "PART_CloseButton";
+    public const string PART_OKButton = "PART_OKButton";
+    public const string PART_CancelButton = "PART_CancelButton";
+    public const string PART_YesButton = "PART_YesButton";
+    public const string PART_NoButton = "PART_NoButton";
+    
     public const string PART_TitleArea = "PART_TitleArea";
     public const string PC_ExtendClientArea = ":extend";
     public const string PC_Modal = ":modal";
     
     private Button? _closeButton;
+    private Button? _okButton;
+    private Button? _cancelButton;
+    private Button? _yesButton;
+    private Button? _noButton;
     private Panel? _titleArea;
-    public event EventHandler<object?>? OnClose;
+    public event EventHandler<object?>? OnDialogControlClose;
     public event EventHandler<DialogLayerChangeEventArgs>? OnLayerChange;
 
     public static readonly StyledProperty<string?> TitleProperty = AvaloniaProperty.Register<DialogControl, string?>(
@@ -40,6 +54,8 @@ public class DialogControl: ContentControl
         set => SetValue(ExtendToClientAreaProperty, value);
     }
 
+    internal DialogButton Buttons { get; set; }
+
     static DialogControl()
     {
         DataContextProperty.Changed.AddClassHandler<DialogControl, object?>((o, e) => o.OnDataContextChange(e));
@@ -50,12 +66,12 @@ public class DialogControl: ContentControl
     {
         if (args.OldValue.Value is IDialogContext oldContext)
         {
-            oldContext.Closed-= Close;
+            oldContext.Closed-= CloseFromContext;
         }
 
         if (args.NewValue.Value is IDialogContext newContext)
         {
-            newContext.Closed += Close;
+            newContext.Closed += CloseFromContext;
         }
     }
     
@@ -63,24 +79,83 @@ public class DialogControl: ContentControl
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        if (_closeButton != null)
-        {
-            _closeButton.Click -= Close;
-        }
+        UnRegisterClickEvent(Close, _closeButton);
+        UnRegisterClickEvent(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
         _titleArea?.RemoveHandler(PointerMovedEvent, OnTitlePointerMove);
         _titleArea?.RemoveHandler(PointerPressedEvent, OnTitlePointerPressed);
         
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
         _titleArea = e.NameScope.Find<Panel>(PART_TitleArea);
-        if (_closeButton is not null)
-        {
-            _closeButton.Click += Close;
-        }
+        _okButton = e.NameScope.Find<Button>(PART_OKButton);
+        _cancelButton = e.NameScope.Find<Button>(PART_CancelButton);
+        _yesButton = e.NameScope.Find<Button>(PART_YesButton);
+        _noButton = e.NameScope.Find<Button>(PART_NoButton);
+        
         _titleArea?.AddHandler(PointerMovedEvent, OnTitlePointerMove, RoutingStrategies.Bubble);
         _titleArea?.AddHandler(PointerPressedEvent, OnTitlePointerPressed, RoutingStrategies.Bubble);
-        
+        RegisterClickEvent(Close, _closeButton);
+        RegisterClickEvent(DefaultButtonsClose, _yesButton, _noButton, _okButton, _cancelButton);
+        SetButtonVisibility();
     }
 
+    private void UnRegisterClickEvent(EventHandler<RoutedEventArgs> action, params Button?[] buttons)
+    {
+        foreach (var button in buttons)
+        {
+            if(button is not null) button.Click -= action;
+        }
+    }
+    
+    private void RegisterClickEvent(EventHandler<RoutedEventArgs> action, params Button?[] buttons)
+    {
+        foreach (var button in buttons)
+        {
+            if(button is not null) button.Click += action;
+        }
+    }
+
+    private void SetButtonVisibility()
+    {
+        switch (Buttons)
+        {
+            case DialogButton.None:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case DialogButton.OK:
+                SetVisibility(_okButton, true);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case DialogButton.OKCancel:
+                SetVisibility(_okButton, true);
+                SetVisibility(_cancelButton, true);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case DialogButton.YesNo:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, true);
+                SetVisibility(_noButton, true);
+                break;
+            case DialogButton.YesNoCancel:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, true);
+                SetVisibility(_yesButton, true);
+                SetVisibility(_noButton, true);
+                break;
+        }
+    }
+
+    private void SetVisibility(Button? button, bool visible)
+    {
+        if (button is not null) button.IsVisible = visible;
+    }
+    
     private void OnTitlePointerPressed(object sender, PointerPressedEventArgs e)
     {
         e.Source = this;
@@ -101,29 +176,60 @@ public class DialogControl: ContentControl
             if (args is T result)
             {
                 tcs.SetResult(result);
-                OnClose-= OnCloseHandler;
+                OnDialogControlClose-= OnCloseHandler;
             }
             else
             {
                 tcs.SetResult(default(T));
-                OnClose-= OnCloseHandler;
+                OnDialogControlClose-= OnCloseHandler;
             }
         }
 
-        this.OnClose += OnCloseHandler;
+        this.OnDialogControlClose += OnCloseHandler;
         return tcs.Task;
     }
-
-    private void Close(object sender, object args)
+    
+    private void Close(object sender, RoutedEventArgs args)
     {
         if (this.DataContext is IDialogContext context)
         {
-            OnClose?.Invoke(this, Equals(sender, _closeButton) ? context.DefaultCloseResult : args);
+            OnDialogControlClose?.Invoke(this, context.DefaultCloseResult);
         }
         
         else
         {
-            OnClose?.Invoke(this, null);
+            OnDialogControlClose?.Invoke(this, null);
+        }
+    }
+
+    private void CloseFromContext(object sender, object? args)
+    {
+        if (this.DataContext is IDialogContext context)
+        {
+            OnDialogControlClose?.Invoke(this, args);
+        }
+    }
+
+    private void DefaultButtonsClose(object sender, RoutedEventArgs args)
+    {
+        if (sender is Button button)
+        {
+            if (button == _okButton)
+            {
+                OnDialogControlClose?.Invoke(this, DialogResult.OK);
+            }
+            else if (button == _cancelButton)
+            {
+                OnDialogControlClose?.Invoke(this, DialogResult.Cancel);
+            }
+            else if (button == _yesButton)
+            {
+                OnDialogControlClose?.Invoke(this, DialogResult.Yes);
+            }
+            else if (button == _noButton)
+            {
+                OnDialogControlClose?.Invoke(this, DialogResult.No);
+            }
         }
     }
 
diff --git a/src/Ursa/Controls/Dialog/DialogOptions.cs b/src/Ursa/Controls/Dialog/DialogOptions.cs
index 5e3e934..86a5607 100644
--- a/src/Ursa/Controls/Dialog/DialogOptions.cs
+++ b/src/Ursa/Controls/Dialog/DialogOptions.cs
@@ -7,5 +7,5 @@ public record DialogOptions
     public bool ShowCloseButton { get; set; } = true;
     public string? Title { get; set; }
     public bool ExtendToClientArea { get; set; } = false;
-    public DialogButton DefaultButtons { get; set; } = DialogButton.OKCancel;
+    public DialogButton DefaultButtons { get; set; } = DialogButton.None;
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/IDialogContext.cs b/src/Ursa/Controls/Dialog/IDialogContext.cs
index 6920f46..a05bc62 100644
--- a/src/Ursa/Controls/Dialog/IDialogContext.cs
+++ b/src/Ursa/Controls/Dialog/IDialogContext.cs
@@ -3,5 +3,5 @@ namespace Ursa.Controls;
 public interface IDialogContext
 {
     object? DefaultCloseResult { get; set; }
-    event EventHandler<object> Closed;
+    event EventHandler<object?> Closed;
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 67fec8c..15a2ffb 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -94,17 +94,17 @@ public class OverlayDialogHost : Canvas
         control.Measure(this.Bounds.Size);
         control.Arrange(new Rect(control.DesiredSize));
         SetToCenter(control);
-        control.OnClose += OnDialogClose;
+        control.OnDialogControlClose += OnDialogControlDialogClose;
         control.OnLayerChange += OnDialogLayerChange;
         ResetZIndices();
     }
 
-    private void OnDialogClose(object sender, object? e)
+    private void OnDialogControlDialogClose(object sender, object? e)
     {
         if (sender is DialogControl control)
         {
             this.Children.Remove(control);
-            control.OnClose -= OnDialogClose;
+            control.OnDialogControlClose -= OnDialogControlDialogClose;
             control.OnLayerChange -= OnDialogLayerChange;
             if (_dialogs.Contains(control))
             {
@@ -147,7 +147,7 @@ public class OverlayDialogHost : Canvas
         control.Measure(this.Bounds.Size);
         control.Arrange(new Rect(control.DesiredSize));
         SetToCenter(control);
-        control.OnClose += OnDialogClose;
+        control.OnDialogControlClose += OnDialogControlDialogClose;
         control.OnLayerChange += OnDialogLayerChange;
     }
 

From 430dccc9584fb88e5b50147e7c43fb28c2366ad5 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Thu, 25 Jan 2024 00:50:27 +0800
Subject: [PATCH 20/28] feat: ultimate refactoring to separate default dialog
 and custom dialog.

---
 demo/Ursa.Demo/Dialogs/DialogWithAction.axaml |   4 +-
 .../Dialogs/DialogWithActionViewModel.cs      |   9 +-
 demo/Ursa.Demo/Dialogs/PlainDialog.axaml      |   1 -
 .../ViewModels/DialogDemoViewModel.cs         |  17 +-
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 155 ++++++++++++++--
 .../Controls/MessageBoxWindow.axaml           |   1 -
 src/Ursa/Common/EventHelper.cs                |  23 +++
 .../Controls/Dialog/DefaultDialogControl.cs   | 133 ++++++++++++++
 .../Controls/Dialog/DefaultDialogWindow.cs    | 125 +++++++++++++
 src/Ursa/Controls/Dialog/Dialog.cs            | 165 +++++++++++++-----
 src/Ursa/Controls/Dialog/DialogControl.cs     | 164 +++--------------
 src/Ursa/Controls/Dialog/DialogIcon.cs        |  11 ++
 src/Ursa/Controls/Dialog/DialogOptions.cs     |  11 --
 src/Ursa/Controls/Dialog/DialogWindow.cs      |  16 +-
 src/Ursa/Controls/Dialog/IDialogContext.cs    |   2 +-
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs |  23 +--
 16 files changed, 605 insertions(+), 255 deletions(-)
 create mode 100644 src/Ursa/Common/EventHelper.cs
 create mode 100644 src/Ursa/Controls/Dialog/DefaultDialogControl.cs
 create mode 100644 src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
 create mode 100644 src/Ursa/Controls/Dialog/DialogIcon.cs
 delete mode 100644 src/Ursa/Controls/Dialog/DialogOptions.cs

diff --git a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
index b3132df..104e746 100644
--- a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
+++ b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
@@ -7,8 +7,8 @@
              x:CompileBindings="True"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ursa.Demo.Dialogs.DialogWithAction">
-    <StackPanel Margin="8">
-        <TextBlock Classes="Strong" Margin="8"  Text="{Binding Title}"></TextBlock>
+    <StackPanel Margin="24">
+        <TextBlock FontSize="16" FontWeight="600" Margin="8"  Text="{Binding Title}"></TextBlock>
         <Calendar SelectedDate="{Binding Date}" ></Calendar>
         <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Spacing="8">
             <Button Content="Dialog" Command="{Binding DialogCommand}"></Button>
diff --git a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
index 37c0cdc..5f43a7f 100644
--- a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
+++ b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
@@ -11,7 +11,12 @@ public partial class DialogWithActionViewModel: ObservableObject, IDialogContext
 {
     [ObservableProperty] private string _title;
     [ObservableProperty] private DateTime _date;
-    public object? DefaultCloseResult { get; set; } = true;
+
+    public void Close()
+    {
+        Closed?.Invoke(this, false);
+    }
+
     public event EventHandler<object?>? Closed;
     
     public ICommand OKCommand { get; set; }
@@ -40,6 +45,6 @@ public partial class DialogWithActionViewModel: ObservableObject, IDialogContext
     
     private async Task ShowDialog()
     {
-        await OverlayDialog.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(new DialogWithActionViewModel());
+        await OverlayDialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(new DialogWithActionViewModel());
     }
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
index 3888975..f5688f2 100644
--- a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
+++ b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
@@ -5,7 +5,6 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ursa.Demo.Dialogs.PlainDialog">
     <StackPanel Margin="8">
-        <TextBlock Classes="Strong" Margin="8"  Text="{Binding Title}"></TextBlock>
         <Calendar SelectedDate="{Binding Date}" ></Calendar>
     </StackPanel>
 </UserControl>
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 558cd69..55dc3ae 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -15,13 +15,10 @@ public class DialogDemoViewModel: ObservableObject
     public ICommand ShowLocalOverlayModalDialogCommand { get; }
     public ICommand ShowGlobalOverlayModalDialogCommand { get; }
     public ICommand ShowGlobalModalDialogCommand { get; }
-    
     public ICommand ShowGlobalOverlayDialogCommand { get; }
-    
     public ICommand ShowPlainGlobalOverlayDialogCommand { get; }
 
     private object? _result;
-
     public object? Result
     {
         get => _result;
@@ -54,31 +51,27 @@ public class DialogDemoViewModel: ObservableObject
 
     private async Task ShowGlobalModalDialog()
     {
-        var result = await Dialog.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
+        var result = await Dialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
         Result = result;
     }
 
     private async Task ShowGlobalOverlayModalDialog()
     {
-        Result = await OverlayDialog.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
+        Result = await OverlayDialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
     }
 
     private async Task ShowLocalOverlayModalDialog()
     {
         var vm = new DialogWithActionViewModel();
-        var result = await OverlayDialog.ShowModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
-            DialogViewModel, new DialogOptions() { ExtendToClientArea = true}, "LocalHost");
+        var result = await OverlayDialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
+            DialogViewModel, "LocalHost");
         Result = result;
     }
     
     public async Task ShowPlainGlobalOverlayDialog()
     {
-        var result = await OverlayDialog.ShowModalAsync<PlainDialog, PlainDialogViewModel, object?>(
+        var result = await OverlayDialog.ShowCustomModalAsync<PlainDialog, PlainDialogViewModel, object?>(
             new PlainDialogViewModel(),
-            new DialogOptions()
-            {
-                DefaultButtons = DialogButton.OKCancel,
-            }, 
             "LocalHost");
     }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index c9d55c4..0d0b285 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -13,9 +13,96 @@
                     Padding="0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
+                    Classes="Shadow"
+                    CornerRadius="12"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
-                    <Grid RowDefinitions="Auto, *, Auto">
+                    <Grid RowDefinitions="Auto, *">
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            Grid.Row="0"
+                            Grid.RowSpan="2"
+                            Content="{TemplateBinding Content}" />
+                        <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                            <Panel
+                                Name="{x:Static u:DialogControl.PART_TitleArea}"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2"
+                                Background="Transparent" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                Grid.Column="1"
+                                Margin="0,24,24,0"
+                                DockPanel.Dock="Right"
+                                Theme="{DynamicResource CloseButton}" />
+                        </Grid>
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:not(:modal) /template/ Panel#PART_TitleArea">
+            <Setter Property="ContextFlyout">
+                <MenuFlyout>
+                    <MenuItem
+                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.BringForward}"
+                        Header="Bring Forward">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeBringForwardGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.BringToFront}"
+                        Header="Bring To Front">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeBringToFrontGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.SendBackward}"
+                        Header="Send Backward">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeSendBackwardGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.SendToBack}"
+                        Header="Send To Back">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeSendToBackGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuFlyout>
+            </Setter>
+        </Style>
+    </ControlTheme>
+    <ControlTheme x:Key="{x:Type u:DefaultDialogControl}" TargetType="u:DefaultDialogControl">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:DefaultDialogControl">
+                <Border
+                    Padding="0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Classes="Shadow"
+                    CornerRadius="12"
+                    IsHitTestVisible="True"
+                    Theme="{DynamicResource CardBorder}">
+                    <Grid Margin="24" RowDefinitions="Auto, *, Auto">
                         <ContentPresenter
                             Name="PART_ContentPresenter"
                             Grid.Row="1"
@@ -47,22 +134,22 @@
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">
                             <Button
-                                Name="{x:Static u:DialogControl.PART_CancelButton}"
+                                Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
                                 Margin="8,0,0,0"
                                 Classes="Tertiary"
                                 Content="Cancel" />
                             <Button
-                                Name="{x:Static u:DialogControl.PART_NoButton}"
+                                Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
                                 Margin="8,0,0,0"
                                 Classes="Danger"
                                 Content="No" />
                             <Button
-                                Name="{x:Static u:DialogControl.PART_YesButton}"
+                                Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
                                 Content="Yes" />
                             <Button
-                                Name="{x:Static u:DialogControl.PART_OKButton}"
+                                Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
                                 Content="OK" />
@@ -71,15 +158,11 @@
                 </Border>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^:extend /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Grid.Row" Value="0" />
-            <Setter Property="Grid.RowSpan" Value="3" />
-        </Style>
         <Style Selector="^:not(:modal) /template/ Panel#PART_TitleArea">
             <Setter Property="ContextFlyout">
                 <MenuFlyout>
                     <MenuItem
-                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.BringForward}"
                         Header="Bring Forward">
                         <MenuItem.Icon>
@@ -90,7 +173,7 @@
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem
-                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.BringToFront}"
                         Header="Bring To Front">
                         <MenuItem.Icon>
@@ -101,7 +184,7 @@
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem
-                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.SendBackward}"
                         Header="Send Backward">
                         <MenuItem.Icon>
@@ -112,7 +195,7 @@
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem
-                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.SendToBack}"
                         Header="Send To Back">
                         <MenuItem.Icon>
@@ -163,13 +246,47 @@
                             Grid.Row="0"
                             Grid.RowSpan="2"
                             Content="{TemplateBinding Content}" />
-                        <Button
-                            Name="{x:Static u:DialogWindow.PART_CloseButton}"
-                            Grid.Row="0"
-                            Margin="0,4,4,0"
+                        <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="8,8,0,0"
+                                FontSize="14"
+                                FontWeight="Bold"
+                                Text="{TemplateBinding Title}"
+                                TextTrimming="CharacterEllipsis"
+                                TextWrapping="NoWrap" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                Grid.Column="1"
+                                Margin="0,4,4,0"
+                                Theme="{DynamicResource CloseButton}" />
+                        </Grid>
+                        <StackPanel
+                            Grid.Row="2"
+                            Margin="0,0,8,8"
                             HorizontalAlignment="Right"
-                            VerticalAlignment="Top"
-                            Theme="{DynamicResource CloseButton}" />
+                            Orientation="Horizontal">
+                            <Button
+                                Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
+                                Margin="8,0,0,0"
+                                Classes="Tertiary"
+                                Content="Cancel" />
+                            <Button
+                                Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
+                                Margin="8,0,0,0"
+                                Classes="Danger"
+                                Content="No" />
+                            <Button
+                                Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
+                                Margin="8,0,0,0"
+                                Classes="Primary"
+                                Content="Yes" />
+                            <Button
+                                Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
+                                Margin="8,0,0,0"
+                                Classes="Primary"
+                                Content="OK" />
+                        </StackPanel>
                     </Grid>
                 </Panel>
             </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml b/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml
index 7e5bd25..e716b09 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml
@@ -40,7 +40,6 @@
                                 TextTrimming="CharacterEllipsis"
                                 TextWrapping="NoWrap"
                                 Text="{TemplateBinding Title}" />
-                            <!--  A temporary style copied from Semi. Will replace when I get time  -->
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
                                 Grid.Column="1"
diff --git a/src/Ursa/Common/EventHelper.cs b/src/Ursa/Common/EventHelper.cs
new file mode 100644
index 0000000..3d9342d
--- /dev/null
+++ b/src/Ursa/Common/EventHelper.cs
@@ -0,0 +1,23 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace Ursa.Common;
+
+internal static class EventHelper
+{
+    public static void RegisterClickEvent(EventHandler<RoutedEventArgs> handler, params Button?[] buttons)
+    {
+        foreach (var button in buttons)
+        {
+            if(button is not null) button.Click += handler;
+        }
+    }
+    
+    public static void UnregisterClickEvent(EventHandler<RoutedEventArgs> handler, params Button?[] buttons)
+    {
+        foreach (var button in buttons)
+        {
+            if(button is not null) button.Click -= handler;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
new file mode 100644
index 0000000..a8b5658
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
@@ -0,0 +1,133 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Ursa.Common;
+
+namespace Ursa.Controls;
+
+
+[TemplatePart(PART_OKButton, typeof(Button))]
+[TemplatePart(PART_CancelButton, typeof(Button))]
+[TemplatePart(PART_YesButton, typeof(Button))]
+[TemplatePart(PART_NoButton, typeof(Button))]
+[TemplatePart(PART_TitleArea, typeof(Panel))]
+public class DefaultDialogControl: DialogControl
+{
+    public const string PART_OKButton = "PART_OKButton";
+    public const string PART_CancelButton = "PART_CancelButton";
+    public const string PART_YesButton = "PART_YesButton";
+    public const string PART_NoButton = "PART_NoButton";
+    
+    private Button? _okButton;
+    private Button? _cancelButton;
+    private Button? _yesButton;
+    private Button? _noButton;
+    
+    public static readonly StyledProperty<string?> TitleProperty = AvaloniaProperty.Register<DefaultDialogControl, string?>(
+        nameof(Title));
+
+    public string? Title
+    {
+        get => GetValue(TitleProperty);
+        set => SetValue(TitleProperty, value);
+    }
+
+    public static readonly StyledProperty<DialogButton> ButtonsProperty = AvaloniaProperty.Register<DefaultDialogControl, DialogButton>(
+        nameof(Buttons));
+
+    public DialogButton Buttons
+    {
+        get => GetValue(ButtonsProperty);
+        set => SetValue(ButtonsProperty, value);
+    }
+
+    public static readonly StyledProperty<DialogIcon> IconProperty = AvaloniaProperty.Register<DefaultDialogControl, DialogIcon>(
+        nameof(Icon));
+
+    public DialogIcon Icon
+    {
+        get => GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+    
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        EventHelper.UnregisterClickEvent(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
+        _okButton = e.NameScope.Find<Button>(PART_OKButton);
+        _cancelButton = e.NameScope.Find<Button>(PART_CancelButton);
+        _yesButton = e.NameScope.Find<Button>(PART_YesButton);
+        _noButton = e.NameScope.Find<Button>(PART_NoButton);
+        EventHelper.RegisterClickEvent(DefaultButtonsClose, _yesButton, _noButton, _okButton, _cancelButton);
+        SetButtonVisibility();
+    }
+    
+    
+    private void SetButtonVisibility()
+    {
+        switch (Buttons)
+        {
+            case DialogButton.None:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case DialogButton.OK:
+                SetVisibility(_okButton, true);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case DialogButton.OKCancel:
+                SetVisibility(_okButton, true);
+                SetVisibility(_cancelButton, true);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case DialogButton.YesNo:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, true);
+                SetVisibility(_noButton, true);
+                break;
+            case DialogButton.YesNoCancel:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, true);
+                SetVisibility(_yesButton, true);
+                SetVisibility(_noButton, true);
+                break;
+        }
+    }
+
+    private void SetVisibility(Button? button, bool visible)
+    {
+        if (button is not null) button.IsVisible = visible;
+    }
+    
+    private void DefaultButtonsClose(object sender, RoutedEventArgs args)
+    {
+        if (sender is Button button)
+        {
+            if (button == _okButton)
+            {
+                OnDialogControlClosing(this, DialogResult.OK);
+            }
+            else if (button == _cancelButton)
+            {
+                OnDialogControlClosing(this, DialogResult.Cancel);
+            }
+            else if (button == _yesButton)
+            {
+                OnDialogControlClosing(this, DialogResult.Yes);
+            }
+            else if (button == _noButton)
+            {
+                OnDialogControlClosing(this, DialogResult.No);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
new file mode 100644
index 0000000..62e4e76
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
@@ -0,0 +1,125 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Ursa.Common;
+
+namespace Ursa.Controls;
+
+[TemplatePart(PART_YesButton, typeof(Button))]
+[TemplatePart(PART_NoButton, typeof(Button))]
+[TemplatePart(PART_OKButton, typeof(Button))]
+[TemplatePart(PART_CancelButton, typeof(Button))]
+public class DefaultDialogWindow: DialogWindow
+{
+    protected override Type StyleKeyOverride { get; } = typeof(DefaultDialogWindow);
+    
+    public const string PART_YesButton = "PART_YesButton";
+    public const string PART_NoButton = "PART_NoButton";
+    public const string PART_OKButton = "PART_OKButton";
+    public const string PART_CancelButton = "PART_CancelButton";
+    
+    private Button? _yesButton;
+    private Button? _noButton;
+    private Button? _okButton;
+    private Button? _cancelButton;
+
+    public static readonly StyledProperty<DialogButton> ButtonsProperty = AvaloniaProperty.Register<DefaultDialogWindow, DialogButton>(
+        nameof(Buttons));
+
+    public DialogButton Buttons
+    {
+        get => GetValue(ButtonsProperty);
+        set => SetValue(ButtonsProperty, value);
+    }
+
+    public new static readonly StyledProperty<DialogIcon> IconProperty = AvaloniaProperty.Register<DefaultDialogWindow, DialogIcon>(
+        nameof(Icon));
+
+    public new DialogIcon Icon
+    {
+        get => GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+    
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        EventHelper.UnregisterClickEvent(OnDefaultClose, _okButton, _cancelButton, _yesButton, _noButton);
+        
+        _okButton = e.NameScope.Find<Button>(PART_OKButton);
+        _cancelButton = e.NameScope.Find<Button>(PART_CancelButton);
+        _yesButton = e.NameScope.Find<Button>(PART_YesButton);
+        _noButton = e.NameScope.Find<Button>(PART_NoButton);
+        
+        EventHelper.RegisterClickEvent(OnDefaultClose, _yesButton, _noButton, _okButton, _cancelButton);
+        SetButtonVisibility();
+    }
+
+    private void OnDefaultClose(object sender, RoutedEventArgs e)
+    {
+        if (sender == _yesButton)
+        {
+            Close(DialogResult.Yes);
+            return;
+        }
+        if(sender == _noButton)
+        {
+            Close(DialogResult.No);
+            return;
+        }
+        if(sender == _okButton)
+        {
+            Close(DialogResult.OK);
+            return;
+        }
+        if(sender == _cancelButton)
+        {
+            Close(DialogResult.Cancel);
+            return;
+        }
+    }
+
+    private void SetButtonVisibility()
+    {
+        switch (Buttons)
+        {
+            case DialogButton.None:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case DialogButton.OK:
+                SetVisibility(_okButton, true);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case DialogButton.OKCancel:
+                SetVisibility(_okButton, true);
+                SetVisibility(_cancelButton, true);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case DialogButton.YesNo:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, true);
+                SetVisibility(_noButton, true);
+                break;
+            case DialogButton.YesNoCancel:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, true);
+                SetVisibility(_yesButton, true);
+                SetVisibility(_noButton, true);
+                break;
+        }
+    }
+    
+    private void SetVisibility(Button? button, bool visible)
+    {
+        if (button is not null) button.IsVisible = visible;
+    }
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/Dialog.cs b/src/Ursa/Controls/Dialog/Dialog.cs
index ed63a58..2d5bb3b 100644
--- a/src/Ursa/Controls/Dialog/Dialog.cs
+++ b/src/Ursa/Controls/Dialog/Dialog.cs
@@ -3,79 +3,162 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Shapes;
 using Avalonia.Media;
+using Ursa.Common;
 
 namespace Ursa.Controls;
 
 public static class Dialog
 {
-    public static async Task<TResult?> ShowModalAsync<TView, TViewModel, TResult>(TViewModel vm) 
+    /// <summary>
+    /// Show a Window Modal Dialog that with all content fully customized. 
+    /// </summary>
+    /// <param name="vm"></param>
+    /// <typeparam name="TView"></typeparam>
+    /// <typeparam name="TViewModel"></typeparam>
+    /// <typeparam name="TResult"></typeparam>
+    /// <returns></returns>
+    public static async Task<TResult?> ShowCustomModalAsync<TView, TViewModel, TResult>(TViewModel vm) 
         where TView : Control, new()
     {
-
-        var lifetime = Application.Current?.ApplicationLifetime;
-        if (lifetime is IClassicDesktopStyleApplicationLifetime classLifetime)
-        {
-            var window = new DialogWindow
-            {
-                Content = new TView { DataContext = vm },
-                DataContext = vm,
-            };
-            if (classLifetime.MainWindow is not { } main)
-            {
-                window.Show();
-                return default;
-            }
-            var result = await window.ShowDialog<TResult>(main);
-            return result;
-        }
-
-        return default(TResult);
+        var mainWindow = GetMainWindow();
+        return await ShowCustomModalAsync<TView, TViewModel, TResult>(mainWindow, vm);
     }
     
-    public static async Task<TResult> ShowModalAsync<TView, TViewModel, TResult>(Window owner, TViewModel? vm) 
+    
+    /// <summary>
+    /// Show a Window Modal Dialog that with all content fully customized. And the owner of the dialog is specified.
+    /// </summary>
+    /// <param name="owner"></param>
+    /// <param name="vm"></param>
+    /// <typeparam name="TView"></typeparam>
+    /// <typeparam name="TViewModel"></typeparam>
+    /// <typeparam name="TResult"></typeparam>
+    /// <returns></returns>
+    public static async Task<TResult> ShowCustomModalAsync<TView, TViewModel, TResult>(Window? owner, TViewModel? vm) 
         where TView: Control, new()
     {
         var window = new DialogWindow
         {
-            Content = new TView() { DataContext = vm },
-            DataContext = vm
+            Content = new TView { DataContext = vm },
+            DataContext = vm,
         };
-        return await window.ShowDialog<TResult>(owner);
+        if (owner is null)
+        {
+            window.Show();
+            return default;
+        }
+        else
+        {
+            var result = await window.ShowDialog<TResult>(owner);
+            return result;
+        }
+    }
+    
+    public static async Task<DialogResult> ShowModalAsync<TView, TViewModel>(
+        Window? owner, 
+        TViewModel vm, 
+        string? title = null, 
+        DialogIcon icon = DialogIcon.None, 
+        DialogButton buttons = DialogButton.OKCancel)
+        where TView : Control, new()
+    {
+        var window = new DefaultDialogWindow()
+        {
+            Content = new TView() { DataContext = vm },
+            DataContext = vm,
+            Buttons = buttons,
+            Title = title,
+            Icon = icon,
+        };
+        if (owner is null)
+        {
+            window.Show();
+            return DialogResult.None;
+        }
+        else
+        {
+            var result = await window.ShowDialog<DialogResult>(owner);
+            return result;
+        }
+    }
+    
+    public static async Task<DialogResult> ShowModalAsync<TView, TViewModel>(
+        TViewModel vm, 
+        string? title = null, 
+        DialogIcon icon = DialogIcon.None, 
+        DialogButton buttons = DialogButton.OKCancel)
+        where TView: Control, new()
+    {
+        var mainWindow = GetMainWindow();
+        return await ShowModalAsync<TView, TViewModel>(mainWindow, vm, title, icon, buttons);
+    }
+    
+    private static Window? GetMainWindow()
+    {
+        var lifetime = Application.Current?.ApplicationLifetime;
+        return lifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } w } ? w : null;
     }
 }
 
 public static class OverlayDialog
 {
-    public static Task<TResult> ShowModalAsync<TView, TViewModel, TResult>(TViewModel vm, string? hostId = null)
+    public static Task<DialogResult> ShowModalAsync<TView, TViewModel>(
+        TViewModel vm, 
+        string? hostId = null, 
+        string? title = null,
+        DialogIcon icon = DialogIcon.None,
+        DialogButton buttons = DialogButton.OKCancel)
         where TView : Control, new()
     {
-        var t = new DialogControl()
+        var t = new DefaultDialogControl()
         {
             Content = new TView(){ DataContext = vm },
             DataContext = vm,
+            Buttons = buttons,
+            Title = title,
+            Icon = icon,
         };
         var host = OverlayDialogManager.GetHost(hostId);
         host?.AddModalDialog(t);
-        return t.ShowAsync<TResult>();
+        return t.ShowAsync<DialogResult>();
     }
 
-    public static Task<TResult> ShowModalAsync<TView, TViewModel, TResult>(TViewModel vm, DialogOptions options, string? hostId = null)
-        where TView : Control, new()
+    public static Task<TResult> ShowCustomModalAsync<TView, TViewModel, TResult>(
+        TViewModel vm, 
+        string? hostId = null)
+        where TView: Control, new()
     {
         var t = new DialogControl()
         {
             Content = new TView() { DataContext = vm },
             DataContext = vm,
-            ExtendToClientArea = options.ExtendToClientArea,
-            Title = options.Title,
-            Buttons = options.DefaultButtons,
         };
         var host = OverlayDialogManager.GetHost(hostId);
         host?.AddModalDialog(t);
         return t.ShowAsync<TResult>();
     }
 
-    public static void Show<TView, TViewModel>(TViewModel vm, string? hostId = null)
+    public static void Show<TView, TViewModel>(
+        TViewModel vm, 
+        string? hostId = null, 
+        string? title = null, 
+        DialogIcon icon = DialogIcon.None, 
+        DialogButton buttons = DialogButton.OKCancel)
+        where TView: Control, new()
+    {
+        var t = new DefaultDialogControl()
+        {
+            Content = new TView() { DataContext = vm },
+            DataContext = vm,
+            Buttons = buttons,
+            Title = title,
+            Icon = icon,
+        };
+        var host = OverlayDialogManager.GetHost(hostId);
+        host?.AddDialog(t);
+    }
+
+    public static void ShowCustom<TView, TViewModel>(TViewModel vm, string? hostId = null)
         where TView: Control, new()
     {
         var t = new DialogControl()
@@ -86,19 +169,5 @@ public static class OverlayDialog
         var host = OverlayDialogManager.GetHost(hostId);
         host?.AddDialog(t);
     }
-
-    public static void Show<TView, TViewModel>(TViewModel vm, DialogOptions options, string? hostId)
-        where TView: Control, new()
-    {
-        var t = new DialogControl()
-        {
-            Content = new TView() { DataContext = vm },
-            DataContext = vm,
-            ExtendToClientArea = options.ExtendToClientArea,
-            Title = options.Title,
-            Buttons = options.DefaultButtons,
-        };
-        var host = OverlayDialogManager.GetHost(hostId);
-        host?.AddModalDialog(t);
-    }
+    
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index bbdb8a0..ca3e93c 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -1,4 +1,4 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
@@ -9,57 +9,22 @@ using Ursa.Common;
 namespace Ursa.Controls;
 
 [TemplatePart(PART_CloseButton, typeof(Button))]
-[TemplatePart(PART_OKButton, typeof(Button))]
-[TemplatePart(PART_CancelButton, typeof(Button))]
-[TemplatePart(PART_YesButton, typeof(Button))]
-[TemplatePart(PART_NoButton, typeof(Button))]
 [TemplatePart(PART_TitleArea, typeof(Panel))]
-[PseudoClasses(PC_ExtendClientArea)]
+[PseudoClasses(PC_Modal)]
 public class DialogControl: ContentControl
 {
     public const string PART_CloseButton = "PART_CloseButton";
-    public const string PART_OKButton = "PART_OKButton";
-    public const string PART_CancelButton = "PART_CancelButton";
-    public const string PART_YesButton = "PART_YesButton";
-    public const string PART_NoButton = "PART_NoButton";
-    
     public const string PART_TitleArea = "PART_TitleArea";
-    public const string PC_ExtendClientArea = ":extend";
     public const string PC_Modal = ":modal";
     
     private Button? _closeButton;
-    private Button? _okButton;
-    private Button? _cancelButton;
-    private Button? _yesButton;
-    private Button? _noButton;
     private Panel? _titleArea;
-    public event EventHandler<object?>? OnDialogControlClose;
-    public event EventHandler<DialogLayerChangeEventArgs>? OnLayerChange;
-
-    public static readonly StyledProperty<string?> TitleProperty = AvaloniaProperty.Register<DialogControl, string?>(
-        nameof(Title));
-
-    public string? Title
-    {
-        get => GetValue(TitleProperty);
-        set => SetValue(TitleProperty, value);
-    }
-
-    public static readonly StyledProperty<bool> ExtendToClientAreaProperty = AvaloniaProperty.Register<DialogControl, bool>(
-        nameof(ExtendToClientArea));
-
-    public bool ExtendToClientArea
-    {
-        get => GetValue(ExtendToClientAreaProperty);
-        set => SetValue(ExtendToClientAreaProperty, value);
-    }
-
-    internal DialogButton Buttons { get; set; }
+    public event EventHandler<DialogLayerChangeEventArgs>? LayerChanged;
+    public event EventHandler<object?>? DialogControlClosing;
 
     static DialogControl()
     {
         DataContextProperty.Changed.AddClassHandler<DialogControl, object?>((o, e) => o.OnDataContextChange(e));
-        ExtendToClientAreaProperty.Changed.AddClassHandler<DialogControl, bool>((o, e) => o.PseudoClasses.Set(PC_ExtendClientArea, e.NewValue.Value));
     }
 
     private void OnDataContextChange(AvaloniaPropertyChangedEventArgs<object?> args)
@@ -79,81 +44,18 @@ public class DialogControl: ContentControl
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        UnRegisterClickEvent(Close, _closeButton);
-        UnRegisterClickEvent(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
+        EventHelper.UnregisterClickEvent(Close, _closeButton);
+
         _titleArea?.RemoveHandler(PointerMovedEvent, OnTitlePointerMove);
         _titleArea?.RemoveHandler(PointerPressedEvent, OnTitlePointerPressed);
         
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
         _titleArea = e.NameScope.Find<Panel>(PART_TitleArea);
-        _okButton = e.NameScope.Find<Button>(PART_OKButton);
-        _cancelButton = e.NameScope.Find<Button>(PART_CancelButton);
-        _yesButton = e.NameScope.Find<Button>(PART_YesButton);
-        _noButton = e.NameScope.Find<Button>(PART_NoButton);
+
         
         _titleArea?.AddHandler(PointerMovedEvent, OnTitlePointerMove, RoutingStrategies.Bubble);
         _titleArea?.AddHandler(PointerPressedEvent, OnTitlePointerPressed, RoutingStrategies.Bubble);
-        RegisterClickEvent(Close, _closeButton);
-        RegisterClickEvent(DefaultButtonsClose, _yesButton, _noButton, _okButton, _cancelButton);
-        SetButtonVisibility();
-    }
-
-    private void UnRegisterClickEvent(EventHandler<RoutedEventArgs> action, params Button?[] buttons)
-    {
-        foreach (var button in buttons)
-        {
-            if(button is not null) button.Click -= action;
-        }
-    }
-    
-    private void RegisterClickEvent(EventHandler<RoutedEventArgs> action, params Button?[] buttons)
-    {
-        foreach (var button in buttons)
-        {
-            if(button is not null) button.Click += action;
-        }
-    }
-
-    private void SetButtonVisibility()
-    {
-        switch (Buttons)
-        {
-            case DialogButton.None:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
-                break;
-            case DialogButton.OK:
-                SetVisibility(_okButton, true);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
-                break;
-            case DialogButton.OKCancel:
-                SetVisibility(_okButton, true);
-                SetVisibility(_cancelButton, true);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
-                break;
-            case DialogButton.YesNo:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, true);
-                SetVisibility(_noButton, true);
-                break;
-            case DialogButton.YesNoCancel:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, true);
-                SetVisibility(_yesButton, true);
-                SetVisibility(_noButton, true);
-                break;
-        }
-    }
-
-    private void SetVisibility(Button? button, bool visible)
-    {
-        if (button is not null) button.IsVisible = visible;
+        EventHelper.RegisterClickEvent(Close, _closeButton);
     }
     
     private void OnTitlePointerPressed(object sender, PointerPressedEventArgs e)
@@ -170,22 +72,21 @@ public class DialogControl: ContentControl
     public Task<T> ShowAsync<T>()
     {
         var tcs = new TaskCompletionSource<T>();
-        PseudoClasses.Set(PC_Modal, true);
         void OnCloseHandler(object sender, object? args)
         {
             if (args is T result)
             {
                 tcs.SetResult(result);
-                OnDialogControlClose-= OnCloseHandler;
+                DialogControlClosing-= OnCloseHandler;
             }
             else
             {
                 tcs.SetResult(default(T));
-                OnDialogControlClose-= OnCloseHandler;
+                DialogControlClosing-= OnCloseHandler;
             }
         }
 
-        this.OnDialogControlClose += OnCloseHandler;
+        this.DialogControlClosing += OnCloseHandler;
         return tcs.Task;
     }
     
@@ -193,12 +94,11 @@ public class DialogControl: ContentControl
     {
         if (this.DataContext is IDialogContext context)
         {
-            OnDialogControlClose?.Invoke(this, context.DefaultCloseResult);
+            context.Close();
         }
-        
         else
         {
-            OnDialogControlClose?.Invoke(this, null);
+            DialogControlClosing?.Invoke(this, DialogResult.None);
         }
     }
 
@@ -206,38 +106,26 @@ public class DialogControl: ContentControl
     {
         if (this.DataContext is IDialogContext context)
         {
-            OnDialogControlClose?.Invoke(this, args);
-        }
-    }
-
-    private void DefaultButtonsClose(object sender, RoutedEventArgs args)
-    {
-        if (sender is Button button)
-        {
-            if (button == _okButton)
-            {
-                OnDialogControlClose?.Invoke(this, DialogResult.OK);
-            }
-            else if (button == _cancelButton)
-            {
-                OnDialogControlClose?.Invoke(this, DialogResult.Cancel);
-            }
-            else if (button == _yesButton)
-            {
-                OnDialogControlClose?.Invoke(this, DialogResult.Yes);
-            }
-            else if (button == _noButton)
-            {
-                OnDialogControlClose?.Invoke(this, DialogResult.No);
-            }
+            DialogControlClosing?.Invoke(this, args);
         }
     }
+    
 
     public void UpdateLayer(object? o)
     {
         if (o is DialogLayerChangeType t)
         {
-            OnLayerChange?.Invoke(this, new DialogLayerChangeEventArgs(t));
+            LayerChanged?.Invoke(this, new DialogLayerChangeEventArgs(t));
         }
     }
+    
+    protected virtual void OnDialogControlClosing(object sender, object? args)
+    {
+        DialogControlClosing?.Invoke(this, args);
+    }
+
+    internal void SetAsModal(bool modal)
+    {
+        PseudoClasses.Set(PC_Modal, modal);
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogIcon.cs b/src/Ursa/Controls/Dialog/DialogIcon.cs
new file mode 100644
index 0000000..21380a1
--- /dev/null
+++ b/src/Ursa/Controls/Dialog/DialogIcon.cs
@@ -0,0 +1,11 @@
+namespace Ursa.Controls;
+
+public enum DialogIcon
+{
+    Info,
+    Warning,
+    Error,
+    Question,
+    None,
+    Success,
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogOptions.cs b/src/Ursa/Controls/Dialog/DialogOptions.cs
deleted file mode 100644
index 86a5607..0000000
--- a/src/Ursa/Controls/Dialog/DialogOptions.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Ursa.Common;
-
-namespace Ursa.Controls;
-
-public record DialogOptions
-{
-    public bool ShowCloseButton { get; set; } = true;
-    public string? Title { get; set; }
-    public bool ExtendToClientArea { get; set; } = false;
-    public DialogButton DefaultButtons { get; set; } = DialogButton.None;
-}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
index 52afb46..c3313a2 100644
--- a/src/Ursa/Controls/Dialog/DialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Ursa.Common;
 
 namespace Ursa.Controls;
 
@@ -25,27 +26,24 @@ public class DialogWindow: Window
     {
         if (args.OldValue.Value is IDialogContext oldContext)
         {
-            oldContext.Closed-= OnDialogClose;
+            oldContext.Closed-= OnDialogContextClose;
         }
 
         if (args.NewValue.Value is IDialogContext newContext)
         {
-            newContext.Closed += OnDialogClose;
+            newContext.Closed += OnDialogContextClose;
         }
     }
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
+        EventHelper.UnregisterClickEvent(OnDefaultClose, _closeButton);
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
-        
-        if (_closeButton != null)
-        {
-            _closeButton.Click += OnDefaultClose;
-        }
+        EventHelper.RegisterClickEvent(OnDefaultClose, _closeButton);
     }
 
-    private void OnDialogClose(object? sender, object? args)
+    private void OnDialogContextClose(object? sender, object? args)
     {
         Close(args);
     }
@@ -54,7 +52,7 @@ public class DialogWindow: Window
     {
         if (DataContext is IDialogContext context)
         {
-            Close(context.DefaultCloseResult);
+            context.Close();
         }
         else
         {
diff --git a/src/Ursa/Controls/Dialog/IDialogContext.cs b/src/Ursa/Controls/Dialog/IDialogContext.cs
index a05bc62..84fc8f7 100644
--- a/src/Ursa/Controls/Dialog/IDialogContext.cs
+++ b/src/Ursa/Controls/Dialog/IDialogContext.cs
@@ -2,6 +2,6 @@ namespace Ursa.Controls;
 
 public interface IDialogContext
 {
-    object? DefaultCloseResult { get; set; }
+    void Close();
     event EventHandler<object?> Closed;
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 15a2ffb..5b98590 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -11,7 +11,7 @@ namespace Ursa.Controls;
 public class OverlayDialogHost : Canvas
 {
     private readonly List<DialogControl> _dialogs = new();
-    private readonly List<DialogControl> _modalDialogs = new();
+    private readonly List<DialogControl> _modalDialogs = new(); 
     private readonly List<Border> _masks = new();
 
     public string? HostId { get; set; }
@@ -63,7 +63,7 @@ public class OverlayDialogHost : Canvas
     protected override void OnPointerMoved(PointerEventArgs e)
     {
         base.OnPointerMoved(e);
-        if (e.Source is DialogControl item)
+        if (e.Source is DefaultDialogControl item)
         {
             if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
@@ -94,18 +94,18 @@ public class OverlayDialogHost : Canvas
         control.Measure(this.Bounds.Size);
         control.Arrange(new Rect(control.DesiredSize));
         SetToCenter(control);
-        control.OnDialogControlClose += OnDialogControlDialogClose;
-        control.OnLayerChange += OnDialogLayerChange;
+        control.DialogControlClosing += OnDialogControlClosing;
+        control.LayerChanged += OnDialogLayerChanged;
         ResetZIndices();
     }
 
-    private void OnDialogControlDialogClose(object sender, object? e)
+    private void OnDialogControlClosing(object sender, object? e)
     {
         if (sender is DialogControl control)
         {
             this.Children.Remove(control);
-            control.OnDialogControlClose -= OnDialogControlDialogClose;
-            control.OnLayerChange -= OnDialogLayerChange;
+            control.DialogControlClosing -= OnDialogControlClosing;
+            control.LayerChanged -= OnDialogLayerChanged;
             if (_dialogs.Contains(control))
             {
                 _dialogs.Remove(control);
@@ -137,6 +137,7 @@ public class OverlayDialogHost : Canvas
         var mask = CreateOverlayMask();
         _masks.Add(mask);
         _modalDialogs.Add(control);
+        control.SetAsModal(true);
         for (int i = 0; i < _masks.Count-1; i++)
         {
             _masks[i].Opacity = 0.5;
@@ -147,14 +148,14 @@ public class OverlayDialogHost : Canvas
         control.Measure(this.Bounds.Size);
         control.Arrange(new Rect(control.DesiredSize));
         SetToCenter(control);
-        control.OnDialogControlClose += OnDialogControlDialogClose;
-        control.OnLayerChange += OnDialogLayerChange;
+        control.DialogControlClosing += OnDialogControlClosing;
+        control.LayerChanged += OnDialogLayerChanged;
     }
 
     // Handle dialog layer change event
-    private void OnDialogLayerChange(object sender, DialogLayerChangeEventArgs e)
+    private void OnDialogLayerChanged(object sender, DialogLayerChangeEventArgs e)
     {
-        if (sender is not DialogControl control)
+        if (sender is not DefaultDialogControl control)
             return;
         if (!_dialogs.Contains(control))
             return;

From 87bb47b4e14871e0effe7af74c241d276b5f03a9 Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Thu, 25 Jan 2024 13:19:48 +0800
Subject: [PATCH 21/28] feat: introduce class helper here.

---
 demo/Ursa.Demo/Dialogs/PlainDialog.axaml      |   4 +-
 src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs |  24 ++++
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 128 +++++++++++++++---
 ...essageBoxWindow.axaml => MessageBox.axaml} |   0
 src/Ursa.Themes.Semi/Controls/_index.axaml    |   2 +-
 5 files changed, 136 insertions(+), 22 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs
 rename src/Ursa.Themes.Semi/Controls/{MessageBoxWindow.axaml => MessageBox.axaml} (100%)

diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
index f5688f2..787fd92 100644
--- a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
+++ b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
@@ -3,8 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             Padding="24"
+             Background="Aqua"
              x:Class="Ursa.Demo.Dialogs.PlainDialog">
-    <StackPanel Margin="8">
+    <StackPanel>
         <Calendar SelectedDate="{Binding Date}" ></Calendar>
     </StackPanel>
 </UserControl>
diff --git a/src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs b/src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs
new file mode 100644
index 0000000..002c71f
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs
@@ -0,0 +1,24 @@
+using Avalonia;
+
+namespace Ursa.Themes.Semi;
+
+internal class ClassHelper: AvaloniaObject
+{
+    static ClassHelper()
+    {
+        ClassesProperty.Changed.AddClassHandler<StyledElement>(OnClassesChanged);
+    }
+    
+    public static readonly AttachedProperty<string> ClassesProperty =
+        AvaloniaProperty.RegisterAttached<ClassHelper, StyledElement, string>("Classes");
+
+    public static void SetClasses(AvaloniaObject obj, string value) => obj.SetValue(ClassesProperty, value);
+    public static string GetClasses(AvaloniaObject obj) => obj.GetValue(ClassesProperty);
+    
+    private static void OnClassesChanged(StyledElement sender, AvaloniaPropertyChangedEventArgs value)
+    {
+        IEnumerable<string> classes = value.GetNewValue<IEnumerable<string>>();
+        sender.Classes.Clear();
+        sender.Classes.AddRange(classes);
+    }
+}
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 0d0b285..ae173cc 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -1,12 +1,14 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:theme="clr-namespace:Ursa.Themes.Semi"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
+    
     <ControlTheme x:Key="{x:Type u:OverlayDialogHost}" TargetType="u:OverlayDialogHost">
         <Setter Property="OverlayMaskBrush" Value="{DynamicResource OverlayDialogMaskBrush}" />
     </ControlTheme>
     <ControlTheme x:Key="{x:Type u:DialogControl}" TargetType="u:DialogControl">
+        <Setter Property="CornerRadius" Value="12"></Setter>
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DialogControl">
                 <Border
@@ -14,7 +16,8 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Classes="Shadow"
-                    CornerRadius="12"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    ClipToBounds="True"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
                     <Grid RowDefinitions="Auto, *">
@@ -92,6 +95,7 @@
         </Style>
     </ControlTheme>
     <ControlTheme x:Key="{x:Type u:DefaultDialogControl}" TargetType="u:DefaultDialogControl">
+        <Setter Property="CornerRadius" Value="12"></Setter>
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DefaultDialogControl">
                 <Border
@@ -99,7 +103,8 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Classes="Shadow"
-                    CornerRadius="12"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    ClipToBounds="True"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
                     <Grid Margin="24" RowDefinitions="Auto, *, Auto">
@@ -107,23 +112,29 @@
                             Name="PART_ContentPresenter"
                             Grid.Row="1"
                             Content="{TemplateBinding Content}" />
-                        <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
                             <Panel
                                 Name="{x:Static u:DialogControl.PART_TitleArea}"
                                 Grid.Column="0"
-                                Grid.ColumnSpan="2"
+                                Grid.ColumnSpan="3"
                                 Background="Transparent" />
-                            <TextBlock
+                            <PathIcon
+                                Name="PART_Icon"
                                 Grid.Column="0"
+                                Margin="0 0 8 0"
+                                Width="16"
+                                Height="16" />
+                            <TextBlock
+                                Grid.Column="1"
                                 Margin="8,8,0,0"
                                 Classes="Strong"
-                                DockPanel.Dock="Left"
+                                TextWrapping="Wrap"
                                 IsVisible="{TemplateBinding Title,
                                                             Converter={x:Static ObjectConverters.IsNotNull}}"
                                 Text="{TemplateBinding Title}" />
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="1"
+                                Grid.Column="2"
                                 Margin="0,4,4,0"
                                 DockPanel.Dock="Right"
                                 Theme="{DynamicResource CloseButton}" />
@@ -137,27 +148,47 @@
                                 Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
                                 Margin="8,0,0,0"
                                 Classes="Tertiary"
-                                Content="Cancel" />
+                                Content="取消" />
                             <Button
                                 Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
                                 Margin="8,0,0,0"
                                 Classes="Danger"
-                                Content="No" />
+                                Content="否" />
                             <Button
                                 Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Content="Yes" />
+                                Theme="{DynamicResource SolidButton}"
+                                Content="是" />
                             <Button
                                 Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Content="OK" />
+                                Theme="{DynamicResource SolidButton}"
+                                Content="确认" />
                         </StackPanel>
                     </Grid>
                 </Border>
             </ControlTemplate>
         </Setter>
+        <Style Selector="^[Icon=None]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="False"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^[Icon=Info]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+        </Style>
+
         <Style Selector="^:not(:modal) /template/ Panel#PART_TitleArea">
             <Setter Property="ContextFlyout">
                 <MenuFlyout>
@@ -211,6 +242,63 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type u:DialogWindow}" TargetType="u:DialogWindow">
+        <Setter Property="Title" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
+        <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
+        <Setter Property="Padding" Value="48 24" />
+        <Setter Property="SizeToContent" Value="WidthAndHeight" />
+        <Setter Property="WindowStartupLocation" Value="CenterOwner" />
+        <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="1" />
+        <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
+        <Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome" />
+        <Setter Property="SystemDecorations">
+            <OnPlatform>
+                <OnPlatform.Windows>
+                    <SystemDecorations>Full</SystemDecorations>
+                </OnPlatform.Windows>
+                <OnPlatform.Default>
+                    <SystemDecorations>BorderOnly</SystemDecorations>
+                </OnPlatform.Default>
+            </OnPlatform>
+        </Setter>
+        <Setter Property="CanResize" Value="False" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:DialogWindow">
+                <Panel>
+                    <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+                    <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
+                    <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
+                    <ChromeOverlayLayer />
+                    <Grid RowDefinitions="Auto, *">
+                        <ContentPresenter
+                            Grid.Row="0"
+                            Grid.RowSpan="2"
+                            Content="{TemplateBinding Content}" />
+                        <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="8,8,0,0"
+                                FontSize="14"
+                                FontWeight="Bold"
+                                Text="{TemplateBinding Title}"
+                                TextTrimming="CharacterEllipsis"
+                                TextWrapping="NoWrap" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                Grid.Column="1"
+                                Margin="0,24,24,0"
+                                Theme="{DynamicResource CloseButton}" />
+                        </Grid>
+                    </Grid>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:DefaultDialogWindow}" TargetType="u:DefaultDialogWindow">
         <Setter Property="Title" Value="{x:Null}" />
         <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
@@ -267,25 +355,25 @@
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">
                             <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
+                                Name="{x:Static u:DefaultDialogWindow.PART_CancelButton}"
                                 Margin="8,0,0,0"
                                 Classes="Tertiary"
-                                Content="Cancel" />
+                                Content="取消" />
                             <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
+                                Name="{x:Static u:DefaultDialogWindow.PART_NoButton}"
                                 Margin="8,0,0,0"
                                 Classes="Danger"
-                                Content="No" />
+                                Content="否" />
                             <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
+                                Name="{x:Static u:DefaultDialogWindow.PART_YesButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Content="Yes" />
+                                Content="是" />
                             <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
+                                Name="{x:Static u:DefaultDialogWindow.PART_OKButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Content="OK" />
+                                Content="确认" />
                         </StackPanel>
                     </Grid>
                 </Panel>
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
similarity index 100%
rename from src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml
rename to src/Ursa.Themes.Semi/Controls/MessageBox.axaml
diff --git a/src/Ursa.Themes.Semi/Controls/_index.axaml b/src/Ursa.Themes.Semi/Controls/_index.axaml
index 53bd125..03b88dc 100644
--- a/src/Ursa.Themes.Semi/Controls/_index.axaml
+++ b/src/Ursa.Themes.Semi/Controls/_index.axaml
@@ -13,7 +13,7 @@
         <ResourceInclude Source="IPv4Box.axaml" />
         <ResourceInclude Source="KeyGestureInput.axaml" />
         <ResourceInclude Source="Loading.axaml" />
-        <ResourceInclude Source="MessageBoxWindow.axaml" />
+        <ResourceInclude Source="MessageBox.axaml" />
         <ResourceInclude Source="Navigation.axaml" />
         <ResourceInclude Source="NumericUpDown.axaml" />
         <ResourceInclude Source="Pagination.axaml" />

From 20f723b445c139017dbc82df77310ab4b0f202ee Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 25 Jan 2024 15:06:39 +0800
Subject: [PATCH 22/28] feat: implement default control and window mode.

---
 demo/Ursa.Demo/Dialogs/PlainDialog.axaml      |   2 -
 demo/Ursa.Demo/Pages/DialogDemo.axaml         |   4 +-
 .../ViewModels/DialogDemoViewModel.cs         |  26 +-
 src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs |   4 +-
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 305 ++++++++++++++++--
 .../Controls/MessageBox.axaml                 |  12 +-
 .../Themes/Shared/DialogShared.axaml          |   8 +
 .../Themes/Shared/MessageBox.axaml            |   3 +
 .../Themes/Shared/MessageBoxWindow.axaml      |  10 -
 .../Themes/Shared/_index.axaml                |   3 +-
 .../Controls/Dialog/DefaultDialogControl.cs   |  10 +-
 .../Controls/Dialog/DefaultDialogWindow.cs    |  10 +-
 src/Ursa/Controls/Dialog/Dialog.cs            |  16 +-
 .../Dialog/{DialogIcon.cs => DialogMode.cs}   |   2 +-
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs |   4 +-
 15 files changed, 331 insertions(+), 88 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/Shared/DialogShared.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Shared/MessageBox.axaml
 delete mode 100644 src/Ursa.Themes.Semi/Themes/Shared/MessageBoxWindow.axaml
 rename src/Ursa/Controls/Dialog/{DialogIcon.cs => DialogMode.cs} (81%)

diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
index 787fd92..2f0565e 100644
--- a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
+++ b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
@@ -3,8 +3,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             Padding="24"
-             Background="Aqua"
              x:Class="Ursa.Demo.Dialogs.PlainDialog">
     <StackPanel>
         <Calendar SelectedDate="{Binding Date}" ></Calendar>
diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 4fc535a..d6ddd48 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -21,11 +21,11 @@
                 <Run Text="Date: "></Run>
                 <Run Text="{Binding DialogViewModel.Date}"></Run>
             </TextBlock>
-            <Button Command="{Binding ShowGlobalModalDialogCommand}">Show Modal Dialog</Button>
+            <Button Command="{Binding ShowDefaultWindowCommand}">Show Default Modal Dialog</Button>
+            <Button Command="{Binding ShowGlobalModalDialogCommand}">Show Custom Modal Dialog</Button>
             <Button Command="{Binding ShowLocalOverlayModalDialogCommand}">Show Local Overlay Modal Dialog</Button>
             <Button Command="{Binding ShowGlobalOverlayModalDialogCommand}"> Show Global Overlay Modal Dialog </Button>
             <Button Command="{Binding ShowGlobalOverlayDialogCommand}">Show Global Overlay Dialog</Button>
-            <Button Command="{Binding ShowPlainGlobalOverlayDialogCommand}">Default Buttons</Button>
         </StackPanel>
         <Grid Grid.Column="1">
             <Button
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 55dc3ae..ec6126f 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -16,7 +16,7 @@ public class DialogDemoViewModel: ObservableObject
     public ICommand ShowGlobalOverlayModalDialogCommand { get; }
     public ICommand ShowGlobalModalDialogCommand { get; }
     public ICommand ShowGlobalOverlayDialogCommand { get; }
-    public ICommand ShowPlainGlobalOverlayDialogCommand { get; }
+    public ICommand ShowDefaultWindowCommand { get; }
 
     private object? _result;
     public object? Result
@@ -41,12 +41,20 @@ public class DialogDemoViewModel: ObservableObject
         ShowGlobalOverlayModalDialogCommand = new AsyncRelayCommand(ShowGlobalOverlayModalDialog);
         ShowGlobalModalDialogCommand = new AsyncRelayCommand(ShowGlobalModalDialog);
         ShowGlobalOverlayDialogCommand = new RelayCommand(ShowGlobalOverlayDialog);
-        ShowPlainGlobalOverlayDialogCommand = new AsyncRelayCommand(ShowPlainGlobalOverlayDialog);
+        ShowDefaultWindowCommand = new AsyncRelayCommand(ShowDefaultWindow);
+    }
+
+    private async Task ShowDefaultWindow()
+    {
+        var result = await Dialog.ShowModalAsync<PlainDialog, PlainDialogViewModel>(new PlainDialogViewModel(),
+            mode: DialogMode.Error, buttons: DialogButton.OKCancel, title:"确定取消预约吗？");
+        Result = result;
+        return;
     }
 
     private void ShowGlobalOverlayDialog()
     {
-        OverlayDialog.Show<DialogWithAction, DialogWithActionViewModel>(new DialogWithActionViewModel());
+        OverlayDialog.ShowCustom<DialogWithAction, DialogWithActionViewModel>(new DialogWithActionViewModel());
     }
 
     private async Task ShowGlobalModalDialog()
@@ -57,21 +65,15 @@ public class DialogDemoViewModel: ObservableObject
 
     private async Task ShowGlobalOverlayModalDialog()
     {
-        Result = await OverlayDialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
+        Result = await OverlayDialog.ShowModalAsync<PlainDialog, PlainDialogViewModel>(new PlainDialogViewModel(),
+            title: "Please select a date", mode: DialogMode.Error, buttons: DialogButton.YesNoCancel);
     }
 
     private async Task ShowLocalOverlayModalDialog()
     {
         var vm = new DialogWithActionViewModel();
         var result = await OverlayDialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
-            DialogViewModel, "LocalHost");
+            vm, "LocalHost");
         Result = result;
     }
-    
-    public async Task ShowPlainGlobalOverlayDialog()
-    {
-        var result = await OverlayDialog.ShowCustomModalAsync<PlainDialog, PlainDialogViewModel, object?>(
-            new PlainDialogViewModel(),
-            "LocalHost");
-    }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs b/src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs
index 002c71f..22e11c2 100644
--- a/src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs
+++ b/src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs
@@ -17,8 +17,8 @@ internal class ClassHelper: AvaloniaObject
     
     private static void OnClassesChanged(StyledElement sender, AvaloniaPropertyChangedEventArgs value)
     {
-        IEnumerable<string> classes = value.GetNewValue<IEnumerable<string>>();
+        string classes = value.GetNewValue<string>();
         sender.Classes.Clear();
-        sender.Classes.AddRange(classes);
+        sender.Classes.Add(classes);
     }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index ae173cc..8307975 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -13,6 +13,7 @@
             <ControlTemplate TargetType="u:DialogControl">
                 <Border
                     Padding="0"
+                    Margin="4"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Classes="Shadow"
@@ -47,7 +48,7 @@
             <Setter Property="ContextFlyout">
                 <MenuFlyout>
                     <MenuItem
-                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.BringForward}"
                         Header="Bring Forward">
                         <MenuItem.Icon>
@@ -58,7 +59,7 @@
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem
-                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.BringToFront}"
                         Header="Bring To Front">
                         <MenuItem.Icon>
@@ -69,7 +70,7 @@
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem
-                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.SendBackward}"
                         Header="Send Backward">
                         <MenuItem.Icon>
@@ -80,7 +81,7 @@
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem
-                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.SendToBack}"
                         Header="Send To Back">
                         <MenuItem.Icon>
@@ -94,6 +95,7 @@
             </Setter>
         </Style>
     </ControlTheme>
+    
     <ControlTheme x:Key="{x:Type u:DefaultDialogControl}" TargetType="u:DefaultDialogControl">
         <Setter Property="CornerRadius" Value="12"></Setter>
         <Setter Property="Template">
@@ -107,10 +109,11 @@
                     ClipToBounds="True"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
-                    <Grid Margin="24" RowDefinitions="Auto, *, Auto">
+                    <Grid RowDefinitions="Auto, *, Auto">
                         <ContentPresenter
                             Name="PART_ContentPresenter"
                             Grid.Row="1"
+                            Margin="24 8"
                             Content="{TemplateBinding Content}" />
                         <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
                             <Panel
@@ -121,27 +124,31 @@
                             <PathIcon
                                 Name="PART_Icon"
                                 Grid.Column="0"
-                                Margin="0 0 8 0"
+                                Margin="24 24 8 0"
                                 Width="16"
+                                VerticalAlignment="Center"
                                 Height="16" />
                             <TextBlock
                                 Grid.Column="1"
-                                Margin="8,8,0,0"
-                                Classes="Strong"
+                                Margin="0 24 0 0 "
+                                FontWeight="Bold"
+                                FontSize="16"
                                 TextWrapping="Wrap"
+                                VerticalAlignment="Center"
+                                IsHitTestVisible="False"
                                 IsVisible="{TemplateBinding Title,
                                                             Converter={x:Static ObjectConverters.IsNotNull}}"
                                 Text="{TemplateBinding Title}" />
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
                                 Grid.Column="2"
-                                Margin="0,4,4,0"
+                                Margin="0 24 24 0"
                                 DockPanel.Dock="Right"
                                 Theme="{DynamicResource CloseButton}" />
                         </Grid>
                         <StackPanel
                             Grid.Row="2"
-                            Margin="0,0,8,8"
+                            Margin="24 0 24 24"
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">
                             <Button
@@ -153,6 +160,7 @@
                                 Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
                                 Margin="8,0,0,0"
                                 Classes="Danger"
+                                Theme="{DynamicResource SolidButton}"
                                 Content="否" />
                             <Button
                                 Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
@@ -171,29 +179,127 @@
                 </Border>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^[Icon=None]">
+        <Style Selector="^[Mode=None]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
                 <Setter Property="IsVisible" Value="False"></Setter>
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
                 <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
             </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
         </Style>
-        <Style Selector="^[Icon=Info]">
+        <Style Selector="^[Mode=Info]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
                 <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}"></Setter>
                 <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
                 <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
             </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Warning]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Error]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Question]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Success]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
         </Style>
 
         <Style Selector="^:not(:modal) /template/ Panel#PART_TitleArea">
             <Setter Property="ContextFlyout">
                 <MenuFlyout>
                     <MenuItem
-                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.BringForward}"
                         Header="Bring Forward">
                         <MenuItem.Icon>
@@ -204,7 +310,7 @@
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem
-                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.BringToFront}"
                         Header="Bring To Front">
                         <MenuItem.Icon>
@@ -215,7 +321,7 @@
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem
-                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.SendBackward}"
                         Header="Send Backward">
                         <MenuItem.Icon>
@@ -226,7 +332,7 @@
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem
-                        Command="{Binding $parent[u:DefaultDialogControl].UpdateLayer}"
+                        Command="{Binding $parent[u:DialogControl].UpdateLayer}"
                         CommandParameter="{x:Static u:DialogLayerChangeType.SendToBack}"
                         Header="Send To Back">
                         <MenuItem.Icon>
@@ -331,53 +437,188 @@
                     <ChromeOverlayLayer />
                     <Grid RowDefinitions="Auto, *, Auto">
                         <ContentPresenter
-                            Grid.Row="0"
-                            Grid.RowSpan="2"
+                            Name="PART_ContentPresenter"
+                            Grid.Row="1"
+                            Margin="24 8"
                             Content="{TemplateBinding Content}" />
-                        <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
-                            <TextBlock
+                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
+                            <Panel
+                                Name="{x:Static u:DialogControl.PART_TitleArea}"
                                 Grid.Column="0"
-                                Margin="8,8,0,0"
-                                FontSize="14"
+                                Grid.ColumnSpan="3"
+                                Background="Transparent" />
+                            <PathIcon
+                                Name="PART_Icon"
+                                Grid.Column="0"
+                                Margin="24 24 8 0"
+                                Width="16"
+                                VerticalAlignment="Center"
+                                Height="16" />
+                            <TextBlock
+                                Grid.Column="1"
+                                Margin="0 24 0 0 "
                                 FontWeight="Bold"
-                                Text="{TemplateBinding Title}"
-                                TextTrimming="CharacterEllipsis"
-                                TextWrapping="NoWrap" />
+                                FontSize="16"
+                                TextWrapping="Wrap"
+                                VerticalAlignment="Center"
+                                IsHitTestVisible="False"
+                                IsVisible="{TemplateBinding Title,
+                                                            Converter={x:Static ObjectConverters.IsNotNull}}"
+                                Text="{TemplateBinding Title}" />
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="1"
-                                Margin="0,4,4,0"
+                                Grid.Column="2"
+                                Margin="0 24 24 0"
+                                DockPanel.Dock="Right"
                                 Theme="{DynamicResource CloseButton}" />
                         </Grid>
                         <StackPanel
                             Grid.Row="2"
-                            Margin="0,0,8,8"
+                            Margin="24 0 24 24"
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">
                             <Button
-                                Name="{x:Static u:DefaultDialogWindow.PART_CancelButton}"
+                                Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
                                 Margin="8,0,0,0"
                                 Classes="Tertiary"
                                 Content="取消" />
                             <Button
-                                Name="{x:Static u:DefaultDialogWindow.PART_NoButton}"
+                                Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
                                 Margin="8,0,0,0"
                                 Classes="Danger"
+                                Theme="{DynamicResource SolidButton}"
                                 Content="否" />
                             <Button
-                                Name="{x:Static u:DefaultDialogWindow.PART_YesButton}"
+                                Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
+                                Theme="{DynamicResource SolidButton}"
                                 Content="是" />
                             <Button
-                                Name="{x:Static u:DefaultDialogWindow.PART_OKButton}"
+                                Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
+                                Theme="{DynamicResource SolidButton}"
                                 Content="确认" />
                         </StackPanel>
                     </Grid>
                 </Panel>
             </ControlTemplate>
         </Setter>
+                <Style Selector="^[Mode=None]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="False"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Info]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Warning]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Error]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Question]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Success]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True"></Setter>
+                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+            </Style>
+        </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index e716b09..3702213 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -107,32 +107,32 @@
         <Style Selector="^[MessageIcon=Asterisk] /template/ PathIcon#PART_Icon, ^[MessageIcon=Information] /template/ PathIcon#PART_Icon">
             <Setter Property="IsVisible" Value="True" />
             <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
-            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowInformationIconGlyph}" />
+            <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}" />
         </Style>
         <Style Selector="^[MessageIcon=Error] /template/ PathIcon#PART_Icon, ^[MessageIcon=Hand] /template/ PathIcon#PART_Icon, ^[MessageIcon=Stop] /template/ PathIcon#PART_Icon">
             <Setter Property="IsVisible" Value="True" />
             <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
-            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowErrorIconGlyph}" />
+            <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}" />
         </Style>
         <Style Selector="^[MessageIcon=Exclamation] /template/ PathIcon#PART_Icon">
             <Setter Property="IsVisible" Value="True" />
             <Setter Property="Foreground" Value="{DynamicResource SemiYellow6}" />
-            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowWarningIconGlyph}" />
+            <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
         </Style>
         <Style Selector="^[MessageIcon=Question] /template/ PathIcon#PART_Icon">
             <Setter Property="IsVisible" Value="True" />
             <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
-            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowQuestionIconGlyph}" />
+            <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}" />
         </Style>
         <Style Selector="^[MessageIcon=Warning] /template/ PathIcon#PART_Icon">
             <Setter Property="IsVisible" Value="True" />
             <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
-            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowWarningIconGlyph}" />
+            <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
         </Style>
         <Style Selector="^[MessageIcon=Success] /template/ PathIcon#PART_Icon">
             <Setter Property="IsVisible" Value="True" />
             <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
-            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowSuccessIconGlyph}" />
+            <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
         </Style>
 
     </ControlTheme>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/DialogShared.axaml b/src/Ursa.Themes.Semi/Themes/Shared/DialogShared.axaml
new file mode 100644
index 0000000..c6a1c25
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Shared/DialogShared.axaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StreamGeometry x:Key="DialogQuestionIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM11.8281 14.6094C10.9688 14.6094 10.5391 14.0723 10.5391 13.3691C10.5391 12.3242 11.0566 11.6504 12.2676 10.7324C12.2894 10.7158 12.3111 10.6993 12.3326 10.6829C13.1573 10.0555 13.7324 9.61807 13.7324 8.82812C13.7324 7.93945 12.9023 7.42188 11.9746 7.42188C11.2129 7.42188 10.627 7.70508 10.168 8.30078C9.83594 8.64258 9.57227 8.82812 9.12305 8.82812C8.38086 8.82812 8 8.31055 8 7.71484C8 7.10938 8.3418 6.49414 8.87891 6.02539C9.60156 5.40039 10.7539 5 12.2773 5C14.9922 5 16.8965 6.33789 16.8965 8.64258C16.8965 10.3223 15.8906 11.1328 14.709 11.9531C13.9082 12.5391 13.5273 12.8809 13.2246 13.5742L13.2238 13.5756C12.8922 14.1609 12.638 14.6094 11.8281 14.6094ZM11.8086 18.7695C10.8711 18.7695 10.0996 18.1641 10.0996 17.2266C10.0996 16.2891 10.8711 15.6836 11.8086 15.6836C12.7461 15.6836 13.5078 16.2891 13.5078 17.2266C13.5078 18.1641 12.7461 18.7695 11.8086 18.7695Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogInformationIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogWarningIconGlyph">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogErrorIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogSuccessIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</StreamGeometry>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/MessageBox.axaml b/src/Ursa.Themes.Semi/Themes/Shared/MessageBox.axaml
new file mode 100644
index 0000000..fe08ce5
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Shared/MessageBox.axaml
@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="MessageBoxWindowContentMaxWidth">300</x:Double>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/MessageBoxWindow.axaml b/src/Ursa.Themes.Semi/Themes/Shared/MessageBoxWindow.axaml
deleted file mode 100644
index a28747a..0000000
--- a/src/Ursa.Themes.Semi/Themes/Shared/MessageBoxWindow.axaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
-    <StreamGeometry x:Key="MessageBoxWindowQuestionIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM11.8281 14.6094C10.9688 14.6094 10.5391 14.0723 10.5391 13.3691C10.5391 12.3242 11.0566 11.6504 12.2676 10.7324C12.2894 10.7158 12.3111 10.6993 12.3326 10.6829C13.1573 10.0555 13.7324 9.61807 13.7324 8.82812C13.7324 7.93945 12.9023 7.42188 11.9746 7.42188C11.2129 7.42188 10.627 7.70508 10.168 8.30078C9.83594 8.64258 9.57227 8.82812 9.12305 8.82812C8.38086 8.82812 8 8.31055 8 7.71484C8 7.10938 8.3418 6.49414 8.87891 6.02539C9.60156 5.40039 10.7539 5 12.2773 5C14.9922 5 16.8965 6.33789 16.8965 8.64258C16.8965 10.3223 15.8906 11.1328 14.709 11.9531C13.9082 12.5391 13.5273 12.8809 13.2246 13.5742L13.2238 13.5756C12.8922 14.1609 12.638 14.6094 11.8281 14.6094ZM11.8086 18.7695C10.8711 18.7695 10.0996 18.1641 10.0996 17.2266C10.0996 16.2891 10.8711 15.6836 11.8086 15.6836C12.7461 15.6836 13.5078 16.2891 13.5078 17.2266C13.5078 18.1641 12.7461 18.7695 11.8086 18.7695Z</StreamGeometry>
-    <StreamGeometry x:Key="MessageBoxWindowInformationIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</StreamGeometry>
-    <StreamGeometry x:Key="MessageBoxWindowWarningIconGlyph">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</StreamGeometry>
-    <StreamGeometry x:Key="MessageBoxWindowErrorIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
-    <StreamGeometry x:Key="MessageBoxWindowSuccessIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</StreamGeometry>
-    <x:Double x:Key="MessageBoxWindowContentMaxWidth">300</x:Double>
-</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
index 1e27845..af198fa 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
@@ -5,11 +5,12 @@
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="ButtonGroup.axaml" />
         <MergeResourceInclude Source="Dialog.axaml" />
+        <MergeResourceInclude Source="DialogShared.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
         <MergeResourceInclude Source="KeyGestureInput.axaml" />
-        <MergeResourceInclude Source="MessageBoxWindow.axaml" />
+        <MergeResourceInclude Source="MessageBox.axaml" />
         <MergeResourceInclude Source="NavigationMenu.axaml" />
         <MergeResourceInclude Source="Pagination.axaml" />
         <MergeResourceInclude Source="TagInput.axaml" />
diff --git a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
index a8b5658..527e278 100644
--- a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
@@ -44,13 +44,13 @@ public class DefaultDialogControl: DialogControl
         set => SetValue(ButtonsProperty, value);
     }
 
-    public static readonly StyledProperty<DialogIcon> IconProperty = AvaloniaProperty.Register<DefaultDialogControl, DialogIcon>(
-        nameof(Icon));
+    public static readonly StyledProperty<DialogMode> ModeProperty = AvaloniaProperty.Register<DefaultDialogControl, DialogMode>(
+        nameof(Mode));
 
-    public DialogIcon Icon
+    public DialogMode Mode
     {
-        get => GetValue(IconProperty);
-        set => SetValue(IconProperty, value);
+        get => GetValue(ModeProperty);
+        set => SetValue(ModeProperty, value);
     }
     
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
diff --git a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
index 62e4e76..3a51c2d 100644
--- a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
@@ -34,13 +34,13 @@ public class DefaultDialogWindow: DialogWindow
         set => SetValue(ButtonsProperty, value);
     }
 
-    public new static readonly StyledProperty<DialogIcon> IconProperty = AvaloniaProperty.Register<DefaultDialogWindow, DialogIcon>(
-        nameof(Icon));
+    public static readonly StyledProperty<DialogMode> ModeProperty = AvaloniaProperty.Register<DefaultDialogWindow, DialogMode>(
+        nameof(Mode));
 
-    public new DialogIcon Icon
+    public DialogMode Mode
     {
-        get => GetValue(IconProperty);
-        set => SetValue(IconProperty, value);
+        get => GetValue(ModeProperty);
+        set => SetValue(ModeProperty, value);
     }
     
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
diff --git a/src/Ursa/Controls/Dialog/Dialog.cs b/src/Ursa/Controls/Dialog/Dialog.cs
index 2d5bb3b..39ad610 100644
--- a/src/Ursa/Controls/Dialog/Dialog.cs
+++ b/src/Ursa/Controls/Dialog/Dialog.cs
@@ -58,7 +58,7 @@ public static class Dialog
         Window? owner, 
         TViewModel vm, 
         string? title = null, 
-        DialogIcon icon = DialogIcon.None, 
+        DialogMode mode = DialogMode.None, 
         DialogButton buttons = DialogButton.OKCancel)
         where TView : Control, new()
     {
@@ -68,7 +68,7 @@ public static class Dialog
             DataContext = vm,
             Buttons = buttons,
             Title = title,
-            Icon = icon,
+            Mode = mode,
         };
         if (owner is null)
         {
@@ -85,12 +85,12 @@ public static class Dialog
     public static async Task<DialogResult> ShowModalAsync<TView, TViewModel>(
         TViewModel vm, 
         string? title = null, 
-        DialogIcon icon = DialogIcon.None, 
+        DialogMode mode = DialogMode.None, 
         DialogButton buttons = DialogButton.OKCancel)
         where TView: Control, new()
     {
         var mainWindow = GetMainWindow();
-        return await ShowModalAsync<TView, TViewModel>(mainWindow, vm, title, icon, buttons);
+        return await ShowModalAsync<TView, TViewModel>(mainWindow, vm, title, mode, buttons);
     }
     
     private static Window? GetMainWindow()
@@ -106,7 +106,7 @@ public static class OverlayDialog
         TViewModel vm, 
         string? hostId = null, 
         string? title = null,
-        DialogIcon icon = DialogIcon.None,
+        DialogMode mode = DialogMode.None,
         DialogButton buttons = DialogButton.OKCancel)
         where TView : Control, new()
     {
@@ -116,7 +116,7 @@ public static class OverlayDialog
             DataContext = vm,
             Buttons = buttons,
             Title = title,
-            Icon = icon,
+            Mode = mode,
         };
         var host = OverlayDialogManager.GetHost(hostId);
         host?.AddModalDialog(t);
@@ -142,7 +142,7 @@ public static class OverlayDialog
         TViewModel vm, 
         string? hostId = null, 
         string? title = null, 
-        DialogIcon icon = DialogIcon.None, 
+        DialogMode mode = DialogMode.None, 
         DialogButton buttons = DialogButton.OKCancel)
         where TView: Control, new()
     {
@@ -152,7 +152,7 @@ public static class OverlayDialog
             DataContext = vm,
             Buttons = buttons,
             Title = title,
-            Icon = icon,
+            Mode = mode,
         };
         var host = OverlayDialogManager.GetHost(hostId);
         host?.AddDialog(t);
diff --git a/src/Ursa/Controls/Dialog/DialogIcon.cs b/src/Ursa/Controls/Dialog/DialogMode.cs
similarity index 81%
rename from src/Ursa/Controls/Dialog/DialogIcon.cs
rename to src/Ursa/Controls/Dialog/DialogMode.cs
index 21380a1..3f3bb1c 100644
--- a/src/Ursa/Controls/Dialog/DialogIcon.cs
+++ b/src/Ursa/Controls/Dialog/DialogMode.cs
@@ -1,6 +1,6 @@
 namespace Ursa.Controls;
 
-public enum DialogIcon
+public enum DialogMode
 {
     Info,
     Warning,
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 5b98590..246c19b 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -63,7 +63,7 @@ public class OverlayDialogHost : Canvas
     protected override void OnPointerMoved(PointerEventArgs e)
     {
         base.OnPointerMoved(e);
-        if (e.Source is DefaultDialogControl item)
+        if (e.Source is DialogControl item)
         {
             if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
@@ -155,7 +155,7 @@ public class OverlayDialogHost : Canvas
     // Handle dialog layer change event
     private void OnDialogLayerChanged(object sender, DialogLayerChangeEventArgs e)
     {
-        if (sender is not DefaultDialogControl control)
+        if (sender is not DialogControl control)
             return;
         if (!_dialogs.Contains(control))
             return;

From fe61ba8767eab2ca60f1e4c80a8b4d5b82c7e332 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 25 Jan 2024 16:29:20 +0800
Subject: [PATCH 23/28] feat: implement overlay messagebox, unify messagebox
 and dialog layout.

---
 demo/Ursa.Demo/Pages/MessageBoxDemo.axaml     |   1 +
 .../ViewModels/MessageBoxDemoViewModel.cs     |  39 +++-
 .../Controls/MessageBox.axaml                 | 198 +++++++++++++++---
 src/Ursa/Controls/Dialog/DialogControl.cs     |   2 +-
 src/Ursa/Controls/MessageBox/MessageBox.cs    |  22 ++
 .../Controls/MessageBox/MessageBoxControl.cs  | 135 ++++++++++++
 .../Controls/MessageBox/MessageBoxWindow.cs   |   1 +
 7 files changed, 361 insertions(+), 37 deletions(-)
 create mode 100644 src/Ursa/Controls/MessageBox/MessageBoxControl.cs

diff --git a/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml b/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml
index 477beeb..706c8d5 100644
--- a/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml
+++ b/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml
@@ -20,6 +20,7 @@
         <ComboBox ItemsSource="{Binding Icons}" SelectedItem="{Binding SelectedIcon}" />
         <ToggleSwitch Content="Try Long Message" IsChecked="{Binding UseLong}"></ToggleSwitch>
         <ToggleSwitch Content="Show Title" IsChecked="{Binding UseTitle}"></ToggleSwitch>
+        <ToggleSwitch Content="Overlay" IsChecked="{Binding UseOverlay}"></ToggleSwitch>
         <Button Command="{Binding DefaultMessageBoxCommand}" Content="Default" />
         <Button Command="{Binding OkCommand}" Content="OK" />
         <Button Command="{Binding OkCancelCommand}" Content="OKCancel" />
diff --git a/demo/Ursa.Demo/ViewModels/MessageBoxDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/MessageBoxDemoViewModel.cs
index 2bca373..3bb7a45 100644
--- a/demo/Ursa.Demo/ViewModels/MessageBoxDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MessageBoxDemoViewModel.cs
@@ -61,7 +61,14 @@ public class MessageBoxDemoViewModel: ObservableObject
             _title = value ? "Ursa MessageBox" : string.Empty;
         }
     }
-    
+
+    private bool _useOverlay;
+
+    public bool UseOverlay
+    {
+        get => _useOverlay;
+        set => SetProperty(ref _useOverlay, value);
+    }
     
     
 
@@ -80,26 +87,46 @@ public class MessageBoxDemoViewModel: ObservableObject
 
     private async Task OnDefaultMessageAsync()
     {
-        Result = await MessageBox.ShowAsync(_message, _title, icon: SelectedIcon);
+        if (UseOverlay)
+        {
+            Result = await MessageBox.ShowOverlayAsync(_message, _title, icon: SelectedIcon);
+        }
+        else
+        {
+            Result = await MessageBox.ShowAsync(_message, _title, icon: SelectedIcon);
+        }
+        
     }
     
     private async Task OnOkAsync()
     {
-        Result = await MessageBox.ShowAsync(_message, _title, icon: SelectedIcon, button:MessageBoxButton.OK);
+        await Show(MessageBoxButton.OK);
     }
     
     private async Task OnYesNoAsync()
     {
-        Result = await MessageBox.ShowAsync(_message, _title, icon: SelectedIcon, button: MessageBoxButton.YesNo);
+        await Show(MessageBoxButton.YesNo);
     }
     
     private async Task OnYesNoCancelAsync()
     {
-        Result = await MessageBox.ShowAsync(_message, _title, icon: SelectedIcon, button: MessageBoxButton.YesNoCancel);
+        await Show(MessageBoxButton.YesNoCancel);
     }
 
     private async Task OnOkCancelAsync()
     {
-        Result = await MessageBox.ShowAsync(_message, _title, icon: SelectedIcon, button:MessageBoxButton.OKCancel);
+        await Show(MessageBoxButton.OK);
+    }
+
+    private async Task Show(MessageBoxButton button)
+    {
+        if (UseOverlay)
+        {
+            Result = await MessageBox.ShowOverlayAsync(_message, _title, icon: SelectedIcon, button:button);
+        }
+        else
+        {
+            Result = await MessageBox.ShowAsync(_message, _title, icon: SelectedIcon, button:button);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 3702213..39d3f19 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -15,11 +15,15 @@
         <Setter Property="WindowStartupLocation" Value="CenterOwner" />
         <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="1" />
         <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
-        <Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome"/>
+        <Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome" />
         <Setter Property="SystemDecorations">
-            <OnPlatform >
-                <OnPlatform.Windows><SystemDecorations>Full</SystemDecorations></OnPlatform.Windows>
-                <OnPlatform.Default><SystemDecorations>BorderOnly</SystemDecorations></OnPlatform.Default>
+            <OnPlatform>
+                <OnPlatform.Windows>
+                    <SystemDecorations>Full</SystemDecorations>
+                </OnPlatform.Windows>
+                <OnPlatform.Default>
+                    <SystemDecorations>BorderOnly</SystemDecorations>
+                </OnPlatform.Default>
             </OnPlatform>
         </Setter>
         <Setter Property="CanResize" Value="False" />
@@ -29,35 +33,34 @@
                     <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
                     <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
-                    <ChromeOverlayLayer></ChromeOverlayLayer>
+                    <ChromeOverlayLayer />
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="8,8,0,0"
-                                FontSize="14"
-                                FontWeight="Bold"
-                                TextTrimming="CharacterEllipsis"
-                                TextWrapping="NoWrap"
-                                Text="{TemplateBinding Title}" />
-                            <Button
-                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="1"
-                                Margin="0,4,4,0"
-                                Theme="{DynamicResource CloseButton}"/>
-                        </Grid>
-                        <Grid
-                            Grid.Row="1"
-                            Margin="{TemplateBinding Padding}"
-                            MaxWidth="{DynamicResource MessageBoxWindowContentMaxWidth}"
-                            ColumnDefinitions="Auto, *">
+                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto" Margin="24 24 24 0">
                             <PathIcon
                                 Name="PART_Icon"
                                 Grid.Column="0"
                                 Width="24"
                                 Height="24"
-                                Margin="0,0,12,0"
+                                IsHitTestVisible="False"
                                 VerticalAlignment="Center" />
+                            <TextBlock
+                                Grid.Column="1"
+                                FontSize="14"
+                                FontWeight="Bold"
+                                IsHitTestVisible="False"
+                                Text="{TemplateBinding Title}"
+                                TextTrimming="CharacterEllipsis"
+                                TextWrapping="NoWrap" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                Grid.Column="2"
+                                Theme="{DynamicResource CloseButton}" />
+                        </Grid>
+                        <Grid
+                            Grid.Row="1"
+                            MaxWidth="{DynamicResource MessageBoxWindowContentMaxWidth}"
+                            Margin="{TemplateBinding Padding}"
+                            ColumnDefinitions="Auto, *">
                             <ScrollViewer
                                 Grid.Column="1"
                                 MaxHeight="300"
@@ -73,7 +76,7 @@
                         </Grid>
                         <StackPanel
                             Grid.Row="2"
-                            Margin="0,0,8,8"
+                            Margin="0,0,24,24"
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">
                             <Button
@@ -85,17 +88,20 @@
                                 Name="{x:Static u:MessageBoxWindow.PART_NoButton}"
                                 Margin="8,0,0,0"
                                 Classes="Danger"
-                                Content="No" />
+                                Content="No"
+                                Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_YesButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Content="Yes" />
+                                Content="Yes"
+                                Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_OKButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Content="OK" />
+                                Content="OK"
+                                Theme="{DynamicResource SolidButton}" />
                         </StackPanel>
                     </Grid>
                 </Panel>
@@ -134,6 +140,138 @@
             <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
             <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
         </Style>
+    </ControlTheme>
 
+    <ControlTheme x:Key="{x:Type u:MessageBoxControl}" TargetType="u:MessageBoxControl">
+        <Setter Property="CornerRadius" Value="12" />
+        <Setter Property="Padding" Value="48 24"></Setter>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:MessageBoxControl">
+                <Border
+                    Padding="0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Classes="Shadow"
+                    ClipToBounds="True"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    IsHitTestVisible="True"
+                    Theme="{DynamicResource CardBorder}">
+                    <Grid RowDefinitions="Auto, *, Auto">
+                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
+                            <Panel
+                                Name="{x:Static u:DialogControl.PART_TitleArea}"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="3"
+                                Background="Transparent" />
+                            <PathIcon
+                                Name="PART_Icon"
+                                Grid.Column="0"
+                                Width="24"
+                                Height="24"
+                                Margin="24,24,8,0"
+                                IsHitTestVisible="False"
+                                VerticalAlignment="Center" />
+                            <TextBlock
+                                Name="PART_Title"
+                                Grid.Column="1"
+                                Margin="0,24,0,0"
+                                FontSize="16"
+                                VerticalAlignment="Center"
+                                FontWeight="Bold"
+                                Text="{TemplateBinding Title}"
+                                IsHitTestVisible="False"
+                                TextTrimming="CharacterEllipsis"
+                                TextWrapping="NoWrap" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                Grid.Column="2"
+                                Margin="0,24,24,0"
+                                Theme="{DynamicResource CloseButton}" />
+                        </Grid>
+                        <Grid
+                            Grid.Row="1"
+                            MaxWidth="{DynamicResource MessageBoxWindowContentMaxWidth}"
+                            Margin="{TemplateBinding Padding}">
+                            <ScrollViewer
+                                MaxHeight="300"
+                                HorizontalScrollBarVisibility="Disabled"
+                                VerticalScrollBarVisibility="Auto">
+                                <TextBlock
+                                    Name="PART_ContentPresenter"
+                                    VerticalAlignment="Center"
+                                    Text="{TemplateBinding Content}"
+                                    TextAlignment="Left"
+                                    TextWrapping="Wrap" />
+                            </ScrollViewer>
+                        </Grid>
+                        <StackPanel
+                            Grid.Row="2"
+                            Margin="24,0,24,24"
+                            HorizontalAlignment="Right"
+                            Orientation="Horizontal">
+                            <Button
+                                Name="{x:Static u:MessageBoxControl.PART_CancelButton}"
+                                Margin="8,0,0,0"
+                                Classes="Tertiary"
+                                Content="Cancel" />
+                            <Button
+                                Name="{x:Static u:MessageBoxControl.PART_NoButton}"
+                                Margin="8,0,0,0"
+                                Classes="Danger"
+                                Content="No"
+                                Theme="{DynamicResource SolidButton}" />
+                            <Button
+                                Name="{x:Static u:MessageBoxControl.PART_YesButton}"
+                                Margin="8,0,0,0"
+                                Classes="Primary"
+                                Content="Yes"
+                                Theme="{DynamicResource SolidButton}" />
+                            <Button
+                                Name="{x:Static u:MessageBoxControl.PART_OKButton}"
+                                Margin="8,0,0,0"
+                                Classes="Primary"
+                                Content="OK"
+                                Theme="{DynamicResource SolidButton}" />
+                        </StackPanel>
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^[MessageIcon=None] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^[MessageIcon=None] /template/ TextBlock#PART_Title">
+            <Setter Property="Margin" Value="24 24 0 0" />
+        </Style>
+        <Style Selector="^[MessageIcon=Asterisk] /template/ PathIcon#PART_Icon, ^[MessageIcon=Information] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Error] /template/ PathIcon#PART_Icon, ^[MessageIcon=Hand] /template/ PathIcon#PART_Icon, ^[MessageIcon=Stop] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Exclamation] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiYellow6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Question] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Warning] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Success] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
+        </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index ca3e93c..80f5c35 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -17,7 +17,7 @@ public class DialogControl: ContentControl
     public const string PART_TitleArea = "PART_TitleArea";
     public const string PC_Modal = ":modal";
     
-    private Button? _closeButton;
+    protected internal Button? _closeButton;
     private Panel? _titleArea;
     public event EventHandler<DialogLayerChangeEventArgs>? LayerChanged;
     public event EventHandler<object?>? DialogControlClosing;
diff --git a/src/Ursa/Controls/MessageBox/MessageBox.cs b/src/Ursa/Controls/MessageBox/MessageBox.cs
index ac2c466..59c1657 100644
--- a/src/Ursa/Controls/MessageBox/MessageBox.cs
+++ b/src/Ursa/Controls/MessageBox/MessageBox.cs
@@ -2,6 +2,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
+using Avalonia.Styling;
 
 namespace Ursa.Controls;
 
@@ -56,4 +57,25 @@ public static class MessageBox
         var result = await messageWindow.ShowDialog<MessageBoxResult>(owner);
         return result;
     }
+
+    public static async Task<MessageBoxResult> ShowOverlayAsync(
+        string message,
+        string? title = null,
+        string? hostId = null,
+        MessageBoxIcon icon = MessageBoxIcon.None,
+        MessageBoxButton button = MessageBoxButton.OKCancel)
+    {
+        var host = OverlayDialogManager.GetHost(hostId);
+        if (host is null) return MessageBoxResult.None;
+        var messageControl = new MessageBoxControl()
+        {
+            Content = message,
+            Title = title,
+            Buttons = button,
+            MessageIcon = icon,
+        };
+        host.AddModalDialog(messageControl);
+        var result = await messageControl.ShowAsync<MessageBoxResult>();
+        return result;
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/MessageBox/MessageBoxControl.cs b/src/Ursa/Controls/MessageBox/MessageBoxControl.cs
new file mode 100644
index 0000000..88fca1e
--- /dev/null
+++ b/src/Ursa/Controls/MessageBox/MessageBoxControl.cs
@@ -0,0 +1,135 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Ursa.Common;
+
+namespace Ursa.Controls;
+
+/// <summary>
+/// The messageBox used to display in OverlayDialogHost. 
+/// </summary>
+[TemplatePart(PART_CloseButton, typeof(Button))]
+[TemplatePart(PART_NoButton, typeof(Button))]
+[TemplatePart(PART_OKButton, typeof(Button))]
+[TemplatePart(PART_CancelButton, typeof(Button))]
+[TemplatePart(PART_YesButton, typeof(Button))]
+public class MessageBoxControl: DialogControl
+{
+    public const string PART_YesButton = "PART_YesButton";
+    public const string PART_NoButton = "PART_NoButton";
+    public const string PART_OKButton = "PART_OKButton";
+    public const string PART_CancelButton = "PART_CancelButton";
+    
+    private Button? _yesButton;
+    private Button? _noButton;
+    private Button? _okButton;
+    private Button? _cancelButton;
+    
+    public static readonly StyledProperty<MessageBoxIcon> MessageIconProperty =
+        AvaloniaProperty.Register<MessageBoxWindow, MessageBoxIcon>(
+            nameof(MessageIcon));
+
+    public MessageBoxIcon MessageIcon
+    {
+        get => GetValue(MessageIconProperty);
+        set => SetValue(MessageIconProperty, value);
+    }
+
+    public static readonly StyledProperty<MessageBoxButton> ButtonsProperty = AvaloniaProperty.Register<MessageBoxControl, MessageBoxButton>(
+        nameof(Buttons), MessageBoxButton.OK);
+
+    public MessageBoxButton Buttons
+    {
+        get => GetValue(ButtonsProperty);
+        set => SetValue(ButtonsProperty, value);
+    }
+
+    public static readonly StyledProperty<string?> TitleProperty = AvaloniaProperty.Register<MessageBoxControl, string?>(
+        nameof(Title));
+
+    public string? Title
+    {
+        get => GetValue(TitleProperty);
+        set => SetValue(TitleProperty, value);
+    }
+    
+    static MessageBoxControl()
+    {
+        ButtonsProperty.Changed.AddClassHandler<MessageBoxControl>((o, e) => { o.SetButtonVisibility(); });
+    }
+    
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        EventHelper.UnregisterClickEvent(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
+        _okButton = e.NameScope.Find<Button>(PART_OKButton);
+        _cancelButton = e.NameScope.Find<Button>(PART_CancelButton);
+        _yesButton = e.NameScope.Find<Button>(PART_YesButton);
+        _noButton = e.NameScope.Find<Button>(PART_NoButton);
+        EventHelper.RegisterClickEvent(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
+        SetButtonVisibility();
+    }
+
+    private void DefaultButtonsClose(object sender, RoutedEventArgs e)
+    {
+        if (sender is Button button)
+        {
+            if (button == _okButton)
+            {
+                OnDialogControlClosing(this, MessageBoxResult.OK);
+            }
+            else if (button == _cancelButton)
+            {
+                OnDialogControlClosing(this, MessageBoxResult.Cancel);
+            }
+            else if (button == _yesButton)
+            {
+                OnDialogControlClosing(this, MessageBoxResult.Yes);
+            }
+            else if (button == _noButton)
+            {
+                OnDialogControlClosing(this, MessageBoxResult.No);
+            }
+        }
+    }
+    
+    private void SetButtonVisibility()
+    {
+        switch (Buttons)
+        {
+            case MessageBoxButton.OK:
+                SetVisibility(_okButton, true);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case MessageBoxButton.OKCancel:
+                SetVisibility(_okButton, true);
+                SetVisibility(_cancelButton, true);
+                SetVisibility(_yesButton, false);
+                SetVisibility(_noButton, false);
+                break;
+            case MessageBoxButton.YesNo:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, false);
+                SetVisibility(_yesButton, true);
+                SetVisibility(_noButton, true);
+                break;
+            case MessageBoxButton.YesNoCancel:
+                SetVisibility(_okButton, false);
+                SetVisibility(_cancelButton, true);
+                SetVisibility(_yesButton, true);
+                SetVisibility(_noButton, true);
+                break;
+        }
+    }
+    
+    private void SetVisibility(Button? button, bool visible)
+    {
+        if (button is not null) button.IsVisible = visible;
+    }
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/MessageBox/MessageBoxWindow.cs b/src/Ursa/Controls/MessageBox/MessageBoxWindow.cs
index 8a0757a..53913a8 100644
--- a/src/Ursa/Controls/MessageBox/MessageBoxWindow.cs
+++ b/src/Ursa/Controls/MessageBox/MessageBoxWindow.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform;
+using Ursa.Common;
 
 namespace Ursa.Controls;
 

From b327a7c8ac2b8e76348f9c9d3dd67957595ae4f2 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 25 Jan 2024 16:30:42 +0800
Subject: [PATCH 24/28] fix: fix window fontsize.

---
 src/Ursa.Themes.Semi/Controls/MessageBox.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 39d3f19..80d3ebd 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -45,7 +45,7 @@
                                 VerticalAlignment="Center" />
                             <TextBlock
                                 Grid.Column="1"
-                                FontSize="14"
+                                FontSize="16"
                                 FontWeight="Bold"
                                 IsHitTestVisible="False"
                                 Text="{TemplateBinding Title}"

From af02b46adc3584ce640a0b25d819f2a57a3ccf11 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 25 Jan 2024 17:35:52 +0800
Subject: [PATCH 25/28] feat: update demo.

---
 demo/Ursa.Demo/Dialogs/DialogWithAction.axaml |   1 +
 demo/Ursa.Demo/Dialogs/PlainDialog.axaml      |   3 +
 .../Ursa.Demo/Dialogs/PlainDialogViewModel.cs |  11 +-
 demo/Ursa.Demo/Pages/DialogDemo.axaml         |  77 +++++---
 .../ViewModels/DialogDemoViewModel.cs         | 165 +++++++++++++-----
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    |  14 +-
 .../Controls/MessageBox.axaml                 |   2 +
 7 files changed, 200 insertions(+), 73 deletions(-)

diff --git a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
index 104e746..3a0d2ac 100644
--- a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
+++ b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
@@ -5,6 +5,7 @@
              xmlns:local="clr-namespace:Ursa.Demo.Dialogs"
              x:DataType="local:DialogWithActionViewModel"
              x:CompileBindings="True"
+             Background="{DynamicResource SemiYellow1}"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ursa.Demo.Dialogs.DialogWithAction">
     <StackPanel Margin="24">
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
index 2f0565e..89dbb0d 100644
--- a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
+++ b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
@@ -3,6 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             xmlns:local="clr-namespace:Ursa.Demo.Dialogs"
+             x:DataType="local:PlainDialogViewModel"
+             x:CompileBindings="True"
              x:Class="Ursa.Demo.Dialogs.PlainDialog">
     <StackPanel>
         <Calendar SelectedDate="{Binding Date}" ></Calendar>
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs b/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs
index e7105f2..2e199a6 100644
--- a/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs
+++ b/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs
@@ -1,8 +1,15 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Ursa.Demo.Dialogs;
 
 public class PlainDialogViewModel: ObservableObject
 {
-    
+    private DateTime? _date;
+
+    public DateTime? Date
+    {
+        get => _date;
+        set => SetProperty(ref _date, value);
+    }
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index d6ddd48..f5f24e9 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -12,29 +12,62 @@
     x:DataType="vm:DialogDemoViewModel"
     mc:Ignorable="d">
     <Grid ColumnDefinitions="Auto, *">
-        <StackPanel Grid.Column="0">
-            <TextBlock>
-                <Run Text="Result: "></Run>
-                <Run Text="{Binding Result}"></Run>
-            </TextBlock>
-            <TextBlock>
-                <Run Text="Date: "></Run>
-                <Run Text="{Binding DialogViewModel.Date}"></Run>
-            </TextBlock>
-            <Button Command="{Binding ShowDefaultWindowCommand}">Show Default Modal Dialog</Button>
-            <Button Command="{Binding ShowGlobalModalDialogCommand}">Show Custom Modal Dialog</Button>
-            <Button Command="{Binding ShowLocalOverlayModalDialogCommand}">Show Local Overlay Modal Dialog</Button>
-            <Button Command="{Binding ShowGlobalOverlayModalDialogCommand}"> Show Global Overlay Modal Dialog </Button>
-            <Button Command="{Binding ShowGlobalOverlayDialogCommand}">Show Global Overlay Dialog</Button>
-        </StackPanel>
+        <TabControl Grid.Column="0" Width="300">
+            <TabItem Header="Default">
+                <StackPanel>
+                    <ToggleSwitch
+                        Name="overlay"
+                        IsChecked="{Binding IsWindow}"
+                        OffContent="Overlay"
+                        OnContent="Window" />
+                    <ToggleSwitch
+                        IsVisible="{Binding !#overlay.IsChecked}"
+                        IsChecked="{Binding IsGlobal}"
+                        OffContent="Local"
+                        OnContent="Global" />
+                    <ToggleSwitch
+                        IsVisible="{Binding !#overlay.IsChecked}"
+                        IsChecked="{Binding IsModal}"
+                        OffContent="Regular"
+                        OnContent="Modal" />
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="Buttons" />
+                        <ComboBox ItemsSource="{Binding Buttons}" SelectedItem="{Binding SelectedButton}" />
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="Mode" />
+                        <ComboBox ItemsSource="{Binding Modes}" SelectedItem="{Binding SelectedMode}"/>
+                    </StackPanel>
+                    <Button Content="Show Dialog" Command="{Binding ShowDialogCommand}" />
+                    <TextBlock>
+                        <Run Text="Default Result: "></Run>
+                        <Run Text="{Binding DefaultResult}"/>
+                    </TextBlock>
+                    <TextBlock>
+                        <Run Text="Dialog Date: "></Run>
+                        <Run Text="{Binding Date}"/>
+                    </TextBlock>
+                </StackPanel>
+            </TabItem>
+            <TabItem Header="Custom">
+                <StackPanel>
+                    <ToggleSwitch OffContent="Overlay" OnContent="Window" IsChecked="{Binding IsWindow}" Name="overlay2" />
+                    <ToggleSwitch IsVisible="{Binding !#overlay2.IsChecked}" OffContent="Local" OnContent="Global" IsChecked="{Binding IsGlobal}" />
+                    <ToggleSwitch IsVisible="{Binding !#overlay2.IsChecked}" OffContent="Regular" OnContent="Modal" IsChecked="{Binding IsModal}" />
+                    <Button Content="Show Dialog" Command="{Binding ShowCustomDialogCommand}" />
+                    <TextBlock>
+                        <Run Text="Custom Result: "></Run>
+                        <Run Text="{Binding Result}"/>
+                    </TextBlock>
+                    <TextBlock>
+                        <Run Text="Dialog Date: "></Run>
+                        <Run Text="{Binding Date}"/>
+                    </TextBlock>
+                </StackPanel>
+            </TabItem>
+        </TabControl>
         <Grid Grid.Column="1">
-            <Button
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Command="{Binding ShowLocalOverlayModalDialogCommand}">
-                Show Local Overlay Dialog
-            </Button>
-            <Border CornerRadius="20" ClipToBounds="True">
+            <Border ClipToBounds="True" CornerRadius="20" BorderThickness="1" BorderBrush="{DynamicResource SemiGrey1}">
                 <u:OverlayDialogHost HostId="LocalHost" />
             </Border>
         </Grid>
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index ec6126f..163e7b7 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -12,68 +13,140 @@ namespace Ursa.Demo.ViewModels;
 
 public class DialogDemoViewModel: ObservableObject
 {
-    public ICommand ShowLocalOverlayModalDialogCommand { get; }
-    public ICommand ShowGlobalOverlayModalDialogCommand { get; }
-    public ICommand ShowGlobalModalDialogCommand { get; }
-    public ICommand ShowGlobalOverlayDialogCommand { get; }
-    public ICommand ShowDefaultWindowCommand { get; }
+    public ICommand ShowDialogCommand { get; set; }
+    public ICommand ShowCustomDialogCommand { get; set; }
 
-    private object? _result;
-    public object? Result
+    private DialogMode _selectedMode;
+    public DialogMode SelectedMode
+    {
+        get => _selectedMode;
+        set => SetProperty(ref _selectedMode, value);
+    }
+    
+    public ObservableCollection<DialogMode> Modes { get; set; }
+    
+    private DialogButton _selectedButton;
+    public DialogButton SelectedButton
+    {
+        get => _selectedButton;
+        set => SetProperty(ref _selectedButton, value);
+    }
+    
+    public ObservableCollection<DialogButton> Buttons { get; set; }
+
+    private bool _isWindow;
+    public bool IsWindow
+    {
+        get => _isWindow;
+        set => SetProperty(ref _isWindow, value);
+    }
+    
+    private bool _isGlobal;
+    public bool IsGlobal
+    {
+        get => _isGlobal;
+        set => SetProperty(ref _isGlobal, value);
+    }
+
+    private bool _isModal;
+    public bool IsModal
+    {
+        get => _isModal;
+        set => SetProperty(ref _isModal, value);
+    }
+
+    private DialogResult? _defaultResult;
+    public DialogResult? DefaultResult
+    {
+        get => _defaultResult;
+        set => SetProperty(ref _defaultResult, value);
+    }
+
+    private bool _result;
+    public bool Result
     {
         get => _result;
         set => SetProperty(ref _result, value);
     }
 
-    private DateTime _date;
-
-    public DateTime Date
+    private DateTime? _date;
+    public DateTime? Date
     {
         get => _date;
         set => SetProperty(ref _date, value);
     }
-
-    public DialogWithActionViewModel DialogViewModel { get; set; } = new DialogWithActionViewModel();
-
+    
+    
     public DialogDemoViewModel()
     {
-        ShowLocalOverlayModalDialogCommand = new AsyncRelayCommand(ShowLocalOverlayModalDialog);
-        ShowGlobalOverlayModalDialogCommand = new AsyncRelayCommand(ShowGlobalOverlayModalDialog);
-        ShowGlobalModalDialogCommand = new AsyncRelayCommand(ShowGlobalModalDialog);
-        ShowGlobalOverlayDialogCommand = new RelayCommand(ShowGlobalOverlayDialog);
-        ShowDefaultWindowCommand = new AsyncRelayCommand(ShowDefaultWindow);
+        ShowDialogCommand = new AsyncRelayCommand(ShowDialog);
+        ShowCustomDialogCommand = new AsyncRelayCommand(ShowCustomDialog);
+        Modes = new ObservableCollection<DialogMode>(Enum.GetValues<DialogMode>());
+        Buttons = new ObservableCollection<DialogButton>(Enum.GetValues<DialogButton>());
     }
-
-    private async Task ShowDefaultWindow()
+    
+    private async Task ShowDialog()
     {
-        var result = await Dialog.ShowModalAsync<PlainDialog, PlainDialogViewModel>(new PlainDialogViewModel(),
-            mode: DialogMode.Error, buttons: DialogButton.OKCancel, title:"确定取消预约吗？");
-        Result = result;
-        return;
+        var vm = new PlainDialogViewModel();
+        if (IsWindow)
+        {
+            DefaultResult = await Dialog.ShowModalAsync<PlainDialog, PlainDialogViewModel>(
+                vm,
+                "Please select a date",
+                SelectedMode,
+                SelectedButton);
+            Date = vm.Date;
+        }
+        else
+        {
+            if (IsModal)
+            {
+                DefaultResult = await OverlayDialog.ShowModalAsync<PlainDialog, PlainDialogViewModel>(
+                    vm,
+                    IsGlobal ? null : "LocalHost",
+                    "Please select a date",
+                    SelectedMode,
+                    SelectedButton
+                );
+                Date = vm.Date;
+            }
+            else
+            {
+                OverlayDialog.Show<PlainDialog, PlainDialogViewModel>(
+                    new PlainDialogViewModel(),
+                    IsGlobal ? null : "LocalHost",
+                    "Please select a date",
+                    SelectedMode,
+                    SelectedButton);
+            }
+        }
+        
     }
-
-    private void ShowGlobalOverlayDialog()
-    {
-        OverlayDialog.ShowCustom<DialogWithAction, DialogWithActionViewModel>(new DialogWithActionViewModel());
-    }
-
-    private async Task ShowGlobalModalDialog()
-    {
-        var result = await Dialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(DialogViewModel);
-        Result = result;
-    }
-
-    private async Task ShowGlobalOverlayModalDialog()
-    {
-        Result = await OverlayDialog.ShowModalAsync<PlainDialog, PlainDialogViewModel>(new PlainDialogViewModel(),
-            title: "Please select a date", mode: DialogMode.Error, buttons: DialogButton.YesNoCancel);
-    }
-
-    private async Task ShowLocalOverlayModalDialog()
+    
+    private async Task ShowCustomDialog()
     {
         var vm = new DialogWithActionViewModel();
-        var result = await OverlayDialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
-            vm, "LocalHost");
-        Result = result;
+        if (IsWindow)
+        {
+            
+            Result = await Dialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
+                vm);
+            Date = vm.Date;
+        }
+        else
+        {
+            if (IsModal)
+            {
+                Result = await OverlayDialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
+                    vm, IsGlobal ? null : "LocalHost");
+                Date = vm.Date;
+            }
+            else
+            {
+                OverlayDialog.ShowCustom<DialogWithAction, DialogWithActionViewModel>(new DialogWithActionViewModel(),
+                    IsGlobal ? null : "LocalHost");
+            }
+        }
+        
     }
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 8307975..08338af 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -129,6 +129,7 @@
                                 VerticalAlignment="Center"
                                 Height="16" />
                             <TextBlock
+                                Name="PART_Title"
                                 Grid.Column="1"
                                 Margin="0 24 0 0 "
                                 FontWeight="Bold"
@@ -183,6 +184,9 @@
             <Style Selector="^ /template/ PathIcon#PART_Icon">
                 <Setter Property="IsVisible" Value="False"></Setter>
             </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Title">
+                <Setter Property="Margin" Value="24 24 0 0"></Setter>
+            </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
                 <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
             </Style>
@@ -386,7 +390,7 @@
                         <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
                             <TextBlock
                                 Grid.Column="0"
-                                Margin="8,8,0,0"
+                                Margin="24, 24,0,0"
                                 FontSize="14"
                                 FontWeight="Bold"
                                 Text="{TemplateBinding Title}"
@@ -429,7 +433,7 @@
         </Setter>
         <Setter Property="CanResize" Value="False" />
         <Setter Property="Template">
-            <ControlTemplate TargetType="u:DialogWindow">
+            <ControlTemplate TargetType="u:DefaultDialogWindow">
                 <Panel>
                     <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
                     <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
@@ -455,6 +459,7 @@
                                 VerticalAlignment="Center"
                                 Height="16" />
                             <TextBlock
+                                Name="PART_Title"
                                 Grid.Column="1"
                                 Margin="0 24 0 0 "
                                 FontWeight="Bold"
@@ -505,10 +510,13 @@
                 </Panel>
             </ControlTemplate>
         </Setter>
-                <Style Selector="^[Mode=None]">
+        <Style Selector="^[Mode=None]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
                 <Setter Property="IsVisible" Value="False"></Setter>
             </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Title">
+                <Setter Property="Margin" Value="24 24 0 0"></Setter>
+            </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
                 <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
             </Style>
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 80d3ebd..3b146fd 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -41,6 +41,7 @@
                                 Grid.Column="0"
                                 Width="24"
                                 Height="24"
+                                Margin="0 0 8 0"
                                 IsHitTestVisible="False"
                                 VerticalAlignment="Center" />
                             <TextBlock
@@ -48,6 +49,7 @@
                                 FontSize="16"
                                 FontWeight="Bold"
                                 IsHitTestVisible="False"
+                                VerticalAlignment="Center"
                                 Text="{TemplateBinding Title}"
                                 TextTrimming="CharacterEllipsis"
                                 TextWrapping="NoWrap" />

From 8d369290ff673ae40babf4182b7e59c334722f07 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 25 Jan 2024 17:42:24 +0800
Subject: [PATCH 26/28] feat: add annotation.

---
 demo/Ursa.Demo/Pages/DialogDemo.axaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index f5f24e9..75b27c1 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -17,15 +17,18 @@
                 <StackPanel>
                     <ToggleSwitch
                         Name="overlay"
+                        Content="Window/Overlay"
                         IsChecked="{Binding IsWindow}"
                         OffContent="Overlay"
                         OnContent="Window" />
                     <ToggleSwitch
+                        Content="Global/Local"
                         IsVisible="{Binding !#overlay.IsChecked}"
                         IsChecked="{Binding IsGlobal}"
                         OffContent="Local"
                         OnContent="Global" />
                     <ToggleSwitch
+                        Content="Modal/Regular"
                         IsVisible="{Binding !#overlay.IsChecked}"
                         IsChecked="{Binding IsModal}"
                         OffContent="Regular"
@@ -51,9 +54,9 @@
             </TabItem>
             <TabItem Header="Custom">
                 <StackPanel>
-                    <ToggleSwitch OffContent="Overlay" OnContent="Window" IsChecked="{Binding IsWindow}" Name="overlay2" />
-                    <ToggleSwitch IsVisible="{Binding !#overlay2.IsChecked}" OffContent="Local" OnContent="Global" IsChecked="{Binding IsGlobal}" />
-                    <ToggleSwitch IsVisible="{Binding !#overlay2.IsChecked}" OffContent="Regular" OnContent="Modal" IsChecked="{Binding IsModal}" />
+                    <ToggleSwitch Content="Window/Overlay" OffContent="Overlay" OnContent="Window" IsChecked="{Binding IsWindow}" Name="overlay2" />
+                    <ToggleSwitch Content="Global/Local" IsVisible="{Binding !#overlay2.IsChecked}" OffContent="Local" OnContent="Global" IsChecked="{Binding IsGlobal}" />
+                    <ToggleSwitch Content="Modal/Regular" IsVisible="{Binding !#overlay2.IsChecked}" OffContent="Regular" OnContent="Modal" IsChecked="{Binding IsModal}" />
                     <Button Content="Show Dialog" Command="{Binding ShowCustomDialogCommand}" />
                     <TextBlock>
                         <Run Text="Custom Result: "></Run>

From 8bb6d51acbdef42fe654bf855c263fc7974a3ec5 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 25 Jan 2024 21:33:07 +0800
Subject: [PATCH 27/28] feat: implement box shadow.

---
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 404 +++++++++---------
 .../Controls/MessageBox.axaml                 | 171 ++++----
 2 files changed, 293 insertions(+), 282 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 08338af..750722b 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -3,44 +3,46 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:theme="clr-namespace:Ursa.Themes.Semi"
     xmlns:u="https://irihi.tech/ursa">
-    
+
     <ControlTheme x:Key="{x:Type u:OverlayDialogHost}" TargetType="u:OverlayDialogHost">
         <Setter Property="OverlayMaskBrush" Value="{DynamicResource OverlayDialogMaskBrush}" />
     </ControlTheme>
     <ControlTheme x:Key="{x:Type u:DialogControl}" TargetType="u:DialogControl">
-        <Setter Property="CornerRadius" Value="12"></Setter>
+        <Setter Property="CornerRadius" Value="12" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DialogControl">
                 <Border
+                    Margin="8"
                     Padding="0"
-                    Margin="4"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Classes="Shadow"
+                    ClipToBounds="False"
                     CornerRadius="{TemplateBinding CornerRadius}"
-                    ClipToBounds="True"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
-                    <Grid RowDefinitions="Auto, *">
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            Grid.Row="0"
-                            Grid.RowSpan="2"
-                            Content="{TemplateBinding Content}" />
-                        <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
-                            <Panel
-                                Name="{x:Static u:DialogControl.PART_TitleArea}"
-                                Grid.Column="0"
-                                Grid.ColumnSpan="2"
-                                Background="Transparent" />
-                            <Button
-                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="1"
-                                Margin="0,24,24,0"
-                                DockPanel.Dock="Right"
-                                Theme="{DynamicResource CloseButton}" />
+                    <Border ClipToBounds="True" CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid RowDefinitions="Auto, *">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Content="{TemplateBinding Content}" />
+                            <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogControl.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="2"
+                                    Background="Transparent" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="1"
+                                    Margin="0,24,24,0"
+                                    DockPanel.Dock="Right"
+                                    Theme="{DynamicResource CloseButton}" />
+                            </Grid>
                         </Grid>
-                    </Grid>
+                    </Border>
                 </Border>
             </ControlTemplate>
         </Setter>
@@ -95,207 +97,211 @@
             </Setter>
         </Style>
     </ControlTheme>
-    
+
     <ControlTheme x:Key="{x:Type u:DefaultDialogControl}" TargetType="u:DefaultDialogControl">
-        <Setter Property="CornerRadius" Value="12"></Setter>
+        <Setter Property="CornerRadius" Value="12" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DefaultDialogControl">
                 <Border
+                    Margin="10"
                     Padding="0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
+                    BoxShadow="0 0 8 0 #1A000000"
                     Classes="Shadow"
+                    ClipToBounds="False"
                     CornerRadius="{TemplateBinding CornerRadius}"
-                    ClipToBounds="True"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
-                    <Grid RowDefinitions="Auto, *, Auto">
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            Grid.Row="1"
-                            Margin="24 8"
-                            Content="{TemplateBinding Content}" />
-                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
-                            <Panel
-                                Name="{x:Static u:DialogControl.PART_TitleArea}"
-                                Grid.Column="0"
-                                Grid.ColumnSpan="3"
-                                Background="Transparent" />
-                            <PathIcon
-                                Name="PART_Icon"
-                                Grid.Column="0"
-                                Margin="24 24 8 0"
-                                Width="16"
-                                VerticalAlignment="Center"
-                                Height="16" />
-                            <TextBlock
-                                Name="PART_Title"
-                                Grid.Column="1"
-                                Margin="0 24 0 0 "
-                                FontWeight="Bold"
-                                FontSize="16"
-                                TextWrapping="Wrap"
-                                VerticalAlignment="Center"
-                                IsHitTestVisible="False"
-                                IsVisible="{TemplateBinding Title,
-                                                            Converter={x:Static ObjectConverters.IsNotNull}}"
-                                Text="{TemplateBinding Title}" />
-                            <Button
-                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="2"
-                                Margin="0 24 24 0"
-                                DockPanel.Dock="Right"
-                                Theme="{DynamicResource CloseButton}" />
+                    <Border ClipToBounds="True" CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid RowDefinitions="Auto, *, Auto">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Grid.Row="1"
+                                Margin="24,8"
+                                Content="{TemplateBinding Content}" />
+                            <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogControl.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    Background="Transparent" />
+                                <PathIcon
+                                    Name="PART_Icon"
+                                    Grid.Column="0"
+                                    Width="16"
+                                    Height="16"
+                                    Margin="24,24,8,0"
+                                    VerticalAlignment="Center" />
+                                <TextBlock
+                                    Name="PART_Title"
+                                    Grid.Column="1"
+                                    Margin="0,24,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="Bold"
+                                    IsHitTestVisible="False"
+                                    IsVisible="{TemplateBinding Title,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Text="{TemplateBinding Title}"
+                                    TextWrapping="Wrap" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="2"
+                                    Margin="0,24,24,0"
+                                    DockPanel.Dock="Right"
+                                    Theme="{DynamicResource CloseButton}" />
+                            </Grid>
+                            <StackPanel
+                                Grid.Row="2"
+                                Margin="24,0,24,24"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Tertiary"
+                                    Content="取消" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Danger"
+                                    Content="否"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="是"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="确认"
+                                    Theme="{DynamicResource SolidButton}" />
+                            </StackPanel>
                         </Grid>
-                        <StackPanel
-                            Grid.Row="2"
-                            Margin="24 0 24 24"
-                            HorizontalAlignment="Right"
-                            Orientation="Horizontal">
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
-                                Margin="8,0,0,0"
-                                Classes="Tertiary"
-                                Content="取消" />
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
-                                Margin="8,0,0,0"
-                                Classes="Danger"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="否" />
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
-                                Margin="8,0,0,0"
-                                Classes="Primary"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="是" />
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
-                                Margin="8,0,0,0"
-                                Classes="Primary"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="确认" />
-                        </StackPanel>
-                    </Grid>
+                    </Border>
                 </Border>
             </ControlTemplate>
         </Setter>
         <Style Selector="^[Mode=None]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="False"></Setter>
+                <Setter Property="IsVisible" Value="False" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_Title">
-                <Setter Property="Margin" Value="24 24 0 0"></Setter>
+                <Setter Property="Margin" Value="24 24 0 0" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Info]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Warning]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Error]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Question]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Success]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
 
@@ -390,7 +396,7 @@
                         <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
                             <TextBlock
                                 Grid.Column="0"
-                                Margin="24, 24,0,0"
+                                Margin="24,24,0,0"
                                 FontSize="14"
                                 FontWeight="Bold"
                                 Text="{TemplateBinding Title}"
@@ -443,7 +449,7 @@
                         <ContentPresenter
                             Name="PART_ContentPresenter"
                             Grid.Row="1"
-                            Margin="24 8"
+                            Margin="24,8"
                             Content="{TemplateBinding Content}" />
                         <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
                             <Panel
@@ -454,32 +460,32 @@
                             <PathIcon
                                 Name="PART_Icon"
                                 Grid.Column="0"
-                                Margin="24 24 8 0"
                                 Width="16"
-                                VerticalAlignment="Center"
-                                Height="16" />
+                                Height="16"
+                                Margin="24,24,8,0"
+                                VerticalAlignment="Center" />
                             <TextBlock
                                 Name="PART_Title"
                                 Grid.Column="1"
-                                Margin="0 24 0 0 "
-                                FontWeight="Bold"
-                                FontSize="16"
-                                TextWrapping="Wrap"
+                                Margin="0,24,0,0"
                                 VerticalAlignment="Center"
+                                FontSize="16"
+                                FontWeight="Bold"
                                 IsHitTestVisible="False"
                                 IsVisible="{TemplateBinding Title,
                                                             Converter={x:Static ObjectConverters.IsNotNull}}"
-                                Text="{TemplateBinding Title}" />
+                                Text="{TemplateBinding Title}"
+                                TextWrapping="Wrap" />
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
                                 Grid.Column="2"
-                                Margin="0 24 24 0"
+                                Margin="0,24,24,0"
                                 DockPanel.Dock="Right"
                                 Theme="{DynamicResource CloseButton}" />
                         </Grid>
                         <StackPanel
                             Grid.Row="2"
-                            Margin="24 0 24 24"
+                            Margin="24,0,24,24"
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">
                             <Button
@@ -491,20 +497,20 @@
                                 Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
                                 Margin="8,0,0,0"
                                 Classes="Danger"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="否" />
+                                Content="否"
+                                Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="是" />
+                                Content="是"
+                                Theme="{DynamicResource SolidButton}" />
                             <Button
                                 Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
                                 Margin="8,0,0,0"
                                 Classes="Primary"
-                                Theme="{DynamicResource SolidButton}"
-                                Content="确认" />
+                                Content="确认"
+                                Theme="{DynamicResource SolidButton}" />
                         </StackPanel>
                     </Grid>
                 </Panel>
@@ -512,120 +518,120 @@
         </Setter>
         <Style Selector="^[Mode=None]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="False"></Setter>
+                <Setter Property="IsVisible" Value="False" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_Title">
-                <Setter Property="Margin" Value="24 24 0 0"></Setter>
+                <Setter Property="Margin" Value="24 24 0 0" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Info]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Warning]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Error]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Question]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Success]">
             <Style Selector="^ /template/ PathIcon#PART_Icon">
-                <Setter Property="IsVisible" Value="True"></Setter>
-                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}"></Setter>
-                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}"></Setter>
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary"></Setter>
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 3b146fd..a5aa865 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -35,21 +35,24 @@
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
                     <ChromeOverlayLayer />
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto" Margin="24 24 24 0">
+                        <Grid
+                            Grid.Row="0"
+                            Margin="24,24,24,0"
+                            ColumnDefinitions="Auto, *, Auto">
                             <PathIcon
                                 Name="PART_Icon"
                                 Grid.Column="0"
                                 Width="24"
                                 Height="24"
-                                Margin="0 0 8 0"
-                                IsHitTestVisible="False"
-                                VerticalAlignment="Center" />
+                                Margin="0,0,8,0"
+                                VerticalAlignment="Center"
+                                IsHitTestVisible="False" />
                             <TextBlock
                                 Grid.Column="1"
+                                VerticalAlignment="Center"
                                 FontSize="16"
                                 FontWeight="Bold"
                                 IsHitTestVisible="False"
-                                VerticalAlignment="Center"
                                 Text="{TemplateBinding Title}"
                                 TextTrimming="CharacterEllipsis"
                                 TextWrapping="NoWrap" />
@@ -146,7 +149,7 @@
 
     <ControlTheme x:Key="{x:Type u:MessageBoxControl}" TargetType="u:MessageBoxControl">
         <Setter Property="CornerRadius" Value="12" />
-        <Setter Property="Padding" Value="48 24"></Setter>
+        <Setter Property="Padding" Value="48 24" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:MessageBoxControl">
                 <Border
@@ -154,88 +157,90 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Classes="Shadow"
-                    ClipToBounds="True"
+                    ClipToBounds="False"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     IsHitTestVisible="True"
                     Theme="{DynamicResource CardBorder}">
-                    <Grid RowDefinitions="Auto, *, Auto">
-                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
-                            <Panel
-                                Name="{x:Static u:DialogControl.PART_TitleArea}"
-                                Grid.Column="0"
-                                Grid.ColumnSpan="3"
-                                Background="Transparent" />
-                            <PathIcon
-                                Name="PART_Icon"
-                                Grid.Column="0"
-                                Width="24"
-                                Height="24"
-                                Margin="24,24,8,0"
-                                IsHitTestVisible="False"
-                                VerticalAlignment="Center" />
-                            <TextBlock
-                                Name="PART_Title"
-                                Grid.Column="1"
-                                Margin="0,24,0,0"
-                                FontSize="16"
-                                VerticalAlignment="Center"
-                                FontWeight="Bold"
-                                Text="{TemplateBinding Title}"
-                                IsHitTestVisible="False"
-                                TextTrimming="CharacterEllipsis"
-                                TextWrapping="NoWrap" />
-                            <Button
-                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="2"
-                                Margin="0,24,24,0"
-                                Theme="{DynamicResource CloseButton}" />
-                        </Grid>
-                        <Grid
-                            Grid.Row="1"
-                            MaxWidth="{DynamicResource MessageBoxWindowContentMaxWidth}"
-                            Margin="{TemplateBinding Padding}">
-                            <ScrollViewer
-                                MaxHeight="300"
-                                HorizontalScrollBarVisibility="Disabled"
-                                VerticalScrollBarVisibility="Auto">
-                                <TextBlock
-                                    Name="PART_ContentPresenter"
+                    <Border ClipToBounds="True" CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid RowDefinitions="Auto, *, Auto">
+                            <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogControl.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    Background="Transparent" />
+                                <PathIcon
+                                    Name="PART_Icon"
+                                    Grid.Column="0"
+                                    Width="24"
+                                    Height="24"
+                                    Margin="24,24,8,0"
                                     VerticalAlignment="Center"
-                                    Text="{TemplateBinding Content}"
-                                    TextAlignment="Left"
-                                    TextWrapping="Wrap" />
-                            </ScrollViewer>
+                                    IsHitTestVisible="False" />
+                                <TextBlock
+                                    Name="PART_Title"
+                                    Grid.Column="1"
+                                    Margin="0,24,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="Bold"
+                                    IsHitTestVisible="False"
+                                    Text="{TemplateBinding Title}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="2"
+                                    Margin="0,24,24,0"
+                                    Theme="{DynamicResource CloseButton}" />
+                            </Grid>
+                            <Grid
+                                Grid.Row="1"
+                                MaxWidth="{DynamicResource MessageBoxWindowContentMaxWidth}"
+                                Margin="{TemplateBinding Padding}">
+                                <ScrollViewer
+                                    MaxHeight="300"
+                                    HorizontalScrollBarVisibility="Disabled"
+                                    VerticalScrollBarVisibility="Auto">
+                                    <TextBlock
+                                        Name="PART_ContentPresenter"
+                                        VerticalAlignment="Center"
+                                        Text="{TemplateBinding Content}"
+                                        TextAlignment="Left"
+                                        TextWrapping="Wrap" />
+                                </ScrollViewer>
+                            </Grid>
+                            <StackPanel
+                                Grid.Row="2"
+                                Margin="24,0,24,24"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_CancelButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Tertiary"
+                                    Content="Cancel" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_NoButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Danger"
+                                    Content="No"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_YesButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="Yes"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_OKButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="OK"
+                                    Theme="{DynamicResource SolidButton}" />
+                            </StackPanel>
                         </Grid>
-                        <StackPanel
-                            Grid.Row="2"
-                            Margin="24,0,24,24"
-                            HorizontalAlignment="Right"
-                            Orientation="Horizontal">
-                            <Button
-                                Name="{x:Static u:MessageBoxControl.PART_CancelButton}"
-                                Margin="8,0,0,0"
-                                Classes="Tertiary"
-                                Content="Cancel" />
-                            <Button
-                                Name="{x:Static u:MessageBoxControl.PART_NoButton}"
-                                Margin="8,0,0,0"
-                                Classes="Danger"
-                                Content="No"
-                                Theme="{DynamicResource SolidButton}" />
-                            <Button
-                                Name="{x:Static u:MessageBoxControl.PART_YesButton}"
-                                Margin="8,0,0,0"
-                                Classes="Primary"
-                                Content="Yes"
-                                Theme="{DynamicResource SolidButton}" />
-                            <Button
-                                Name="{x:Static u:MessageBoxControl.PART_OKButton}"
-                                Margin="8,0,0,0"
-                                Classes="Primary"
-                                Content="OK"
-                                Theme="{DynamicResource SolidButton}" />
-                        </StackPanel>
-                    </Grid>
+                    </Border>
                 </Border>
             </ControlTemplate>
         </Setter>

From ef7ba74302f5af81e81299ee8d2eab6ddd3347a7 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 25 Jan 2024 21:41:45 +0800
Subject: [PATCH 28/28] feat: change dark dialog window background.

---
 src/Ursa.Themes.Semi/Controls/Dialog.axaml     | 4 ++--
 src/Ursa.Themes.Semi/Controls/MessageBox.axaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 750722b..3fa8557 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -359,7 +359,7 @@
 
     <ControlTheme x:Key="{x:Type u:DialogWindow}" TargetType="u:DialogWindow">
         <Setter Property="Title" Value="{x:Null}" />
-        <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
+        <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
         <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
         <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
@@ -416,7 +416,7 @@
 
     <ControlTheme x:Key="{x:Type u:DefaultDialogWindow}" TargetType="u:DefaultDialogWindow">
         <Setter Property="Title" Value="{x:Null}" />
-        <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
+        <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
         <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
         <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index a5aa865..a5d2d36 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -5,7 +5,7 @@
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:MessageBoxWindow}" TargetType="u:MessageBoxWindow">
         <Setter Property="Title" Value="{x:Null}" />
-        <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
+        <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
         <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
         <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />