From 540bade45a0d4c31fbb0dcb6483e6b68c9355e5e Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Fri, 21 Jul 2023 15:00:53 +0200
Subject: [PATCH] Improve WinodwNotificationManager

- Allow usage from XAML
- Allow any Visual as Host, so it can be used inside UserControl for example
- Allow adding style classes for NotificationCards
---
 .../WindowNotificationManager.cs              | 78 +++++++++++++++----
 1 file changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 0b7a19707b..80931d1865 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections;
 using System.Linq;
-using Avalonia.Reactive;
 using System.Threading.Tasks;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
-using Avalonia.Rendering;
+using Avalonia.Threading;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Notifications
@@ -18,6 +17,7 @@ namespace Avalonia.Controls.Notifications
     public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager
     {
         private IList? _items;
+        private AdornerLayer? adornerLayer;
 
         /// <summary>
         /// Defines the <see cref="Position"/> property.
@@ -50,17 +50,40 @@ namespace Avalonia.Controls.Notifications
             set { SetValue(MaxItemsProperty, value); }
         }
 
+        /// <summary>
+        /// Defines the <see cref="Host" /> property
+        /// </summary>
+        public static readonly DirectProperty<WindowNotificationManager, Visual?> HostProperty =
+            AvaloniaProperty.RegisterDirect<WindowNotificationManager, Visual?>(
+                nameof(Host),
+                o => o.Host,
+                (o, v) => o.Host = v);
+
+        private Visual? _Host;
+
+        /// <summary>
+        /// The Host that this NotificationManger should register to. If the Host is null, the Parent will be used.
+        /// </summary>
+        public Visual? Host
+        {
+            get { return _Host; }
+            set { SetAndRaise(HostProperty, ref _Host, value); }
+        }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
         /// </summary>
-        /// <param name="host">The window that will host the control.</param>
-        public WindowNotificationManager(TopLevel? host)
+        /// <param name="host">The visual that will host the control.</param>
+        public WindowNotificationManager(Visual? host) : this()
         {
-            if (host != null)
-            {
-                Install(host);
-            }
+            Host = host;
+        }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
+        /// </summary>
+        public WindowNotificationManager()
+        {
             UpdatePseudoClasses(Position);
         }
 
@@ -73,6 +96,8 @@ namespace Avalonia.Controls.Notifications
         /// <inheritdoc/>
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
+            base.OnApplyTemplate(e);
+            
             var itemsControl = e.NameScope.Find<Panel>("PART_Items");
             _items = itemsControl?.Children;
         }
@@ -120,12 +145,15 @@ namespace Avalonia.Controls.Notifications
                 (sender as NotificationCard)?.Close();
             };
 
-            _items?.Add(notificationControl);
-
-            if (_items?.OfType<NotificationCard>().Count(i => !i.IsClosing) > MaxItems)
+            Dispatcher.UIThread.Post(() =>
             {
-                _items.OfType<NotificationCard>().First(i => !i.IsClosing).Close();
-            }
+                _items?.Add(notificationControl);
+
+                if (_items?.OfType<NotificationCard>().Count(i => !i.IsClosing) > MaxItems)
+                {
+                    _items.OfType<NotificationCard>().First(i => !i.IsClosing).Close();
+                }
+            });
 
             if (expiration == TimeSpan.Zero)
             {
@@ -145,16 +173,32 @@ namespace Avalonia.Controls.Notifications
             {
                 UpdatePseudoClasses(change.GetNewValue<NotificationPosition>());
             }
+
+            if (change.Property == HostProperty)
+            {
+                Install();
+            }
         }
 
         /// <summary>
         /// Installs the <see cref="WindowNotificationManager"/> within the <see cref="AdornerLayer"/>
-        /// of the host <see cref="Window"/>.
         /// </summary>
-        /// <param name="host">The <see cref="Window"/> that will be the host.</param>
-        private void Install(TemplatedControl host)
+        private void Install()
         {
-            var adornerLayer = host.FindDescendantOfType<VisualLayerManager>()?.AdornerLayer;
+            // unregister from AdornerLayer if this control was already installed
+            if (adornerLayer is not null && !adornerLayer.Children.Contains(this))
+            {
+                adornerLayer.Children.Remove(this);
+            }
+            
+            // Try to get the host. If host was null, use the TopLevel instead.
+            var host = Host ?? Parent as Visual;
+
+            if (host is null) throw new InvalidOperationException("NotificationControl cannot be installed. Host was not found.");
+
+            adornerLayer = host is TopLevel 
+                ? host.FindDescendantOfType<VisualLayerManager>()?.AdornerLayer 
+                : AdornerLayer.GetAdornerLayer(host);
 
             if (adornerLayer is not null)
             {