From b16a51ee4f566d01b7dba56a3b8bebf8e92b03ed Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Mon, 23 Dec 2024 17:22:02 +0800
Subject: [PATCH] feat: add VisualLayerManager ctor to Notification & Toast
 manager.

---
 demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml | 10 +++++++-
 .../Dialogs/CustomDemoDialog.axaml.cs         | 25 ++++++++++++++++++-
 .../Dialogs/CustomDemoDialogViewModel.cs      | 24 ++++++++++++++----
 .../Notification/WindowNotificationManager.cs | 14 ++++++++---
 .../WindowMessageManager.cs                   | 11 ++++++++
 src/Ursa/Controls/Toast/WindowToastManager.cs | 13 +++++++---
 6 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml b/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml
index dc61a44..13e2efa 100644
--- a/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml
+++ b/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml
@@ -75,6 +75,14 @@
             HorizontalAlignment="Right"
             Orientation="Horizontal"
             Spacing="8">
+            <Button
+                Command="{Binding ShowNotificationCommand}"
+                Content="Notification"
+                Theme="{DynamicResource SolidButton}" />
+            <Button
+                Command="{Binding ShowToastCommand}"
+                Content="Toast"
+                Theme="{DynamicResource SolidButton}" />
             <Button
                 Command="{Binding DialogCommand}"
                 Content="Dialog"
@@ -97,4 +105,4 @@
         </StackPanel>
     </Grid>
 
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml.cs b/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml.cs
index fde13b7..1cbc0ce 100644
--- a/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml.cs
+++ b/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml.cs
@@ -1,13 +1,36 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Controls.Primitives;
+using Avalonia.VisualTree;
+using Ursa.Controls;
 
 namespace Ursa.Demo.Dialogs;
 
 public partial class CustomDemoDialog : UserControl
 {
+    private CustomDemoDialogViewModel? _viewModel;
+
     public CustomDemoDialog()
     {
         InitializeComponent();
     }
+
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToVisualTree(e);
+        _viewModel = this.DataContext as CustomDemoDialogViewModel;
+        var visualLayerManager = this.FindAncestorOfType<VisualLayerManager>();
+        if (visualLayerManager is not null && _viewModel is not null)
+        {
+            _viewModel.NotificationManager = new WindowNotificationManager(visualLayerManager) { MaxItems = 3 };
+            _viewModel.ToastManager = new WindowToastManager(visualLayerManager) { MaxItems = 3 };
+        }
+    }
+
+    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnDetachedFromVisualTree(e);
+        _viewModel?.NotificationManager?.Uninstall();
+        _viewModel?.ToastManager?.Uninstall();
+    }
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/CustomDemoDialogViewModel.cs b/demo/Ursa.Demo/Dialogs/CustomDemoDialogViewModel.cs
index 55fdb55..dada5d4 100644
--- a/demo/Ursa.Demo/Dialogs/CustomDemoDialogViewModel.cs
+++ b/demo/Ursa.Demo/Dialogs/CustomDemoDialogViewModel.cs
@@ -15,6 +15,8 @@ public partial class CustomDemoDialogViewModel : ObservableObject, IDialogContex
     [ObservableProperty] private string? _department;
     [ObservableProperty] private string? _owner;
     [ObservableProperty] private string? _target;
+    public WindowNotificationManager? NotificationManager { get; set; }
+    public WindowToastManager? ToastManager { get; set; }
 
     public CustomDemoDialogViewModel()
     {
@@ -36,12 +38,11 @@ public partial class CustomDemoDialogViewModel : ObservableObject, IDialogContex
     }
 
     public event EventHandler<object?>? RequestClose;
-    
+
     public ICommand OKCommand { get; set; }
     public ICommand CancelCommand { get; set; }
-    
     public ICommand DialogCommand { get; set; }
-    
+
     private void OK()
     {
         RequestClose?.Invoke(this, true);
@@ -51,9 +52,22 @@ public partial class CustomDemoDialogViewModel : ObservableObject, IDialogContex
     {
         RequestClose?.Invoke(this, false);
     }
-    
+
     private async Task ShowDialog()
     {
-        await OverlayDialog.ShowCustomModal<CustomDemoDialog, CustomDemoDialogViewModel, bool>(new CustomDemoDialogViewModel());
+        await OverlayDialog.ShowCustomModal<CustomDemoDialog, CustomDemoDialogViewModel, bool>(
+            new CustomDemoDialogViewModel());
+    }
+
+    [RelayCommand]
+    private void ShowToast(object obj)
+    {
+        ToastManager?.Show("This is a Toast message");
+    }
+
+    [RelayCommand]
+    private void ShowNotification(object obj)
+    {
+        NotificationManager?.Show("This is a Notification message");
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Notification/WindowNotificationManager.cs b/src/Ursa/Controls/Notification/WindowNotificationManager.cs
index f6b517e..8b9e41e 100644
--- a/src/Ursa/Controls/Notification/WindowNotificationManager.cs
+++ b/src/Ursa/Controls/Notification/WindowNotificationManager.cs
@@ -2,6 +2,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Notifications;
+using Avalonia.Controls.Primitives;
 using Avalonia.Layout;
 using Avalonia.Threading;
 
@@ -37,6 +38,14 @@ public class WindowNotificationManager : WindowMessageManager, INotificationMana
         set => SetValue(PositionProperty, value);
     }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
+    /// </summary>
+    public WindowNotificationManager()
+    {
+        UpdatePseudoClasses(Position);
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
     /// </summary>
@@ -49,10 +58,7 @@ public class WindowNotificationManager : WindowMessageManager, INotificationMana
         }
     }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
-    /// </summary>
-    public WindowNotificationManager()
+    public WindowNotificationManager(VisualLayerManager? visualLayerManager) : base(visualLayerManager)
     {
         UpdatePseudoClasses(Position);
     }
diff --git a/src/Ursa/Controls/NotificationShared/WindowMessageManager.cs b/src/Ursa/Controls/NotificationShared/WindowMessageManager.cs
index 61f5f05..196566b 100644
--- a/src/Ursa/Controls/NotificationShared/WindowMessageManager.cs
+++ b/src/Ursa/Controls/NotificationShared/WindowMessageManager.cs
@@ -39,6 +39,17 @@ public abstract class WindowMessageManager : TemplatedControl
         VerticalAlignmentProperty.OverrideDefaultValue<WindowMessageManager>(VerticalAlignment.Stretch);
     }
 
+    public WindowMessageManager()
+    {
+    }
+
+    public WindowMessageManager(VisualLayerManager? visualLayerManager) : this()
+    {
+        if (visualLayerManager is null) return;
+        visualLayerManager.AdornerLayer.Children.Add(this);
+        AdornerLayer.SetAdornedElement(this, visualLayerManager.AdornerLayer);
+    }
+
     /// <inheritdoc/>
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
diff --git a/src/Ursa/Controls/Toast/WindowToastManager.cs b/src/Ursa/Controls/Toast/WindowToastManager.cs
index 18c9be8..312c7df 100644
--- a/src/Ursa/Controls/Toast/WindowToastManager.cs
+++ b/src/Ursa/Controls/Toast/WindowToastManager.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
+using Avalonia.Controls.Primitives;
 using Avalonia.Threading;
 
 namespace Ursa.Controls;
@@ -9,6 +10,13 @@ namespace Ursa.Controls;
 /// </summary>
 public class WindowToastManager : WindowMessageManager, IToastManager
 {
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WindowToastManager"/> class.
+    /// </summary>
+    public WindowToastManager()
+    {
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="WindowToastManager"/> class.
     /// </summary>
@@ -21,10 +29,7 @@ public class WindowToastManager : WindowMessageManager, IToastManager
         }
     }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WindowToastManager"/> class.
-    /// </summary>
-    public WindowToastManager()
+    public WindowToastManager(VisualLayerManager? visualLayerManager) : base(visualLayerManager)
     {
     }