From 4f43898d19985ebefb5516a6ea131242cf86a9b7 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 8 Apr 2019 20:11:34 +0100
Subject: [PATCH 01/70] make stackpanel reversable.

---
 src/Avalonia.Controls/StackPanel.cs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/StackPanel.cs b/src/Avalonia.Controls/StackPanel.cs
index df0c113cc0..1f42e5d23e 100644
--- a/src/Avalonia.Controls/StackPanel.cs
+++ b/src/Avalonia.Controls/StackPanel.cs
@@ -24,6 +24,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<Orientation> OrientationProperty =
             AvaloniaProperty.Register<StackPanel, Orientation>(nameof(Orientation), Orientation.Vertical);
 
+        /// <summary>
+        /// Defines the <see cref="ReverseOrder"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> ReverseOrderProperty =
+            AvaloniaProperty.Register<StackPanel, bool>(nameof(ReverseOrder));
+
         /// <summary>
         /// Initializes static members of the <see cref="StackPanel"/> class.
         /// </summary>
@@ -51,6 +57,15 @@ namespace Avalonia.Controls
             set { SetValue(OrientationProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets if the child controls will be layed out in reverse order.
+        /// </summary>
+        public bool ReverseOrder
+        {
+            get => GetValue(ReverseOrderProperty);
+            set => SetValue(ReverseOrderProperty, value);
+        }
+
         /// <summary>
         /// Gets the next control in the specified direction.
         /// </summary>
@@ -244,7 +259,9 @@ namespace Avalonia.Controls
                 arrangedWidth = 0;
             }
 
-            foreach (Control child in Children)
+            var children = ReverseOrder ? Children.Reverse() : Children;
+
+            foreach (Control child in children)
             {
                 double childWidth = child.DesiredSize.Width;
                 double childHeight = child.DesiredSize.Height;

From b31701d1caa17d72f8d1086690625eac17ab219c Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 8 Apr 2019 20:35:41 +0100
Subject: [PATCH 02/70] begin port of notification controls

---
 .../Notifications/INotificationManager.cs     |   9 ++
 .../Notifications/Notification.cs             | 101 +++++++++++++++++
 .../Notifications/NotificationArea.cs         | 106 ++++++++++++++++++
 .../Notifications/NotificationManager.cs      |  56 +++++++++
 4 files changed, 272 insertions(+)
 create mode 100644 src/Avalonia.Controls/Notifications/INotificationManager.cs
 create mode 100644 src/Avalonia.Controls/Notifications/Notification.cs
 create mode 100644 src/Avalonia.Controls/Notifications/NotificationArea.cs
 create mode 100644 src/Avalonia.Controls/Notifications/NotificationManager.cs

diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
new file mode 100644
index 0000000000..e0b73d6293
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Avalonia.Controls.Notifications
+{
+    interface INotificationManager
+    {
+        void Show(object content, string areaName = "", TimeSpan? expirationTime = null, Action onClick = null, Action onClose = null);
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
new file mode 100644
index 0000000000..f50458163b
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls.Notifications
+{
+    public class Notification : ContentControl
+    {
+        private TimeSpan _closingAnimationTime = TimeSpan.Zero;
+
+        public bool IsClosing { get; set; }
+
+        public static readonly RoutedEvent NotificationCloseInvokedEvent = EventManager.RegisterRoutedEvent(
+            "NotificationCloseInvoked", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(Notification));
+
+        public static readonly RoutedEvent NotificationClosedEvent = EventManager.RegisterRoutedEvent(
+            "NotificationClosed", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(Notification));
+
+        public event RoutedEventHandler NotificationCloseInvoked
+        {
+            add { AddHandler(NotificationCloseInvokedEvent, value); }
+            remove { RemoveHandler(NotificationCloseInvokedEvent, value); }
+        }
+
+        public event RoutedEventHandler NotificationClosed
+        {
+            add { AddHandler(NotificationClosedEvent, value); }
+            remove { RemoveHandler(NotificationClosedEvent, value); }
+        }
+
+        public static bool GetCloseOnClick(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(CloseOnClickProperty);
+        }
+
+        public static void SetCloseOnClick(DependencyObject obj, bool value)
+        {
+            obj.SetValue(CloseOnClickProperty, value);
+        }
+
+        public static readonly DependencyProperty CloseOnClickProperty =
+            DependencyProperty.RegisterAttached("CloseOnClick", typeof(bool), typeof(Notification), new FrameworkPropertyMetadata(false, CloseOnClickChanged));
+
+        private static void CloseOnClickChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        {
+            var button = dependencyObject as Button;
+            if (button == null)
+            {
+                return;
+            }
+
+            var value = (bool)dependencyPropertyChangedEventArgs.NewValue;
+
+            if (value)
+            {
+                button.Click += (sender, args) =>
+                {
+                    var notification = VisualTreeHelperExtensions.GetParent<Notification>(button);
+                    notification?.Close();
+                };
+            }
+        }
+
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            base.OnTemplateApplied(e);
+            var closeButton = this.FindControl<Button>("PART_CloseButton");
+            if (closeButton != null)
+                closeButton.Click += OnCloseButtonOnClick;
+
+            //var storyboards = Template.Triggers.OfType<EventTrigger>().FirstOrDefault(t => t.RoutedEvent == NotificationCloseInvokedEvent)?.Actions.OfType<BeginStoryboard>().Select(a => a.Storyboard);
+            //_closingAnimationTime = new TimeSpan(storyboards?.Max(s => Math.Min((s.Duration.HasTimeSpan ? s.Duration.TimeSpan + (s.BeginTime ?? TimeSpan.Zero) : TimeSpan.MaxValue).Ticks, s.Children.Select(ch => ch.Duration.TimeSpan + (s.BeginTime ?? TimeSpan.Zero)).Max().Ticks)) ?? 0);
+
+        }
+
+        private void OnCloseButtonOnClick(object sender, RoutedEventArgs args)
+        {
+            var button = sender as Button;
+            if (button == null)
+                return;
+
+            button.Click -= OnCloseButtonOnClick;
+            Close();
+        }
+
+        public async void Close()
+        {
+            if (IsClosing)
+            {
+                return;
+            }
+
+            IsClosing = true;
+
+            RaiseEvent(new RoutedEventArgs(NotificationCloseInvokedEvent));
+            await Task.Delay(_closingAnimationTime);
+            RaiseEvent(new RoutedEventArgs(NotificationClosedEvent));
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationArea.cs b/src/Avalonia.Controls/Notifications/NotificationArea.cs
new file mode 100644
index 0000000000..8cfbecfa1c
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/NotificationArea.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+
+namespace Avalonia.Controls.Notifications
+{
+    public class NotificationArea : TemplatedControl
+    {
+        private IList _items;
+
+        public NotificationPosition Position
+        {
+            get { return (NotificationPosition)GetValue(PositionProperty); }
+            set { SetValue(PositionProperty, value); }
+        }
+
+        public static readonly AvaloniaProperty PositionProperty =
+            AvaloniaProperty.Register<NotificationArea, NotificationPosition>(nameof(Position), NotificationPosition.BottomRight);
+
+        public int MaxItems
+        {
+            get { return (int)GetValue(MaxItemsProperty); }
+            set { SetValue(MaxItemsProperty, value); }
+        }
+
+        public static readonly AvaloniaProperty MaxItemsProperty =
+            AvaloniaProperty.Register<NotificationArea, int>(nameof(MaxItems), int.MaxValue);
+
+        public NotificationArea()
+        {
+            NotificationManager.AddArea(this);
+        }
+
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            base.OnTemplateApplied(e);
+
+            var itemsControl = this.FindControl<Panel>("PART_Items");
+            _items = itemsControl?.Children;
+        }
+
+        public async void Show(object content, TimeSpan expirationTime, Action onClick, Action onClose)
+        {
+            var notification = new Notification
+            {
+                Content = content
+            };
+
+            notification.PointerPressed += (sender, args) =>
+            {
+                if (onClick != null)
+                {
+                    onClick.Invoke();
+                    (sender as Notification)?.Close();
+                }
+            };
+            notification.NotificationClosed += (sender, args) => onClose?.Invoke();
+            notification.NotificationClosed += OnNotificationClosed;
+
+           /* if (!IsLoaded)
+            {
+                return;
+            }
+
+            var w = Window.GetWindow(this);
+            var x = PresentationSource.FromVisual(w);
+            if (x == null)
+            {
+                return;
+            }
+
+            lock (_items)
+            {
+                _items.Add(notification);
+
+                if (_items.OfType<Notification>().Count(i => !i.IsClosing) > MaxItems)
+                {
+                    _items.OfType<Notification>().First(i => !i.IsClosing).Close();
+                }
+            }
+
+            if (expirationTime == TimeSpan.MaxValue)
+            {
+                return;
+            }
+            await Task.Delay(expirationTime);
+
+            notification.Close();*/
+        }
+
+        private void OnNotificationClosed(object sender, RoutedEventArgs routedEventArgs)
+        {
+            var notification = sender as Notification;
+            _items.Remove(notification);
+        }
+    }
+
+    public enum NotificationPosition
+    {
+        TopLeft,
+        TopRight,
+        BottomLeft,
+        BottomRight
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationManager.cs b/src/Avalonia.Controls/Notifications/NotificationManager.cs
new file mode 100644
index 0000000000..236d67a35f
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/NotificationManager.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Avalonia.Threading;
+
+namespace Avalonia.Controls.Notifications
+{
+    public class NotificationManager : INotificationManager
+    {
+        private static readonly List<NotificationArea> Areas = new List<NotificationArea>();
+        private static Window _window;
+
+        public NotificationManager()
+        {
+        }
+
+        public void Show(object content, string areaName = "", TimeSpan? expirationTime = null, Action onClick = null,
+            Action onClose = null)
+        {
+            if (!Dispatcher.UIThread.CheckAccess())
+            {
+                Dispatcher.UIThread.Post(
+                    new Action(() => Show(content, areaName, expirationTime, onClick, onClose)));
+                return;
+            }
+
+            if (expirationTime == null)
+                expirationTime = TimeSpan.FromSeconds(5);
+
+            if (areaName == string.Empty && _window == null)
+            {
+                var workArea = Application.Current.MainWindow.Screens.Primary.WorkingArea;
+
+                _window = new Window
+                {
+                    Position =  workArea.Position,
+                    Width = workArea.Width,
+                    Height = workArea.Height
+                };
+
+                _window.Show();
+            }
+
+            foreach (var area in Areas.Where(a => a.Name == areaName))
+            {
+                area.Show(content, (TimeSpan)expirationTime, onClick, onClose);
+            }
+        }
+
+        internal static void AddArea(NotificationArea area)
+        {
+            Areas.Add(area);
+        }
+    }
+}

From 4dac9fd1ad86adcc4ae67169f3d9600e44241b45 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 10 Apr 2019 22:40:26 +0100
Subject: [PATCH 03/70] port notification

---
 .../Notifications/Notification.cs             | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index f50458163b..690dbfaac9 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -9,40 +9,54 @@ namespace Avalonia.Controls.Notifications
     {
         private TimeSpan _closingAnimationTime = TimeSpan.Zero;
 
-        public bool IsClosing { get; set; }
-
-        public static readonly RoutedEvent NotificationCloseInvokedEvent = EventManager.RegisterRoutedEvent(
-            "NotificationCloseInvoked", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(Notification));
+        static Notification()
+        {
+            CloseOnClickProperty.Changed.AddClassHandler<Button>(CloseOnClickChanged);
+        }
 
-        public static readonly RoutedEvent NotificationClosedEvent = EventManager.RegisterRoutedEvent(
-            "NotificationClosed", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(Notification));
+        public bool IsClosing { get; set; }
 
-        public event RoutedEventHandler NotificationCloseInvoked
+        /// <summary>
+        /// Defines the <see cref="NotificationCloseInvoked"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> NotificationCloseInvokedEvent =
+            RoutedEvent.Register<Notification, RoutedEventArgs>(nameof(NotificationCloseInvoked), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="NotificationClosed"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> NotificationClosedEvent =
+            RoutedEvent.Register<Notification, RoutedEventArgs>(nameof(NotificationClosed), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Raised when notification close event is invoked.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs> NotificationCloseInvoked
         {
             add { AddHandler(NotificationCloseInvokedEvent, value); }
             remove { RemoveHandler(NotificationCloseInvokedEvent, value); }
         }
 
-        public event RoutedEventHandler NotificationClosed
+        public event EventHandler<RoutedEventArgs> NotificationClosed
         {
             add { AddHandler(NotificationClosedEvent, value); }
             remove { RemoveHandler(NotificationClosedEvent, value); }
         }
 
-        public static bool GetCloseOnClick(DependencyObject obj)
+        public static bool GetCloseOnClick(Notification obj)
         {
             return (bool)obj.GetValue(CloseOnClickProperty);
         }
 
-        public static void SetCloseOnClick(DependencyObject obj, bool value)
+        public static void SetCloseOnClick(Notification obj, bool value)
         {
             obj.SetValue(CloseOnClickProperty, value);
         }
 
-        public static readonly DependencyProperty CloseOnClickProperty =
-            DependencyProperty.RegisterAttached("CloseOnClick", typeof(bool), typeof(Notification), new FrameworkPropertyMetadata(false, CloseOnClickChanged));
+        public static readonly AvaloniaProperty CloseOnClickProperty =
+            AvaloniaProperty.RegisterDirect<Notification, bool>("CloseOnClick", GetCloseOnClick, SetCloseOnClick);
 
-        private static void CloseOnClickChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        private static void CloseOnClickChanged(Button dependencyObject, AvaloniaPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
             var button = dependencyObject as Button;
             if (button == null)
@@ -56,7 +70,7 @@ namespace Avalonia.Controls.Notifications
             {
                 button.Click += (sender, args) =>
                 {
-                    var notification = VisualTreeHelperExtensions.GetParent<Notification>(button);
+                    var notification = button.Parent as Notification;
                     notification?.Close();
                 };
             }

From d80083f2f522d2614b43a0fb08bf78d9a559d4f4 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 11 Apr 2019 00:09:50 +0100
Subject: [PATCH 04/70] further progress on notifications ui

---
 samples/ControlCatalog/MainWindow.xaml        |  5 +-
 samples/ControlCatalog/MainWindow.xaml.cs     | 25 ++++++
 .../Notifications/Notification.cs             | 38 ++++++--
 .../Notifications/NotificationArea.cs         | 24 +++--
 .../Notifications/NotificationContent.cs      | 21 +++++
 .../Notifications/NotificationManager.cs      |  2 +-
 .../Properties/AssemblyInfo.cs                |  3 +-
 .../Avalonia.Themes.Default.csproj            | 14 ++-
 src/Avalonia.Themes.Default/DefaultTheme.xaml |  1 +
 .../NotificationArea.xaml                     | 87 +++++++++++++++++++
 10 files changed, 202 insertions(+), 18 deletions(-)
 create mode 100644 src/Avalonia.Controls/Notifications/NotificationContent.cs
 create mode 100644 src/Avalonia.Themes.Default/NotificationArea.xaml

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 4bae60b2a6..ae9574189a 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -4,5 +4,8 @@
         xmlns:local="clr-namespace:ControlCatalog"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="ControlCatalog.MainWindow">
-    <local:MainView/>
+    <Panel>
+        <local:MainView/>
+        <NotificationArea Name="Main" Position="TopRight" MaxItems="5" />
+    </Panel>
 </Window>
diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index e620a77e52..4057af59ff 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -1,18 +1,43 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
 using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
 using System;
+using System.Threading.Tasks;
 
 namespace ControlCatalog
 {
     public class MainWindow : Window
     {
+        private readonly NotificationManager _notificationManager = new NotificationManager();
+
         public MainWindow()
         {
             this.InitializeComponent();
             this.AttachDevTools();
             //Renderer.DrawFps = true;
             //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
+
+            Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                await Task.Delay(5000);
+
+                _notificationManager.Show(new NotificationContent { Message = "Test1", Type = NotificationType.Information }, "Main");
+
+                await Task.Delay(500);
+                _notificationManager.Show(new NotificationContent { Message = "Test2", Type = NotificationType.Error }, "Main");
+
+                await Task.Delay(500);
+                _notificationManager.Show(new NotificationContent { Message = "Test3", Type = NotificationType.Warning }, "Main");
+
+                await Task.Delay(500);
+                _notificationManager.Show(new NotificationContent { Message = "Test4", Type = NotificationType.Success }, "Main");
+
+                await Task.Delay(500);
+                _notificationManager.Show("Test5", "Main");
+
+            });
         }
 
         private void InitializeComponent()
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 690dbfaac9..c7cd176513 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
@@ -11,7 +12,34 @@ namespace Avalonia.Controls.Notifications
 
         static Notification()
         {
-            CloseOnClickProperty.Changed.AddClassHandler<Button>(CloseOnClickChanged);
+            //CloseOnClickProperty.Changed.AddClassHandler<Button>(CloseOnClickChanged);
+        }
+
+        public Notification()
+        {
+            this.GetObservable(ContentProperty)
+                .OfType<NotificationContent>()
+                .Subscribe(x =>
+                {
+                    switch (x.Type)
+                    {
+                        case NotificationType.Error:
+                            PseudoClasses.Add(":error");
+                            break;
+
+                        case NotificationType.Information:
+                            PseudoClasses.Add(":information");
+                            break;
+
+                        case NotificationType.Success:
+                            PseudoClasses.Add(":success");
+                            break;
+
+                        case NotificationType.Warning:
+                            PseudoClasses.Add(":warning");
+                            break;
+                    }
+                });
         }
 
         public bool IsClosing { get; set; }
@@ -43,7 +71,7 @@ namespace Avalonia.Controls.Notifications
             remove { RemoveHandler(NotificationClosedEvent, value); }
         }
 
-        public static bool GetCloseOnClick(Notification obj)
+        /*public static bool GetCloseOnClick(Notification obj)
         {
             return (bool)obj.GetValue(CloseOnClickProperty);
         }
@@ -51,10 +79,10 @@ namespace Avalonia.Controls.Notifications
         public static void SetCloseOnClick(Notification obj, bool value)
         {
             obj.SetValue(CloseOnClickProperty, value);
-        }
+        }*/
 
-        public static readonly AvaloniaProperty CloseOnClickProperty =
-            AvaloniaProperty.RegisterDirect<Notification, bool>("CloseOnClick", GetCloseOnClick, SetCloseOnClick);
+        //public static readonly AvaloniaProperty CloseOnClickProperty =
+          //  AvaloniaProperty.RegisterDirect<Notification, bool>("CloseOnClick", GetCloseOnClick, SetCloseOnClick);
 
         private static void CloseOnClickChanged(Button dependencyObject, AvaloniaPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
diff --git a/src/Avalonia.Controls/Notifications/NotificationArea.cs b/src/Avalonia.Controls/Notifications/NotificationArea.cs
index 8cfbecfa1c..2b58aed639 100644
--- a/src/Avalonia.Controls/Notifications/NotificationArea.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationArea.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections;
+using System.Linq;
+using System.Threading.Tasks;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 
@@ -15,7 +17,7 @@ namespace Avalonia.Controls.Notifications
             set { SetValue(PositionProperty, value); }
         }
 
-        public static readonly AvaloniaProperty PositionProperty =
+        public static readonly StyledProperty<NotificationPosition> PositionProperty =
             AvaloniaProperty.Register<NotificationArea, NotificationPosition>(nameof(Position), NotificationPosition.BottomRight);
 
         public int MaxItems
@@ -32,11 +34,19 @@ namespace Avalonia.Controls.Notifications
             NotificationManager.AddArea(this);
         }
 
+        static NotificationArea()
+        {
+            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopLeft, ":topleft");
+            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopRight, ":topright");
+            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomLeft, ":bottomleft");
+            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomRight, ":bottomright");
+        }
+
         protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
         {
             base.OnTemplateApplied(e);
 
-            var itemsControl = this.FindControl<Panel>("PART_Items");
+            var itemsControl = e.NameScope.Find<Panel>("PART_Items");
             _items = itemsControl?.Children;
         }
 
@@ -58,17 +68,17 @@ namespace Avalonia.Controls.Notifications
             notification.NotificationClosed += (sender, args) => onClose?.Invoke();
             notification.NotificationClosed += OnNotificationClosed;
 
-           /* if (!IsLoaded)
+            /*if (!this.)
             {
                 return;
-            }
+            }*/
 
-            var w = Window.GetWindow(this);
+            /*var w = this.VisualRoot Window.GetWindow(this);
             var x = PresentationSource.FromVisual(w);
             if (x == null)
             {
                 return;
-            }
+            }*/
 
             lock (_items)
             {
@@ -86,7 +96,7 @@ namespace Avalonia.Controls.Notifications
             }
             await Task.Delay(expirationTime);
 
-            notification.Close();*/
+            notification.Close();
         }
 
         private void OnNotificationClosed(object sender, RoutedEventArgs routedEventArgs)
diff --git a/src/Avalonia.Controls/Notifications/NotificationContent.cs b/src/Avalonia.Controls/Notifications/NotificationContent.cs
new file mode 100644
index 0000000000..9c070b7e86
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/NotificationContent.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Controls.Notifications
+{
+    public class NotificationContent
+    {
+        public string Title { get; set; }
+        public string Message { get; set; }
+        public NotificationType Type { get; set; }
+    }
+
+    public enum NotificationType
+    {
+        Information,
+        Success,
+        Warning,
+        Error
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationManager.cs b/src/Avalonia.Controls/Notifications/NotificationManager.cs
index 236d67a35f..8e6ad0a90b 100644
--- a/src/Avalonia.Controls/Notifications/NotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationManager.cs
@@ -26,7 +26,7 @@ namespace Avalonia.Controls.Notifications
             }
 
             if (expirationTime == null)
-                expirationTime = TimeSpan.FromSeconds(5);
+                expirationTime = TimeSpan.FromSeconds(25);
 
             if (areaName == string.Empty && _window == null)
             {
diff --git a/src/Avalonia.Controls/Properties/AssemblyInfo.cs b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
index 3466119411..c04c66a77f 100644
--- a/src/Avalonia.Controls/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
@@ -14,4 +14,5 @@ using Avalonia.Metadata;
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Presenters")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Shapes")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Templates")]
\ No newline at end of file
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Templates")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Notifications")]
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index ea53f308ab..7dedcdef57 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -12,10 +12,18 @@
     <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <AvaloniaResource Include="DefaultTheme.xaml"/>
-    <AvaloniaResource Include="Accents/*.xaml"/>
+    <AvaloniaResource Include="DefaultTheme.xaml" />
+    <AvaloniaResource Include="Accents/*.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="NotificationArea.xaml" />
   </ItemGroup>  
   <Import Project="..\..\build\EmbedXaml.props" />
-  <Import Project="..\..\build\BuildTargets.targets"/>
+  <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
+  <ItemGroup>
+    <EmbeddedResource Update="NotificationArea.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 2ed9eaa117..801fb61a4d 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -46,4 +46,5 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.ButtonSpinner.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.NumericUpDown.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.AutoCompleteBox.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.NotificationArea.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
new file mode 100644
index 0000000000..3d3f4b8c20
--- /dev/null
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -0,0 +1,87 @@
+<Styles xmlns="https://github.com/avaloniaui">
+    <Style Selector="NotificationArea">
+        <Setter Property="Margin" Value="0 0 8 8"/>
+        <Setter Property="Template">
+            <ControlTemplate>
+                <StackPanel Name="PART_Items" />
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+    <Style Selector="Notification">
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Setter Property="Width" Value="350"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Foreground" Value="White"/>
+        
+       <!-- <Setter Property="ContentTemplateSelector" Value="{StaticResource NotificationTemplateSelector}"/> -->
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Margin="8,8,0,0">
+                    <Grid>
+                        <ContentPresenter Content="{TemplateBinding Content}" />
+                        <Button Name="PART_CloseButton" Margin="12" Foreground="{TemplateBinding Foreground}" Opacity="0.8"/>
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+    <Style Selector="Notification /template/ Button#PART_CloseButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <TextBlock Text="X" FontSize="12" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
+    </Style>
+
+    <Style Selector="Notification">
+        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
+        <Setter Property="Background" Value="#444444"/>
+    </Style>
+    <Style Selector="Notification:information">
+        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
+        <Setter Property="Background" Value="CornflowerBlue"/>
+    </Style>
+    <Style Selector="Notification:success">
+        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
+        <Setter Property="Background" Value="LimeGreen"/>
+    </Style>
+    <Style Selector="Notification:warning">
+        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
+        <Setter Property="Background" Value="Orange"/>
+    </Style>
+    <Style Selector="Notification:error">
+        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
+        <Setter Property="Background" Value="OrangeRed"/>
+    </Style>
+
+    <Style Selector="NotificationArea:topleft /template/ StackPanel#PART_Items">
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+    </Style>
+
+    <Style Selector="NotificationArea:topright /template/ StackPanel#PART_Items">
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+    </Style>
+
+    <Style Selector="NotificationArea:bottomleft /template/ StackPanel#PART_Items">
+        <Setter Property="ReverseOrder" Value="True"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+    </Style>
+
+    <Style Selector="NotificationArea:bottomright /template/ StackPanel#PART_Items">
+        <Setter Property="ReverseOrder" Value="True"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+    </Style>
+</Styles>

From 9ec7c7ce4bf09825ea0682961b1277b0c6ed5457 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 11 Apr 2019 00:15:30 +0100
Subject: [PATCH 05/70] sensible close delay.

---
 src/Avalonia.Controls/Notifications/NotificationManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/NotificationManager.cs b/src/Avalonia.Controls/Notifications/NotificationManager.cs
index 8e6ad0a90b..236d67a35f 100644
--- a/src/Avalonia.Controls/Notifications/NotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationManager.cs
@@ -26,7 +26,7 @@ namespace Avalonia.Controls.Notifications
             }
 
             if (expirationTime == null)
-                expirationTime = TimeSpan.FromSeconds(25);
+                expirationTime = TimeSpan.FromSeconds(5);
 
             if (areaName == string.Empty && _window == null)
             {

From 8283f3bca7c15a66fcb30bbb255a93c833b23a29 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Fri, 12 Apr 2019 00:43:14 +0800
Subject: [PATCH 06/70] Add some bubble notification animations + make
 IsClosing a direct property.

---
 .../Notifications/Notification.cs             | 17 +++++++++--
 .../NotificationArea.xaml                     | 28 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index c7cd176513..fbf28c07e5 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -2,13 +2,14 @@
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Interactivity;
 
 namespace Avalonia.Controls.Notifications
 {
     public class Notification : ContentControl
     {
-        private TimeSpan _closingAnimationTime = TimeSpan.Zero;
+        private TimeSpan _closingAnimationTime = TimeSpan.FromSeconds(0.25);
 
         static Notification()
         {
@@ -42,7 +43,19 @@ namespace Avalonia.Controls.Notifications
                 });
         }
 
-        public bool IsClosing { get; set; }
+        private bool _isClosing;
+
+        /// <summary>
+        /// Determines if the notification is already closing.
+        /// </summary>
+        public bool IsClosing
+        {
+            get { return _isClosing; }
+            private set { SetAndRaise(IsClosingProperty, ref _isClosing, value); }
+        }
+
+        public static readonly DirectProperty<Notification, bool> IsClosingProperty =
+            AvaloniaProperty.RegisterDirect<Notification, bool>(nameof(IsClosing), o => o.IsClosing);
 
         /// <summary>
         /// Defines the <see cref="NotificationCloseInvoked"/> event.
diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
index 3d3f4b8c20..2b2dd2a797 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -28,6 +28,34 @@
                 </Border>
             </ControlTemplate>
         </Setter>
+
+        <Style.Animations>
+          <Animation Duration="0:0:0.200" Easing="CubicEaseInOut">
+            <KeyFrame Cue="0%">
+              <Setter Property="Opacity" Value="0"/>
+              <Setter Property="TranslateTransform.X" Value="250"/>
+            </KeyFrame>
+            <KeyFrame Cue="100%">
+              <Setter Property="Opacity" Value="1"/>
+              <Setter Property="TranslateTransform.X" Value="0"/>
+            </KeyFrame>
+          </Animation>
+        </Style.Animations>
+    </Style>
+
+    <Style Selector="Notification[IsClosing=true]">
+        <Style.Animations>
+          <Animation Duration="0:0:0.150" Easing="CubicEaseInOut" FillMode="Forward">
+            <KeyFrame Cue="0%">             
+              <Setter Property="Opacity" Value="1"/>
+              <Setter Property="TranslateTransform.X" Value="0"/>
+            </KeyFrame>
+            <KeyFrame Cue="100%">
+              <Setter Property="Opacity" Value="0"/>
+              <Setter Property="TranslateTransform.X" Value="250"/>
+            </KeyFrame>
+          </Animation>
+        </Style.Animations>
     </Style>
 
     <Style Selector="Notification /template/ Button#PART_CloseButton">

From 73e5472a5d53fb57efbe4b9a32dacecbadc87075 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 11 Apr 2019 19:16:38 +0100
Subject: [PATCH 07/70] add nice animations with animated stacking.

---
 .../Notifications/Notification.cs             |  2 +-
 .../NotificationArea.xaml                     | 48 ++++++++++---------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index fbf28c07e5..54de4bcce7 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Controls.Notifications
 {
     public class Notification : ContentControl
     {
-        private TimeSpan _closingAnimationTime = TimeSpan.FromSeconds(0.25);
+        private TimeSpan _closingAnimationTime = TimeSpan.FromSeconds(1);
 
         static Notification()
         {
diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
index 2b2dd2a797..12a90c8c94 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -13,8 +13,8 @@
         <Setter Property="Width" Value="350"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="Foreground" Value="White"/>
-        
-       <!-- <Setter Property="ContentTemplateSelector" Value="{StaticResource NotificationTemplateSelector}"/> -->
+
+        <!-- <Setter Property="ContentTemplateSelector" Value="{StaticResource NotificationTemplateSelector}"/> -->
         <Setter Property="Template">
             <ControlTemplate>
                 <Border Background="{TemplateBinding Background}"
@@ -30,31 +30,35 @@
         </Setter>
 
         <Style.Animations>
-          <Animation Duration="0:0:0.200" Easing="CubicEaseInOut">
-            <KeyFrame Cue="0%">
-              <Setter Property="Opacity" Value="0"/>
-              <Setter Property="TranslateTransform.X" Value="250"/>
-            </KeyFrame>
-            <KeyFrame Cue="100%">
-              <Setter Property="Opacity" Value="1"/>
-              <Setter Property="TranslateTransform.X" Value="0"/>
-            </KeyFrame>
-          </Animation>
+            <Animation Duration="0:0:1.0" Easing="CubicEaseInOut" FillMode="Forward">
+                <KeyFrame Cue="0%">
+                    <Setter Property="Opacity" Value="0"/>
+                    <Setter Property="TranslateTransform.X" Value="250"/>
+                    <Setter Property="Height" Value="0"/>
+                </KeyFrame>
+                <KeyFrame Cue="100%">
+                    <Setter Property="Opacity" Value="1"/>
+                    <Setter Property="TranslateTransform.X" Value="0"/>
+                    <Setter Property="Height" Value="100"/>
+                </KeyFrame>
+            </Animation>
         </Style.Animations>
     </Style>
 
     <Style Selector="Notification[IsClosing=true]">
         <Style.Animations>
-          <Animation Duration="0:0:0.150" Easing="CubicEaseInOut" FillMode="Forward">
-            <KeyFrame Cue="0%">             
-              <Setter Property="Opacity" Value="1"/>
-              <Setter Property="TranslateTransform.X" Value="0"/>
-            </KeyFrame>
-            <KeyFrame Cue="100%">
-              <Setter Property="Opacity" Value="0"/>
-              <Setter Property="TranslateTransform.X" Value="250"/>
-            </KeyFrame>
-          </Animation>
+            <Animation Duration="0:0:1.0" Easing="CubicEaseInOut" FillMode="Forward">
+                <KeyFrame Cue="0%">
+                    <Setter Property="Height" Value="100"/>
+                    <Setter Property="Opacity" Value="1"/>
+                    <Setter Property="TranslateTransform.X" Value="0"/>
+                </KeyFrame>
+                <KeyFrame Cue="100%">
+                    <Setter Property="Height" Value="0"/>
+                    <Setter Property="Opacity" Value="0"/>
+                    <Setter Property="TranslateTransform.X" Value="250"/>
+                </KeyFrame>
+            </Animation>
         </Style.Animations>
     </Style>
 

From 6fbe1c2180ef45a940e193f1b4637e64eaab80ed Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Fri, 12 Apr 2019 19:35:31 +0800
Subject: [PATCH 08/70] More animations shenanigans.

---
 .../LayoutTransformControl.cs                 |  1 +
 .../Notifications/Notification.cs             | 32 ++++++++++++++---
 .../NotificationArea.xaml                     | 34 ++++++++++++-------
 3 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Controls/LayoutTransformControl.cs b/src/Avalonia.Controls/LayoutTransformControl.cs
index 950d4f34da..482cfc5320 100644
--- a/src/Avalonia.Controls/LayoutTransformControl.cs
+++ b/src/Avalonia.Controls/LayoutTransformControl.cs
@@ -51,6 +51,7 @@ namespace Avalonia.Controls
         {
             if (TransformRoot == null || LayoutTransform == null)
             {
+                LayoutTransform = RenderTransform;
                 return base.ArrangeOverride(finalSize);
             }
 
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 54de4bcce7..c75e805892 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -9,11 +9,12 @@ namespace Avalonia.Controls.Notifications
 {
     public class Notification : ContentControl
     {
-        private TimeSpan _closingAnimationTime = TimeSpan.FromSeconds(1);
+        // private TimeSpan _closingAnimationTime = TimeSpan.FromSeconds(1);
 
         static Notification()
         {
             //CloseOnClickProperty.Changed.AddClassHandler<Button>(CloseOnClickChanged);
+            IsClosedProperty.Changed.AddClassHandler<Notification>(IsClosedChanged);
         }
 
         public Notification()
@@ -57,6 +58,20 @@ namespace Avalonia.Controls.Notifications
         public static readonly DirectProperty<Notification, bool> IsClosingProperty =
             AvaloniaProperty.RegisterDirect<Notification, bool>(nameof(IsClosing), o => o.IsClosing);
 
+        private bool _isClosed;
+
+        /// <summary>
+        /// Determines if the notification is closed.
+        /// </summary>
+        public bool IsClosed
+        {
+            get { return _isClosed; }
+            set { SetAndRaise(IsClosedProperty, ref _isClosed, value); }
+        }
+
+        public static readonly DirectProperty<Notification, bool> IsClosedProperty =
+            AvaloniaProperty.RegisterDirect<Notification, bool>(nameof(IsClosed), o => o.IsClosed, (o,v) => o.IsClosed = v );
+
         /// <summary>
         /// Defines the <see cref="NotificationCloseInvoked"/> event.
         /// </summary>
@@ -95,7 +110,7 @@ namespace Avalonia.Controls.Notifications
         }*/
 
         //public static readonly AvaloniaProperty CloseOnClickProperty =
-          //  AvaloniaProperty.RegisterDirect<Notification, bool>("CloseOnClick", GetCloseOnClick, SetCloseOnClick);
+        //  AvaloniaProperty.RegisterDirect<Notification, bool>("CloseOnClick", GetCloseOnClick, SetCloseOnClick);
 
         private static void CloseOnClickChanged(Button dependencyObject, AvaloniaPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
@@ -149,8 +164,17 @@ namespace Avalonia.Controls.Notifications
             IsClosing = true;
 
             RaiseEvent(new RoutedEventArgs(NotificationCloseInvokedEvent));
-            await Task.Delay(_closingAnimationTime);
-            RaiseEvent(new RoutedEventArgs(NotificationClosedEvent));
+        }
+
+
+        private static void IsClosedChanged(Notification target, AvaloniaPropertyChangedEventArgs arg2)
+        {
+            if (!target.IsClosing & !target.IsClosed)
+            {
+                return;
+            }
+
+            target.RaiseEvent(new RoutedEventArgs(NotificationClosedEvent));
         }
     }
 }
diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
index 12a90c8c94..9e5030d44b 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -13,14 +13,15 @@
         <Setter Property="Width" Value="350"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="Foreground" Value="White"/>
-
+        <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
+        <Setter Property="Height" Value="100"/>
         <!-- <Setter Property="ContentTemplateSelector" Value="{StaticResource NotificationTemplateSelector}"/> -->
         <Setter Property="Template">
             <ControlTemplate>
-                <Border Background="{TemplateBinding Background}"
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}"
-                Margin="8,8,0,0">
+                <Border Background="{TemplateBinding Background}" 
+                        BorderBrush="{TemplateBinding BorderBrush}" 
+                        BorderThickness="{TemplateBinding BorderThickness}" 
+                        Margin="8,8,0,0">
                     <Grid>
                         <ContentPresenter Content="{TemplateBinding Content}" />
                         <Button Name="PART_CloseButton" Margin="12" Foreground="{TemplateBinding Foreground}" Opacity="0.8"/>
@@ -30,16 +31,16 @@
         </Setter>
 
         <Style.Animations>
-            <Animation Duration="0:0:1.0" Easing="CubicEaseInOut" FillMode="Forward">
+            <Animation Duration="0:0:0.25" Easing="QuadraticEaseIn" FillMode="Forward">
                 <KeyFrame Cue="0%">
                     <Setter Property="Opacity" Value="0"/>
-                    <Setter Property="TranslateTransform.X" Value="250"/>
-                    <Setter Property="Height" Value="0"/>
+                    <Setter Property="ScaleTransform.ScaleX" Value="0.75"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="0.75"/>
                 </KeyFrame>
                 <KeyFrame Cue="100%">
                     <Setter Property="Opacity" Value="1"/>
-                    <Setter Property="TranslateTransform.X" Value="0"/>
-                    <Setter Property="Height" Value="100"/>
+                    <Setter Property="ScaleTransform.ScaleX" Value="1"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
                 </KeyFrame>
             </Animation>
         </Style.Animations>
@@ -47,16 +48,23 @@
 
     <Style Selector="Notification[IsClosing=true]">
         <Style.Animations>
-            <Animation Duration="0:0:1.0" Easing="CubicEaseInOut" FillMode="Forward">
+            <Animation Duration="0:0:0.2" Easing="QuadraticEaseOut" FillMode="Forward">
                 <KeyFrame Cue="0%">
-                    <Setter Property="Height" Value="100"/>
                     <Setter Property="Opacity" Value="1"/>
                     <Setter Property="TranslateTransform.X" Value="0"/>
                 </KeyFrame>
+                <KeyFrame Cue="50%">
+                    <Setter Property="Opacity" Value="0"/>
+                    <Setter Property="TranslateTransform.X" Value="250"/>
+                </KeyFrame>
+                <KeyFrame Cue="60%">
+                    <Setter Property="Height" Value="100"/>
+                </KeyFrame>
                 <KeyFrame Cue="100%">
-                    <Setter Property="Height" Value="0"/>
+                    <Setter Property="IsClosed" Value="True"/>
                     <Setter Property="Opacity" Value="0"/>
                     <Setter Property="TranslateTransform.X" Value="250"/>
+                    <Setter Property="Height" Value="0"/>
                 </KeyFrame>
             </Animation>
         </Style.Animations>

From ff3101de8a39d190f64153fcb8b0dd4f8d6790ce Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Fri, 12 Apr 2019 19:48:55 +0800
Subject: [PATCH 09/70] Quadratic easing + negative slide-in effect.

---
 src/Avalonia.Themes.Default/NotificationArea.xaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
index 9e5030d44b..b0f9a37a6a 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -34,11 +34,16 @@
             <Animation Duration="0:0:0.25" Easing="QuadraticEaseIn" FillMode="Forward">
                 <KeyFrame Cue="0%">
                     <Setter Property="Opacity" Value="0"/>
-                    <Setter Property="ScaleTransform.ScaleX" Value="0.75"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="0.75"/>
+                    <Setter Property="TranslateTransform.Y" Value="-20"/>
+                    <Setter Property="ScaleTransform.ScaleX" Value="0.85"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="0.85"/>
+                </KeyFrame>
+                <KeyFrame Cue="30%">
+                    <Setter Property="TranslateTransform.Y" Value="20"/>
                 </KeyFrame>
                 <KeyFrame Cue="100%">
                     <Setter Property="Opacity" Value="1"/>
+                    <Setter Property="TranslateTransform.Y" Value="0"/>
                     <Setter Property="ScaleTransform.ScaleX" Value="1"/>
                     <Setter Property="ScaleTransform.ScaleY" Value="1"/>
                 </KeyFrame>

From f1cc462abcb41190c1322edbc6899024ca219c65 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 16 Apr 2019 20:51:53 +0100
Subject: [PATCH 10/70] implement MVVM style notifications. (Managed only)

---
 nukebuild/Numerge                             |  2 +-
 samples/ControlCatalog/MainWindow.xaml        |  7 ++++
 samples/ControlCatalog/MainWindow.xaml.cs     | 23 ++----------
 .../ViewModels/MainWindowViewModel.cs         | 35 +++++++++++++++++++
 .../ViewModels/NotificationViewModel.cs       | 12 +++++++
 .../Views/NotificationView.xaml               | 23 ++++++++++++
 .../Views/NotificationView.xaml.cs            | 19 ++++++++++
 .../Notifications/NotificationManager.cs      |  6 ++--
 .../NotificationArea.xaml                     | 12 +++----
 9 files changed, 105 insertions(+), 34 deletions(-)
 create mode 100644 samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
 create mode 100644 samples/ControlCatalog/ViewModels/NotificationViewModel.cs
 create mode 100644 samples/ControlCatalog/Views/NotificationView.xaml
 create mode 100644 samples/ControlCatalog/Views/NotificationView.xaml.cs

diff --git a/nukebuild/Numerge b/nukebuild/Numerge
index aef10ae67d..4464343aef 160000
--- a/nukebuild/Numerge
+++ b/nukebuild/Numerge
@@ -1 +1 @@
-Subproject commit aef10ae67dc55c95f49b52a505a0be33bfa297a5
+Subproject commit 4464343aef5c8ab7a42fcb20a483a6058199f8b8
diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index ae9574189a..86ca8c16ac 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -3,7 +3,14 @@
         Icon="/Assets/test_icon.ico"
         xmlns:local="clr-namespace:ControlCatalog"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
+        xmlns:v="clr-namespace:ControlCatalog.Views"
         x:Class="ControlCatalog.MainWindow">
+    <Window.DataTemplates>
+        <DataTemplate DataType="vm:NotificationViewModel">
+            <v:NotificationView />
+        </DataTemplate>
+    </Window.DataTemplates>
     <Panel>
         <local:MainView/>
         <NotificationArea Name="Main" Position="TopRight" MaxItems="5" />
diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index 4057af59ff..02cc692949 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
 using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
+using ControlCatalog.ViewModels;
 using System;
 using System.Threading.Tasks;
 
@@ -10,8 +11,6 @@ namespace ControlCatalog
 {
     public class MainWindow : Window
     {
-        private readonly NotificationManager _notificationManager = new NotificationManager();
-
         public MainWindow()
         {
             this.InitializeComponent();
@@ -19,25 +18,7 @@ namespace ControlCatalog
             //Renderer.DrawFps = true;
             //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
 
-            Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                await Task.Delay(5000);
-
-                _notificationManager.Show(new NotificationContent { Message = "Test1", Type = NotificationType.Information }, "Main");
-
-                await Task.Delay(500);
-                _notificationManager.Show(new NotificationContent { Message = "Test2", Type = NotificationType.Error }, "Main");
-
-                await Task.Delay(500);
-                _notificationManager.Show(new NotificationContent { Message = "Test3", Type = NotificationType.Warning }, "Main");
-
-                await Task.Delay(500);
-                _notificationManager.Show(new NotificationContent { Message = "Test4", Type = NotificationType.Success }, "Main");
-
-                await Task.Delay(500);
-                _notificationManager.Show("Test5", "Main");
-
-            });
+            DataContext = new MainWindowViewModel();
         }
 
         private void InitializeComponent()
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
new file mode 100644
index 0000000000..5335d1cacc
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls.Notifications;
+using Avalonia.Threading;
+
+namespace ControlCatalog.ViewModels
+{
+    class MainWindowViewModel
+    {
+        public MainWindowViewModel()
+        {
+            Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                await Task.Delay(5000);
+
+                NotificationManager.Instance.Show(new NotificationViewModel { Title = "Warning", Message = "Please save your work before closing." }, "Main");
+
+                await Task.Delay(1500);
+                NotificationManager.Instance.Show(new NotificationContent { Message = "Test2", Type = NotificationType.Error }, "Main");
+
+                await Task.Delay(2000);
+                NotificationManager.Instance.Show(new NotificationContent { Message = "Test3", Type = NotificationType.Warning }, "Main");
+
+                await Task.Delay(2500);
+                NotificationManager.Instance.Show(new NotificationContent { Message = "Test4", Type = NotificationType.Success }, "Main");
+
+                await Task.Delay(500);
+                NotificationManager.Instance.Show("Test5", "Main");
+
+            });
+        }
+    }
+}
diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
new file mode 100644
index 0000000000..4ce41b5566
--- /dev/null
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ControlCatalog.ViewModels
+{
+    public class NotificationViewModel
+    {
+        public string Title { get; set; }
+        public string Message { get; set; }
+    }
+}
diff --git a/samples/ControlCatalog/Views/NotificationView.xaml b/samples/ControlCatalog/Views/NotificationView.xaml
new file mode 100644
index 0000000000..45210a338c
--- /dev/null
+++ b/samples/ControlCatalog/Views/NotificationView.xaml
@@ -0,0 +1,23 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Views.NotificationView">
+    <Border Padding="12" MinHeight="20" Background="#FF444444">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <ContentControl Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
+                <TextBlock Text="&#xE115;" FontFamily="Segoe UI Symbol" FontSize="20" TextAlignment="Center" VerticalAlignment="Center"/>
+            </ContentControl>
+            <DockPanel Grid.Column="1">
+                <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
+                <DockPanel LastChildFill="False" DockPanel.Dock="Bottom" Margin="0,8,0,0">
+                    <Button x:Name="Ok" Content="Ok" DockPanel.Dock="Right"  />
+                    <Button x:Name="Cancel" Content="Cancel" DockPanel.Dock="Right" Margin="0,0,8,0" />
+                </DockPanel>
+                <TextBlock Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,8,0,0"/>
+            </DockPanel>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/samples/ControlCatalog/Views/NotificationView.xaml.cs b/samples/ControlCatalog/Views/NotificationView.xaml.cs
new file mode 100644
index 0000000000..f1e047a759
--- /dev/null
+++ b/samples/ControlCatalog/Views/NotificationView.xaml.cs
@@ -0,0 +1,19 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Views
+{
+    public class NotificationView : UserControl
+    {
+        public NotificationView()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationManager.cs b/src/Avalonia.Controls/Notifications/NotificationManager.cs
index 236d67a35f..2df5bee4ae 100644
--- a/src/Avalonia.Controls/Notifications/NotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -11,9 +11,7 @@ namespace Avalonia.Controls.Notifications
         private static readonly List<NotificationArea> Areas = new List<NotificationArea>();
         private static Window _window;
 
-        public NotificationManager()
-        {
-        }
+        public static NotificationManager Instance = new NotificationManager();
 
         public void Show(object content, string areaName = "", TimeSpan? expirationTime = null, Action onClick = null,
             Action onClose = null)
diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
index b0f9a37a6a..ea0307d0a2 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -14,24 +14,20 @@
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="Foreground" Value="White"/>
         <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
-        <Setter Property="Height" Value="100"/>
-        <!-- <Setter Property="ContentTemplateSelector" Value="{StaticResource NotificationTemplateSelector}"/> -->
+        <Setter Property="MinHeight" Value="100"/>
         <Setter Property="Template">
             <ControlTemplate>
                 <Border Background="{TemplateBinding Background}" 
                         BorderBrush="{TemplateBinding BorderBrush}" 
                         BorderThickness="{TemplateBinding BorderThickness}" 
                         Margin="8,8,0,0">
-                    <Grid>
-                        <ContentPresenter Content="{TemplateBinding Content}" />
-                        <Button Name="PART_CloseButton" Margin="12" Foreground="{TemplateBinding Foreground}" Opacity="0.8"/>
-                    </Grid>
+                    <ContentControl Content="{TemplateBinding Content}" />
                 </Border>
             </ControlTemplate>
         </Setter>
 
         <Style.Animations>
-            <Animation Duration="0:0:0.25" Easing="QuadraticEaseIn" FillMode="Forward">
+            <Animation Duration="0:0:0.45" Easing="QuadraticEaseIn" FillMode="Forward">
                 <KeyFrame Cue="0%">
                     <Setter Property="Opacity" Value="0"/>
                     <Setter Property="TranslateTransform.Y" Value="-20"/>
@@ -53,7 +49,7 @@
 
     <Style Selector="Notification[IsClosing=true]">
         <Style.Animations>
-            <Animation Duration="0:0:0.2" Easing="QuadraticEaseOut" FillMode="Forward">
+            <Animation Duration="0:0:0.7" Easing="QuadraticEaseOut" FillMode="Forward">
                 <KeyFrame Cue="0%">
                     <Setter Property="Opacity" Value="1"/>
                     <Setter Property="TranslateTransform.X" Value="0"/>

From b6fc0d7857473655426286c31ea0c7bcfed706a7 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 16 Apr 2019 21:39:28 +0100
Subject: [PATCH 11/70] NotificationContent template works

---
 .../ViewModels/NotificationViewModel.cs       | 17 +++++--
 .../Views/NotificationView.xaml               | 14 ++----
 .../Views/NotificationView.xaml.cs            |  1 -
 .../Notifications/Notification.cs             | 50 ++++++++-----------
 .../Notifications/NotificationArea.cs         | 12 -----
 .../Notifications/NotificationManager.cs      |  3 +-
 .../NotificationArea.xaml                     | 18 ++++++-
 7 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
index 4ce41b5566..c444147d1f 100644
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -1,12 +1,23 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Reactive;
+using Avalonia.Controls.Notifications;
+using ReactiveUI;
 
 namespace ControlCatalog.ViewModels
 {
     public class NotificationViewModel
     {
+        public NotificationViewModel()
+        {
+            OKCommand = ReactiveCommand.Create(() =>
+            {
+                NotificationManager.Instance.Show("Notification Accepted", "Main");
+            });
+        }
+
         public string Title { get; set; }
         public string Message { get; set; }
+
+        public ReactiveCommand<Unit, Unit> OKCommand { get; }
+
     }
 }
diff --git a/samples/ControlCatalog/Views/NotificationView.xaml b/samples/ControlCatalog/Views/NotificationView.xaml
index 45210a338c..be0a613c57 100644
--- a/samples/ControlCatalog/Views/NotificationView.xaml
+++ b/samples/ControlCatalog/Views/NotificationView.xaml
@@ -2,19 +2,15 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Views.NotificationView">
     <Border Padding="12" MinHeight="20" Background="#FF444444">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-            <ContentControl Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
+        <Grid ColumnDefinitions="Auto,*">
+            <Panel Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
                 <TextBlock Text="&#xE115;" FontFamily="Segoe UI Symbol" FontSize="20" TextAlignment="Center" VerticalAlignment="Center"/>
-            </ContentControl>
+            </Panel>
             <DockPanel Grid.Column="1">
                 <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
                 <DockPanel LastChildFill="False" DockPanel.Dock="Bottom" Margin="0,8,0,0">
-                    <Button x:Name="Ok" Content="Ok" DockPanel.Dock="Right"  />
-                    <Button x:Name="Cancel" Content="Cancel" DockPanel.Dock="Right" Margin="0,0,8,0" />
+                    <Button Content="Ok" DockPanel.Dock="Right" Notification.CloseOnClick="True" Command="{Binding OKCommand}" />
+                    <Button Content="Cancel" DockPanel.Dock="Right" Notification.CloseOnClick="True" Margin="0,0,8,0" />
                 </DockPanel>
                 <TextBlock Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,8,0,0"/>
             </DockPanel>
diff --git a/samples/ControlCatalog/Views/NotificationView.xaml.cs b/samples/ControlCatalog/Views/NotificationView.xaml.cs
index f1e047a759..e5ab408af9 100644
--- a/samples/ControlCatalog/Views/NotificationView.xaml.cs
+++ b/samples/ControlCatalog/Views/NotificationView.xaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Markup.Xaml;
 
 namespace ControlCatalog.Views
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index c75e805892..dd96bea89c 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -1,19 +1,16 @@
 using System;
+using System.Linq;
 using System.Reactive.Linq;
-using System.Threading.Tasks;
 using Avalonia.Controls.Primitives;
-using Avalonia.Data;
 using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
 
 namespace Avalonia.Controls.Notifications
 {
     public class Notification : ContentControl
     {
-        // private TimeSpan _closingAnimationTime = TimeSpan.FromSeconds(1);
-
         static Notification()
         {
-            //CloseOnClickProperty.Changed.AddClassHandler<Button>(CloseOnClickChanged);
             IsClosedProperty.Changed.AddClassHandler<Notification>(IsClosedChanged);
         }
 
@@ -70,7 +67,7 @@ namespace Avalonia.Controls.Notifications
         }
 
         public static readonly DirectProperty<Notification, bool> IsClosedProperty =
-            AvaloniaProperty.RegisterDirect<Notification, bool>(nameof(IsClosed), o => o.IsClosed, (o,v) => o.IsClosed = v );
+            AvaloniaProperty.RegisterDirect<Notification, bool>(nameof(IsClosed), o => o.IsClosed, (o, v) => o.IsClosed = v);
 
         /// <summary>
         /// Defines the <see cref="NotificationCloseInvoked"/> event.
@@ -99,7 +96,7 @@ namespace Avalonia.Controls.Notifications
             remove { RemoveHandler(NotificationClosedEvent, value); }
         }
 
-        /*public static bool GetCloseOnClick(Notification obj)
+        public static bool GetCloseOnClick(Notification obj)
         {
             return (bool)obj.GetValue(CloseOnClickProperty);
         }
@@ -107,29 +104,30 @@ namespace Avalonia.Controls.Notifications
         public static void SetCloseOnClick(Notification obj, bool value)
         {
             obj.SetValue(CloseOnClickProperty, value);
-        }*/
+        }
 
-        //public static readonly AvaloniaProperty CloseOnClickProperty =
-        //  AvaloniaProperty.RegisterDirect<Notification, bool>("CloseOnClick", GetCloseOnClick, SetCloseOnClick);
+        public static readonly AvaloniaProperty CloseOnClickProperty =
+          AvaloniaProperty.RegisterAttached<Button, bool>("CloseOnClick", typeof(Notification), validate: CloseOnClickChanged);
 
-        private static void CloseOnClickChanged(Button dependencyObject, AvaloniaPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        private static bool CloseOnClickChanged(Button button, bool value)
         {
-            var button = dependencyObject as Button;
-            if (button == null)
+            if (value)
             {
-                return;
+                button.Click += Button_Click;
             }
-
-            var value = (bool)dependencyPropertyChangedEventArgs.NewValue;
-
-            if (value)
+            else
             {
-                button.Click += (sender, args) =>
-                {
-                    var notification = button.Parent as Notification;
-                    notification?.Close();
-                };
+                button.Click -= Button_Click;
             }
+
+            return true;
+        }
+
+        private static void Button_Click(object sender, RoutedEventArgs e)
+        {
+            var btn = sender as ILogical;
+            var notification = btn.GetLogicalAncestors().OfType<Notification>().FirstOrDefault();
+            notification?.Close();
         }
 
         protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
@@ -139,9 +137,6 @@ namespace Avalonia.Controls.Notifications
             if (closeButton != null)
                 closeButton.Click += OnCloseButtonOnClick;
 
-            //var storyboards = Template.Triggers.OfType<EventTrigger>().FirstOrDefault(t => t.RoutedEvent == NotificationCloseInvokedEvent)?.Actions.OfType<BeginStoryboard>().Select(a => a.Storyboard);
-            //_closingAnimationTime = new TimeSpan(storyboards?.Max(s => Math.Min((s.Duration.HasTimeSpan ? s.Duration.TimeSpan + (s.BeginTime ?? TimeSpan.Zero) : TimeSpan.MaxValue).Ticks, s.Children.Select(ch => ch.Duration.TimeSpan + (s.BeginTime ?? TimeSpan.Zero)).Max().Ticks)) ?? 0);
-
         }
 
         private void OnCloseButtonOnClick(object sender, RoutedEventArgs args)
@@ -154,7 +149,7 @@ namespace Avalonia.Controls.Notifications
             Close();
         }
 
-        public async void Close()
+        public void Close()
         {
             if (IsClosing)
             {
@@ -166,7 +161,6 @@ namespace Avalonia.Controls.Notifications
             RaiseEvent(new RoutedEventArgs(NotificationCloseInvokedEvent));
         }
 
-
         private static void IsClosedChanged(Notification target, AvaloniaPropertyChangedEventArgs arg2)
         {
             if (!target.IsClosing & !target.IsClosed)
diff --git a/src/Avalonia.Controls/Notifications/NotificationArea.cs b/src/Avalonia.Controls/Notifications/NotificationArea.cs
index 2b58aed639..eb71f840bc 100644
--- a/src/Avalonia.Controls/Notifications/NotificationArea.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationArea.cs
@@ -68,18 +68,6 @@ namespace Avalonia.Controls.Notifications
             notification.NotificationClosed += (sender, args) => onClose?.Invoke();
             notification.NotificationClosed += OnNotificationClosed;
 
-            /*if (!this.)
-            {
-                return;
-            }*/
-
-            /*var w = this.VisualRoot Window.GetWindow(this);
-            var x = PresentationSource.FromVisual(w);
-            if (x == null)
-            {
-                return;
-            }*/
-
             lock (_items)
             {
                 _items.Add(notification);
diff --git a/src/Avalonia.Controls/Notifications/NotificationManager.cs b/src/Avalonia.Controls/Notifications/NotificationManager.cs
index 2df5bee4ae..6de3149e5b 100644
--- a/src/Avalonia.Controls/Notifications/NotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationManager.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Avalonia.Threading;
 
 namespace Avalonia.Controls.Notifications
@@ -32,7 +31,7 @@ namespace Avalonia.Controls.Notifications
 
                 _window = new Window
                 {
-                    Position =  workArea.Position,
+                    Position = workArea.Position,
                     Width = workArea.Width,
                     Height = workArea.Height
                 };
diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
index ea0307d0a2..755b8f610d 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -3,7 +3,23 @@
         <Setter Property="Margin" Value="0 0 8 8"/>
         <Setter Property="Template">
             <ControlTemplate>
-                <StackPanel Name="PART_Items" />
+                <StackPanel Name="PART_Items">
+                    <StackPanel.DataTemplates>
+                        <DataTemplate DataType="NotificationContent">
+                            <Border Padding="12" MinHeight="80">
+                                <Grid ColumnDefinitions="Auto,*">
+                                    <ContentControl Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
+                                        <ContentControl HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    </ContentControl>
+                                    <DockPanel Grid.Column="1">
+                                        <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
+                                        <TextBlock Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,0,12,0"/>
+                                    </DockPanel>
+                                </Grid>
+                            </Border>
+                        </DataTemplate>
+                    </StackPanel.DataTemplates>
+                </StackPanel>
             </ControlTemplate>
         </Setter>
     </Style>

From d0a8da1e8c5feb77b23f2a5fd3d04b988c06fc8b Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 16 Apr 2019 21:59:15 +0100
Subject: [PATCH 12/70] fix animating height

---
 src/Avalonia.Themes.Default/NotificationArea.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
index 755b8f610d..a6143e1a30 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -30,7 +30,7 @@
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="Foreground" Value="White"/>
         <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
-        <Setter Property="MinHeight" Value="100"/>
+        <Setter Property="Height" Value="150"/>
         <Setter Property="Template">
             <ControlTemplate>
                 <Border Background="{TemplateBinding Background}" 

From 29746bbed1f158251f68562687541624ce249390 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 18 Apr 2019 23:57:24 +0800
Subject: [PATCH 13/70] Add "UseRenderTransform" property for
 LayoutTransformControl. Wire up the style animation to use that property.

---
 .../LayoutTransformControl.cs                 | 49 +++++++++++++++++++
 .../NotificationArea.xaml                     | 38 +++++++-------
 2 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/src/Avalonia.Controls/LayoutTransformControl.cs b/src/Avalonia.Controls/LayoutTransformControl.cs
index 482cfc5320..07372eb714 100644
--- a/src/Avalonia.Controls/LayoutTransformControl.cs
+++ b/src/Avalonia.Controls/LayoutTransformControl.cs
@@ -20,6 +20,9 @@ namespace Avalonia.Controls
         public static readonly AvaloniaProperty<Transform> LayoutTransformProperty =
             AvaloniaProperty.Register<LayoutTransformControl, Transform>(nameof(LayoutTransform));
 
+        public static readonly AvaloniaProperty<bool> UseRenderTransformProperty =
+            AvaloniaProperty.Register<LayoutTransformControl, bool>(nameof(LayoutTransform));
+
         static LayoutTransformControl()
         {
             ClipToBoundsProperty.OverrideDefaultValue<LayoutTransformControl>(true);
@@ -29,6 +32,7 @@ namespace Avalonia.Controls
 
             ChildProperty.Changed
                 .AddClassHandler<LayoutTransformControl>(x => x.OnChildChanged);
+            UseRenderTransformProperty.Changed.AddClassHandler<LayoutTransformControl>(x => x.OnUseRenderTransformPropertyChanged);
         }
 
         /// <summary>
@@ -40,6 +44,15 @@ namespace Avalonia.Controls
             set { SetValue(LayoutTransformProperty, value); }
         }
 
+        /// <summary>
+        /// Utilize the <see cref="RenderTransformProperty"/> for layout transforms.
+        /// </summary>
+        public bool UseRenderTransform
+        {
+            get { return GetValue(UseRenderTransformProperty); }
+            set { SetValue(UseRenderTransformProperty, value); }
+        }
+
         public IControl TransformRoot => Child;
 
         /// <summary>
@@ -134,6 +147,42 @@ namespace Avalonia.Controls
             return transformedDesiredSize;
         }
 
+        IDisposable _renderTransformChangedEvent;
+
+        private void OnUseRenderTransformPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            // HACK: In theory, this method and the UseRenderTransform shouldn't exist but
+            //       it's hard to animate this particular control with style animations without
+            //       PropertyPaths.
+            //
+            //       So until we get that implemented, we'll stick on this not-so-good
+            //       workaround.
+
+            var target = e.Sender as LayoutTransformControl;
+            var shouldUseRenderTransform = (bool)e.NewValue;
+            if (target != null)
+            {
+                if (shouldUseRenderTransform)
+                {
+                    _renderTransformChangedEvent = RenderTransformProperty.Changed
+                            .Subscribe(
+                                (x) =>
+                                {
+                                    var target2 = x.Sender as LayoutTransformControl;
+                                    if (target2 != null)
+                                    {
+                                        target2.LayoutTransform = target2.RenderTransform;
+                                    }
+                                });
+                }
+                else
+                {
+                    _renderTransformChangedEvent?.Dispose();
+                    LayoutTransform = null;
+                }
+            }
+        }
+
         private void OnChildChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (null != TransformRoot)
diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
index a6143e1a30..13adbbc0b6 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -30,20 +30,18 @@
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="Foreground" Value="White"/>
         <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
-        <Setter Property="Height" Value="150"/>
         <Setter Property="Template">
             <ControlTemplate>
-                <Border Background="{TemplateBinding Background}" 
-                        BorderBrush="{TemplateBinding BorderBrush}" 
-                        BorderThickness="{TemplateBinding BorderThickness}" 
-                        Margin="8,8,0,0">
-                    <ContentControl Content="{TemplateBinding Content}" />
-                </Border>
+                <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="8,8,0,0">
+                        <ContentControl MinHeight="150" Content="{TemplateBinding Content}" />
+                    </Border>
+                </LayoutTransformControl>
             </ControlTemplate>
         </Setter>
 
         <Style.Animations>
-            <Animation Duration="0:0:0.45" Easing="QuadraticEaseIn" FillMode="Forward">
+            <Animation Duration="0:0:0.35" Easing="QuadraticEaseIn" FillMode="Forward">
                 <KeyFrame Cue="0%">
                     <Setter Property="Opacity" Value="0"/>
                     <Setter Property="TranslateTransform.Y" Value="-20"/>
@@ -63,25 +61,27 @@
         </Style.Animations>
     </Style>
 
-    <Style Selector="Notification[IsClosing=true]">
+    <Style Selector="Notification[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
+        <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
         <Style.Animations>
-            <Animation Duration="0:0:0.7" Easing="QuadraticEaseOut" FillMode="Forward">
+            <Animation Duration="0:0:0.25" Easing="QuadraticEaseOut" FillMode="Forward">
                 <KeyFrame Cue="0%">
                     <Setter Property="Opacity" Value="1"/>
-                    <Setter Property="TranslateTransform.X" Value="0"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
                 </KeyFrame>
-                <KeyFrame Cue="50%">
+                <KeyFrame Cue="100%">
                     <Setter Property="Opacity" Value="0"/>
-                    <Setter Property="TranslateTransform.X" Value="250"/>
-                </KeyFrame>
-                <KeyFrame Cue="60%">
-                    <Setter Property="Height" Value="100"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="0"/>
                 </KeyFrame>
+            </Animation>
+        </Style.Animations>
+    </Style>
+
+    <Style Selector="Notification[IsClosing=true]">
+        <Style.Animations>
+            <Animation Duration="0:0:0.25" Easing="QuadraticEaseOut" FillMode="Forward">
                 <KeyFrame Cue="100%">
                     <Setter Property="IsClosed" Value="True"/>
-                    <Setter Property="Opacity" Value="0"/>
-                    <Setter Property="TranslateTransform.X" Value="250"/>
-                    <Setter Property="Height" Value="0"/>
                 </KeyFrame>
             </Animation>
         </Style.Animations>

From 0201f90051e1f6d5ae6cdcd8bb1a84c10c6838ce Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 22 Apr 2019 13:36:12 +0100
Subject: [PATCH 14/70] add notification managers to toplevel.

---
 .../Notifications/INotificationManager.cs     |  2 +-
 src/Avalonia.Controls/TopLevel.cs             | 44 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
index e0b73d6293..3ea690388d 100644
--- a/src/Avalonia.Controls/Notifications/INotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -2,7 +2,7 @@
 
 namespace Avalonia.Controls.Notifications
 {
-    interface INotificationManager
+    public interface INotificationManager
     {
         void Show(object content, string areaName = "", TimeSpan? expirationTime = null, Action onClick = null, Action onClose = null);
     }
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 32c40847c5..f29da746ab 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Reactive.Linq;
+using Avalonia.Controls.Notifications;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
@@ -46,12 +47,26 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IInputElement> PointerOverElementProperty =
             AvaloniaProperty.Register<TopLevel, IInputElement>(nameof(IInputRoot.PointerOverElement));
 
+        /// <summary>
+        /// Defines the <see cref="LocalNotificationManager"/> property.
+        /// </summary>
+        public static readonly DirectProperty<TopLevel, INotificationManager> LocalNotificationManagerProperty =
+            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(LocalNotificationManager), o => o.LocalNotificationManager);
+
+        /// <summary>
+        /// Defines the <see cref="SystemNotificationManager"/> property.
+        /// </summary>
+        public static readonly DirectProperty<TopLevel, INotificationManager> SystemNotificationManagerProperty =
+            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(SystemNotificationManager), o => o.SystemNotificationManager);
+
         private readonly IInputManager _inputManager;
         private readonly IAccessKeyHandler _accessKeyHandler;
         private readonly IKeyboardNavigationHandler _keyboardNavigationHandler;
         private readonly IApplicationLifecycle _applicationLifecycle;
         private readonly IPlatformRenderInterface _renderInterface;
         private Size _clientSize;
+        private INotificationManager _localNotificationManager;
+        private INotificationManager _systemNotificationManager;
         private ILayoutManager _layoutManager;
 
         /// <summary>
@@ -87,6 +102,9 @@ namespace Avalonia.Controls
             }
 
             PlatformImpl = impl;
+
+            _localNotificationManager = new NotificationManager();
+
             dependencyResolver = dependencyResolver ?? AvaloniaLocator.Current;
             var styler = TryGetService<IStyler>(dependencyResolver);
 
@@ -96,6 +114,13 @@ namespace Avalonia.Controls
             _applicationLifecycle = TryGetService<IApplicationLifecycle>(dependencyResolver);
             _renderInterface = TryGetService<IPlatformRenderInterface>(dependencyResolver);
 
+            _systemNotificationManager = TryGetService<INotificationManager>(dependencyResolver);
+
+            if(_systemNotificationManager == null)
+            {
+                _systemNotificationManager = _localNotificationManager;
+            }
+
             Renderer = impl.CreateRenderer(this);
 
             if (Renderer != null)
@@ -155,6 +180,25 @@ namespace Avalonia.Controls
             protected set { SetAndRaise(ClientSizeProperty, ref _clientSize, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the Local (in window managed) notification manager.
+        /// </summary>
+        public INotificationManager LocalNotificationManager
+        {
+            get => _localNotificationManager;
+            protected set => SetAndRaise(LocalNotificationManagerProperty, ref _localNotificationManager, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the System (native os) notification manager. If the system doesnt natively support notifications then this property
+        /// will match the <see cref="LocalNotificationManager"/>.
+        /// </summary>
+        public INotificationManager SystemNotificationManager
+        {
+            get => _systemNotificationManager;
+            protected set => SetAndRaise(SystemNotificationManagerProperty, ref _systemNotificationManager, value);
+        }
+
         public ILayoutManager LayoutManager
         {
             get

From 2b7e3db469115aac3d24ab6f4f9f8e1dc8374e3a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 22 Apr 2019 15:12:44 +0100
Subject: [PATCH 15/70] correctly set notification manager properties.

---
 src/Avalonia.Controls/TopLevel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index f29da746ab..732363466a 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -103,7 +103,7 @@ namespace Avalonia.Controls
 
             PlatformImpl = impl;
 
-            _localNotificationManager = new NotificationManager();
+            LocalNotificationManager = new NotificationManager();
 
             dependencyResolver = dependencyResolver ?? AvaloniaLocator.Current;
             var styler = TryGetService<IStyler>(dependencyResolver);
@@ -118,7 +118,7 @@ namespace Avalonia.Controls
 
             if(_systemNotificationManager == null)
             {
-                _systemNotificationManager = _localNotificationManager;
+                SystemNotificationManager = _localNotificationManager;
             }
 
             Renderer = impl.CreateRenderer(this);

From 9772f1584def3ae029e61b9bad402171db313bf6 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 25 Apr 2019 21:33:07 +0100
Subject: [PATCH 16/70] remove demo notification area.

---
 samples/ControlCatalog/MainWindow.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 86ca8c16ac..49d0ee72ff 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -13,6 +13,5 @@
     </Window.DataTemplates>
     <Panel>
         <local:MainView/>
-        <NotificationArea Name="Main" Position="TopRight" MaxItems="5" />
     </Panel>
 </Window>

From 351f5d10f01eb1ae8d1d5a07aa6edf416089b218 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 25 Apr 2019 21:33:41 +0100
Subject: [PATCH 17/70] AdornerDecorator passes on OnAttachedToLogicalTree to
 the AdornerLayer

---
 src/Avalonia.Controls/Primitives/AdornerDecorator.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Avalonia.Controls/Primitives/AdornerDecorator.cs b/src/Avalonia.Controls/Primitives/AdornerDecorator.cs
index 87082fd02c..4608d64806 100644
--- a/src/Avalonia.Controls/Primitives/AdornerDecorator.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerDecorator.cs
@@ -1,6 +1,8 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Avalonia.LogicalTree;
+
 namespace Avalonia.Controls.Primitives
 {
     public class AdornerDecorator : Decorator
@@ -13,6 +15,13 @@ namespace Avalonia.Controls.Primitives
             VisualChildren.Add(AdornerLayer);
         }
 
+        protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToLogicalTree(e);
+
+            ((ILogical)AdornerLayer).NotifyAttachedToLogicalTree(e);
+        }
+
         public AdornerLayer AdornerLayer
         {
             get;

From 93a320522f1b93ccbb96a2ab1eeb2a3d9c21d287 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 25 Apr 2019 21:34:26 +0100
Subject: [PATCH 18/70] AdornerLayer inherits Canvas so controls can be placed
 anywhere inside the layer.

---
 src/Avalonia.Controls/Primitives/AdornerLayer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index ed590679cd..8a724926e8 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -4,14 +4,14 @@
 using System;
 using System.Collections.Specialized;
 using System.Linq;
-using Avalonia.VisualTree;
 using Avalonia.Media;
 using Avalonia.Rendering;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
 {
     // TODO: Need to track position of adorned elements and move the adorner if they move.
-    public class AdornerLayer : Panel, ICustomSimpleHitTest
+    public class AdornerLayer : Canvas, ICustomSimpleHitTest
     {
         public static readonly AttachedProperty<Visual> AdornedElementProperty =
             AvaloniaProperty.RegisterAttached<AdornerLayer, Visual, Visual>("AdornedElement");

From 962ed29bb6f68f7c30dc21f9d43468b3059a330d Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 25 Apr 2019 21:48:26 +0100
Subject: [PATCH 19/70] remove need for seperate NotificationManager class.

---
 .../ViewModels/MainWindowViewModel.cs         | 12 +++--
 .../ViewModels/NotificationViewModel.cs       |  3 +-
 .../Notifications/INotificationManager.cs     |  2 +-
 .../Notifications/NotificationArea.cs         |  8 +--
 .../Notifications/NotificationManager.cs      | 53 -------------------
 src/Avalonia.Controls/TopLevel.cs             | 18 ++++++-
 6 files changed, 31 insertions(+), 65 deletions(-)
 delete mode 100644 src/Avalonia.Controls/Notifications/NotificationManager.cs

diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 5335d1cacc..a514b4d621 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
+using Avalonia;
 using Avalonia.Controls.Notifications;
 using Avalonia.Threading;
 
@@ -15,19 +16,20 @@ namespace ControlCatalog.ViewModels
             {
                 await Task.Delay(5000);
 
-                NotificationManager.Instance.Show(new NotificationViewModel { Title = "Warning", Message = "Please save your work before closing." }, "Main");
+                
+                Application.Current.MainWindow.LocalNotificationManager.Show(new NotificationViewModel { Title = "Warning", Message = "Please save your work before closing." });
 
                 await Task.Delay(1500);
-                NotificationManager.Instance.Show(new NotificationContent { Message = "Test2", Type = NotificationType.Error }, "Main");
+                Application.Current.MainWindow.LocalNotificationManager.Show(new NotificationContent { Message = "Test2", Type = NotificationType.Error });
 
                 await Task.Delay(2000);
-                NotificationManager.Instance.Show(new NotificationContent { Message = "Test3", Type = NotificationType.Warning }, "Main");
+                Application.Current.MainWindow.LocalNotificationManager.Show(new NotificationContent { Message = "Test3", Type = NotificationType.Warning });
 
                 await Task.Delay(2500);
-                NotificationManager.Instance.Show(new NotificationContent { Message = "Test4", Type = NotificationType.Success }, "Main");
+                Application.Current.MainWindow.LocalNotificationManager.Show(new NotificationContent { Message = "Test4", Type = NotificationType.Success });
 
                 await Task.Delay(500);
-                NotificationManager.Instance.Show("Test5", "Main");
+                Application.Current.MainWindow.LocalNotificationManager.Show("Test5");
 
             });
         }
diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
index c444147d1f..8a82a82447 100644
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -1,4 +1,5 @@
 using System.Reactive;
+using Avalonia;
 using Avalonia.Controls.Notifications;
 using ReactiveUI;
 
@@ -10,7 +11,7 @@ namespace ControlCatalog.ViewModels
         {
             OKCommand = ReactiveCommand.Create(() =>
             {
-                NotificationManager.Instance.Show("Notification Accepted", "Main");
+                Application.Current.MainWindow.LocalNotificationManager.Show("Notification Accepted");
             });
         }
 
diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
index 3ea690388d..4de8cb8067 100644
--- a/src/Avalonia.Controls/Notifications/INotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -4,6 +4,6 @@ namespace Avalonia.Controls.Notifications
 {
     public interface INotificationManager
     {
-        void Show(object content, string areaName = "", TimeSpan? expirationTime = null, Action onClick = null, Action onClose = null);
+        void Show(object content, TimeSpan? expirationTime = null, Action onClick = null, Action onClose = null);
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/NotificationArea.cs b/src/Avalonia.Controls/Notifications/NotificationArea.cs
index eb71f840bc..c641e09b02 100644
--- a/src/Avalonia.Controls/Notifications/NotificationArea.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationArea.cs
@@ -7,7 +7,7 @@ using Avalonia.Interactivity;
 
 namespace Avalonia.Controls.Notifications
 {
-    public class NotificationArea : TemplatedControl
+    public class NotificationArea : TemplatedControl, INotificationManager
     {
         private IList _items;
 
@@ -31,7 +31,6 @@ namespace Avalonia.Controls.Notifications
 
         public NotificationArea()
         {
-            NotificationManager.AddArea(this);
         }
 
         static NotificationArea()
@@ -50,7 +49,7 @@ namespace Avalonia.Controls.Notifications
             _items = itemsControl?.Children;
         }
 
-        public async void Show(object content, TimeSpan expirationTime, Action onClick, Action onClose)
+        public async void Show(object content, TimeSpan? expirationTime, Action onClick, Action onClose)
         {
             var notification = new Notification
             {
@@ -82,7 +81,8 @@ namespace Avalonia.Controls.Notifications
             {
                 return;
             }
-            await Task.Delay(expirationTime);
+
+            await Task.Delay(expirationTime ?? TimeSpan.FromSeconds(5));
 
             notification.Close();
         }
diff --git a/src/Avalonia.Controls/Notifications/NotificationManager.cs b/src/Avalonia.Controls/Notifications/NotificationManager.cs
deleted file mode 100644
index 6de3149e5b..0000000000
--- a/src/Avalonia.Controls/Notifications/NotificationManager.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Threading;
-
-namespace Avalonia.Controls.Notifications
-{
-    public class NotificationManager : INotificationManager
-    {
-        private static readonly List<NotificationArea> Areas = new List<NotificationArea>();
-        private static Window _window;
-
-        public static NotificationManager Instance = new NotificationManager();
-
-        public void Show(object content, string areaName = "", TimeSpan? expirationTime = null, Action onClick = null,
-            Action onClose = null)
-        {
-            if (!Dispatcher.UIThread.CheckAccess())
-            {
-                Dispatcher.UIThread.Post(
-                    new Action(() => Show(content, areaName, expirationTime, onClick, onClose)));
-                return;
-            }
-
-            if (expirationTime == null)
-                expirationTime = TimeSpan.FromSeconds(5);
-
-            if (areaName == string.Empty && _window == null)
-            {
-                var workArea = Application.Current.MainWindow.Screens.Primary.WorkingArea;
-
-                _window = new Window
-                {
-                    Position = workArea.Position,
-                    Width = workArea.Width,
-                    Height = workArea.Height
-                };
-
-                _window.Show();
-            }
-
-            foreach (var area in Areas.Where(a => a.Name == areaName))
-            {
-                area.Show(content, (TimeSpan)expirationTime, onClick, onClose);
-            }
-        }
-
-        internal static void AddArea(NotificationArea area)
-        {
-            Areas.Add(area);
-        }
-    }
-}
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 732363466a..475fc5a927 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Controls.Notifications;
 using Avalonia.Controls.Primitives;
@@ -103,7 +104,7 @@ namespace Avalonia.Controls
 
             PlatformImpl = impl;
 
-            LocalNotificationManager = new NotificationManager();
+            LocalNotificationManager = new NotificationArea();
 
             dependencyResolver = dependencyResolver ?? AvaloniaLocator.Current;
             var styler = TryGetService<IStyler>(dependencyResolver);
@@ -414,5 +415,20 @@ namespace Avalonia.Controls
         {
             (this as IInputRoot).MouseDevice.SceneInvalidated(this, e.DirtyRect);
         }
+
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            var adornerLayer = this.GetVisualDescendants()
+                .OfType<AdornerDecorator>()
+                .FirstOrDefault()
+                ?.AdornerLayer;
+
+            if (adornerLayer != null)
+            {
+                adornerLayer.Children.Add(LocalNotificationManager as IControl);
+            }
+
+            base.OnTemplateApplied(e);
+        }
     }
 }

From feba03d11349b7762703de9e2284ba49e4674aec Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 25 Apr 2019 21:59:45 +0100
Subject: [PATCH 20/70] attempt to bind to local notification manager.

---
 samples/ControlCatalog/MainWindow.xaml        |  2 +-
 .../ViewModels/MainWindowViewModel.cs         | 19 +++++++++++++++++--
 src/Avalonia.Controls/TopLevel.cs             |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 49d0ee72ff..beac57077f 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
         xmlns:v="clr-namespace:ControlCatalog.Views"
-        x:Class="ControlCatalog.MainWindow">
+        x:Class="ControlCatalog.MainWindow" LocalNotificationManager="{Binding NotificationManager}">
     <Window.DataTemplates>
         <DataTemplate DataType="vm:NotificationViewModel">
             <v:NotificationView />
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index a514b4d621..7a02f5a45c 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -4,19 +4,26 @@ using System.Text;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls.Notifications;
+using Avalonia.Diagnostics.ViewModels;
 using Avalonia.Threading;
+using ReactiveUI;
 
 namespace ControlCatalog.ViewModels
 {
-    class MainWindowViewModel
+    class MainWindowViewModel : ViewModelBase
     {
         public MainWindowViewModel()
         {
+            this.WhenAnyValue(x => x.NotificationManager).Subscribe(x =>
+            {
+
+            });
+
             Dispatcher.UIThread.InvokeAsync(async () =>
             {
                 await Task.Delay(5000);
 
-                
+
                 Application.Current.MainWindow.LocalNotificationManager.Show(new NotificationViewModel { Title = "Warning", Message = "Please save your work before closing." });
 
                 await Task.Delay(1500);
@@ -33,5 +40,13 @@ namespace ControlCatalog.ViewModels
 
             });
         }
+
+        private INotificationManager _notificationManager;
+
+        public INotificationManager NotificationManager
+        {
+            get { return _notificationManager; }
+            set { this.RaiseAndSetIfChanged(ref _notificationManager, value); }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 475fc5a927..dcd7434947 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -52,7 +52,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="LocalNotificationManager"/> property.
         /// </summary>
         public static readonly DirectProperty<TopLevel, INotificationManager> LocalNotificationManagerProperty =
-            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(LocalNotificationManager), o => o.LocalNotificationManager);
+            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(LocalNotificationManager), o => o.LocalNotificationManager, defaultBindingMode: Data.BindingMode.OneWayToSource);
 
         /// <summary>
         /// Defines the <see cref="SystemNotificationManager"/> property.

From 65a47c845e2d9177b74dcfffb18a999856edc781 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 25 Apr 2019 22:52:18 +0100
Subject: [PATCH 21/70] set binding mode in xaml

---
 samples/ControlCatalog/MainWindow.xaml | 2 +-
 src/Avalonia.Controls/TopLevel.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index beac57077f..ee8706d1e2 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
         xmlns:v="clr-namespace:ControlCatalog.Views"
-        x:Class="ControlCatalog.MainWindow" LocalNotificationManager="{Binding NotificationManager}">
+        x:Class="ControlCatalog.MainWindow" LocalNotificationManager="{Binding NotificationManager, Mode=OneWayToSource}">
     <Window.DataTemplates>
         <DataTemplate DataType="vm:NotificationViewModel">
             <v:NotificationView />
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index dcd7434947..475fc5a927 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -52,7 +52,7 @@ namespace Avalonia.Controls
         /// Defines the <see cref="LocalNotificationManager"/> property.
         /// </summary>
         public static readonly DirectProperty<TopLevel, INotificationManager> LocalNotificationManagerProperty =
-            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(LocalNotificationManager), o => o.LocalNotificationManager, defaultBindingMode: Data.BindingMode.OneWayToSource);
+            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(LocalNotificationManager), o => o.LocalNotificationManager);
 
         /// <summary>
         /// Defines the <see cref="SystemNotificationManager"/> property.

From ddbe82652f673f7b6bc720562d59d2937eaca5bc Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 20:32:15 +0100
Subject: [PATCH 22/70] allow binding of notification managers

---
 src/Avalonia.Controls/TopLevel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 475fc5a927..55b1dbb1f6 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -52,13 +52,13 @@ namespace Avalonia.Controls
         /// Defines the <see cref="LocalNotificationManager"/> property.
         /// </summary>
         public static readonly DirectProperty<TopLevel, INotificationManager> LocalNotificationManagerProperty =
-            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(LocalNotificationManager), o => o.LocalNotificationManager);
+            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(LocalNotificationManager), o => o.LocalNotificationManager, (o, v) => o.LocalNotificationManager = v);
 
         /// <summary>
         /// Defines the <see cref="SystemNotificationManager"/> property.
         /// </summary>
         public static readonly DirectProperty<TopLevel, INotificationManager> SystemNotificationManagerProperty =
-            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(SystemNotificationManager), o => o.SystemNotificationManager);
+            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(SystemNotificationManager), o => o.SystemNotificationManager, (o, v) => o.SystemNotificationManager = v);
 
         private readonly IInputManager _inputManager;
         private readonly IAccessKeyHandler _accessKeyHandler;

From c7be61a66decdeb5cc44d8b543fcd9d03fd79025 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 20:34:04 +0100
Subject: [PATCH 23/70] children of adorner layer that are not adorning
 controls can arrange with all available size.

---
 src/Avalonia.Controls/Primitives/AdornerLayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index 8a724926e8..d198570909 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -64,7 +64,7 @@ namespace Avalonia.Controls.Primitives
                 }
                 else
                 {
-                    child.Arrange(new Rect(child.DesiredSize));
+                    child.Arrange(new Rect(finalSize));
                 }
             }
 

From 147eb272aa156897483d3d74a7ffa9cf4336f8a4 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 20:34:15 +0100
Subject: [PATCH 24/70] notification area to fill window

---
 src/Avalonia.Controls/Notifications/NotificationArea.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/NotificationArea.cs b/src/Avalonia.Controls/Notifications/NotificationArea.cs
index c641e09b02..81b3c8fd59 100644
--- a/src/Avalonia.Controls/Notifications/NotificationArea.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationArea.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Linq;
 using System.Threading.Tasks;
@@ -39,6 +39,9 @@ namespace Avalonia.Controls.Notifications
             PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopRight, ":topright");
             PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomLeft, ":bottomleft");
             PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomRight, ":bottomright");
+
+            HorizontalAlignmentProperty.OverrideDefaultValue<NotificationArea>(Layout.HorizontalAlignment.Stretch);
+            VerticalAlignmentProperty.OverrideDefaultValue<NotificationArea>(Layout.VerticalAlignment.Stretch);
         }
 
         protected override void OnTemplateApplied(TemplateAppliedEventArgs e)

From f09228cc483d015bfc747d0efd22b6bb889dc7e6 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 20:34:36 +0100
Subject: [PATCH 25/70] simplify the usage of notification manager inside main
 window.

---
 .../ControlCatalog/ViewModels/MainWindowViewModel.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 7a02f5a45c..f66625ea82 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
@@ -24,19 +24,19 @@ namespace ControlCatalog.ViewModels
                 await Task.Delay(5000);
 
 
-                Application.Current.MainWindow.LocalNotificationManager.Show(new NotificationViewModel { Title = "Warning", Message = "Please save your work before closing." });
+                NotificationManager.Show(new NotificationViewModel { Title = "Warning", Message = "Please save your work before closing." });
 
                 await Task.Delay(1500);
-                Application.Current.MainWindow.LocalNotificationManager.Show(new NotificationContent { Message = "Test2", Type = NotificationType.Error });
+                NotificationManager.Show(new NotificationContent { Message = "Test2", Type = NotificationType.Error });
 
                 await Task.Delay(2000);
-                Application.Current.MainWindow.LocalNotificationManager.Show(new NotificationContent { Message = "Test3", Type = NotificationType.Warning });
+                NotificationManager.Show(new NotificationContent { Message = "Test3", Type = NotificationType.Warning });
 
                 await Task.Delay(2500);
-                Application.Current.MainWindow.LocalNotificationManager.Show(new NotificationContent { Message = "Test4", Type = NotificationType.Success });
+                NotificationManager.Show(new NotificationContent { Message = "Test4", Type = NotificationType.Success });
 
                 await Task.Delay(500);
-                Application.Current.MainWindow.LocalNotificationManager.Show("Test5");
+                NotificationManager.Show("Test5");
 
             });
         }

From f8f5610b8cec96c3ede86ffd4baeb9fe0c0d0f62 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 21:58:24 +0100
Subject: [PATCH 26/70] polish notifications

---
 .../ViewModels/MainWindowViewModel.cs         | 19 ++-----
 .../ViewModels/NotificationViewModel.cs       | 15 ++++--
 .../Views/NotificationView.xaml               |  8 +--
 .../Notifications/INotificationManager.cs     |  2 +
 .../Notifications/Notification.cs             | 10 ++--
 .../Notifications/NotificationArea.cs         |  9 ++--
 .../Notifications/NotificationContent.cs      |  6 +++
 src/Avalonia.Controls/TopLevel.cs             |  8 +--
 .../NotificationArea.xaml                     | 51 ++++++++-----------
 9 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index f66625ea82..3c9cb166e8 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
-using Avalonia;
 using Avalonia.Controls.Notifications;
 using Avalonia.Diagnostics.ViewModels;
 using Avalonia.Threading;
-using ReactiveUI;
 
 namespace ControlCatalog.ViewModels
 {
@@ -14,26 +9,20 @@ namespace ControlCatalog.ViewModels
     {
         public MainWindowViewModel()
         {
-            this.WhenAnyValue(x => x.NotificationManager).Subscribe(x =>
-            {
-
-            });
-
             Dispatcher.UIThread.InvokeAsync(async () =>
             {
                 await Task.Delay(5000);
 
-
-                NotificationManager.Show(new NotificationViewModel { Title = "Warning", Message = "Please save your work before closing." });
+                NotificationManager.Show(new NotificationViewModel (NotificationManager) { Title = "Warning", Message = "Did you know that Avalonia now supports Notifications?" });
 
                 await Task.Delay(1500);
-                NotificationManager.Show(new NotificationContent { Message = "Test2", Type = NotificationType.Error });
+                NotificationManager.Show(new NotificationContent { Title= "Title", Message = "Test2", Type = NotificationType.Error });
 
                 await Task.Delay(2000);
-                NotificationManager.Show(new NotificationContent { Message = "Test3", Type = NotificationType.Warning });
+                NotificationManager.Show(new NotificationContent { Title = "Title", Message = "Test3", Type = NotificationType.Warning });
 
                 await Task.Delay(2500);
-                NotificationManager.Show(new NotificationContent { Message = "Test4", Type = NotificationType.Success });
+                NotificationManager.Show(new NotificationContent { Title = "Title", Message = "Test4", Type = NotificationType.Success });
 
                 await Task.Delay(500);
                 NotificationManager.Show("Test5");
diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
index 8a82a82447..9e60700e71 100644
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -7,18 +7,25 @@ namespace ControlCatalog.ViewModels
 {
     public class NotificationViewModel
     {
-        public NotificationViewModel()
+        public NotificationViewModel(INotificationManager manager)
         {
-            OKCommand = ReactiveCommand.Create(() =>
+            YesCommand = ReactiveCommand.Create(() =>
             {
-                Application.Current.MainWindow.LocalNotificationManager.Show("Notification Accepted");
+                manager.Show(new NotificationContent { Title = "Avalonia Notifications", Message = "Start adding notifications to your app today." });
+            });
+
+            NoCommand = ReactiveCommand.Create(() =>
+            {
+                manager.Show(new NotificationContent { Title = "Avalonia Notifications", Message = "Start adding notifications to your app today. To find out more visit..." });
             });
         }
 
         public string Title { get; set; }
         public string Message { get; set; }
 
-        public ReactiveCommand<Unit, Unit> OKCommand { get; }
+        public ReactiveCommand<Unit, Unit> YesCommand { get; }
+
+        public ReactiveCommand<Unit, Unit> NoCommand { get; }
 
     }
 }
diff --git a/samples/ControlCatalog/Views/NotificationView.xaml b/samples/ControlCatalog/Views/NotificationView.xaml
index be0a613c57..9ba9badd80 100644
--- a/samples/ControlCatalog/Views/NotificationView.xaml
+++ b/samples/ControlCatalog/Views/NotificationView.xaml
@@ -8,10 +8,10 @@
             </Panel>
             <DockPanel Grid.Column="1">
                 <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
-                <DockPanel LastChildFill="False" DockPanel.Dock="Bottom" Margin="0,8,0,0">
-                    <Button Content="Ok" DockPanel.Dock="Right" Notification.CloseOnClick="True" Command="{Binding OKCommand}" />
-                    <Button Content="Cancel" DockPanel.Dock="Right" Notification.CloseOnClick="True" Margin="0,0,8,0" />
-                </DockPanel>
+                <StackPanel Spacing="20" DockPanel.Dock="Bottom" Margin="0,8,0,0">
+                    <Button Content="No" DockPanel.Dock="Right" Notification.CloseOnClick="True" Command="{Binding NoCommand}"  Margin="0,0,8,0" />
+                    <Button Content="Yes" DockPanel.Dock="Right" Notification.CloseOnClick="True" Command="{Binding YesCommand}" />
+                </StackPanel>
                 <TextBlock Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,8,0,0"/>
             </DockPanel>
         </Grid>
diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
index 4de8cb8067..45a7c8ff9b 100644
--- a/src/Avalonia.Controls/Notifications/INotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -5,5 +5,7 @@ namespace Avalonia.Controls.Notifications
     public interface INotificationManager
     {
         void Show(object content, TimeSpan? expirationTime = null, Action onClick = null, Action onClose = null);
+
+        void Show(NotificationContent content, TimeSpan? expirationTime = null, Action onClick = null, Action onClose = null);
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index dd96bea89c..d4cee99ba3 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -9,6 +9,9 @@ namespace Avalonia.Controls.Notifications
 {
     public class Notification : ContentControl
     {
+        private bool _isClosed;
+        private bool _isClosing;
+
         static Notification()
         {
             IsClosedProperty.Changed.AddClassHandler<Notification>(IsClosedChanged);
@@ -41,8 +44,6 @@ namespace Avalonia.Controls.Notifications
                 });
         }
 
-        private bool _isClosing;
-
         /// <summary>
         /// Determines if the notification is already closing.
         /// </summary>
@@ -55,8 +56,6 @@ namespace Avalonia.Controls.Notifications
         public static readonly DirectProperty<Notification, bool> IsClosingProperty =
             AvaloniaProperty.RegisterDirect<Notification, bool>(nameof(IsClosing), o => o.IsClosing);
 
-        private bool _isClosed;
-
         /// <summary>
         /// Determines if the notification is closed.
         /// </summary>
@@ -66,6 +65,9 @@ namespace Avalonia.Controls.Notifications
             set { SetAndRaise(IsClosedProperty, ref _isClosed, value); }
         }
 
+        /// <summary>
+        /// Defines the <see cref="IsClosed"/> property.
+        /// </summary>
         public static readonly DirectProperty<Notification, bool> IsClosedProperty =
             AvaloniaProperty.RegisterDirect<Notification, bool>(nameof(IsClosed), o => o.IsClosed, (o, v) => o.IsClosed = v);
 
diff --git a/src/Avalonia.Controls/Notifications/NotificationArea.cs b/src/Avalonia.Controls/Notifications/NotificationArea.cs
index 81b3c8fd59..d009ece3a1 100644
--- a/src/Avalonia.Controls/Notifications/NotificationArea.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationArea.cs
@@ -29,10 +29,6 @@ namespace Avalonia.Controls.Notifications
         public static readonly AvaloniaProperty MaxItemsProperty =
             AvaloniaProperty.Register<NotificationArea, int>(nameof(MaxItems), int.MaxValue);
 
-        public NotificationArea()
-        {
-        }
-
         static NotificationArea()
         {
             PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopLeft, ":topleft");
@@ -52,6 +48,11 @@ namespace Avalonia.Controls.Notifications
             _items = itemsControl?.Children;
         }
 
+        public void Show(NotificationContent content, TimeSpan? expirationTime, Action onClick, Action onClose)
+        {
+             Show(content as object, expirationTime, onClick, onClose);
+        }
+
         public async void Show(object content, TimeSpan? expirationTime, Action onClick, Action onClose)
         {
             var notification = new Notification
diff --git a/src/Avalonia.Controls/Notifications/NotificationContent.cs b/src/Avalonia.Controls/Notifications/NotificationContent.cs
index 9c070b7e86..637254aff8 100644
--- a/src/Avalonia.Controls/Notifications/NotificationContent.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationContent.cs
@@ -4,6 +4,12 @@ using System.Text;
 
 namespace Avalonia.Controls.Notifications
 {
+    /// <summary>
+    /// Defines content for a <see cref="Notification"/> control.
+    /// </summary>
+    /// <remarks>
+    /// This notification content type is compatible with native notifications.
+    /// </remarks>
     public class NotificationContent
     {
         public string Title { get; set; }
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 55b1dbb1f6..7038237dcb 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -51,8 +51,8 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="LocalNotificationManager"/> property.
         /// </summary>
-        public static readonly DirectProperty<TopLevel, INotificationManager> LocalNotificationManagerProperty =
-            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(LocalNotificationManager), o => o.LocalNotificationManager, (o, v) => o.LocalNotificationManager = v);
+        public static readonly DirectProperty<TopLevel, NotificationArea> LocalNotificationManagerProperty =
+            AvaloniaProperty.RegisterDirect<TopLevel, NotificationArea>(nameof(LocalNotificationManager), o => o.LocalNotificationManager, (o, v) => o.LocalNotificationManager = v);
 
         /// <summary>
         /// Defines the <see cref="SystemNotificationManager"/> property.
@@ -66,7 +66,7 @@ namespace Avalonia.Controls
         private readonly IApplicationLifecycle _applicationLifecycle;
         private readonly IPlatformRenderInterface _renderInterface;
         private Size _clientSize;
-        private INotificationManager _localNotificationManager;
+        private NotificationArea _localNotificationManager;
         private INotificationManager _systemNotificationManager;
         private ILayoutManager _layoutManager;
 
@@ -184,7 +184,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the Local (in window managed) notification manager.
         /// </summary>
-        public INotificationManager LocalNotificationManager
+        public NotificationArea LocalNotificationManager
         {
             get => _localNotificationManager;
             protected set => SetAndRaise(LocalNotificationManagerProperty, ref _localNotificationManager, value);
diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
index 13adbbc0b6..e5b71f81f6 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -6,17 +6,10 @@
                 <StackPanel Name="PART_Items">
                     <StackPanel.DataTemplates>
                         <DataTemplate DataType="NotificationContent">
-                            <Border Padding="12" MinHeight="80">
-                                <Grid ColumnDefinitions="Auto,*">
-                                    <ContentControl Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
-                                        <ContentControl HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                    </ContentControl>
-                                    <DockPanel Grid.Column="1">
-                                        <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
-                                        <TextBlock Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,0,12,0"/>
-                                    </DockPanel>
-                                </Grid>
-                            </Border>
+                            <StackPanel Spacing="8">
+                                <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
+                                <TextBlock MaxHeight="80" Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,0,12,0"/>
+                            </StackPanel>
                         </DataTemplate>
                     </StackPanel.DataTemplates>
                 </StackPanel>
@@ -33,7 +26,11 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
-                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="8,8,0,0">
+                    <Border Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Margin="8,8,0,0"
+                            Padding="12">
                         <ContentControl MinHeight="150" Content="{TemplateBinding Content}" />
                     </Border>
                 </LayoutTransformControl>
@@ -41,15 +38,15 @@
         </Setter>
 
         <Style.Animations>
-            <Animation Duration="0:0:0.35" Easing="QuadraticEaseIn" FillMode="Forward">
+            <Animation Duration="0:0:0.45" Easing="QuadraticEaseIn" FillMode="Forward">
                 <KeyFrame Cue="0%">
                     <Setter Property="Opacity" Value="0"/>
-                    <Setter Property="TranslateTransform.Y" Value="-20"/>
+                    <Setter Property="TranslateTransform.Y" Value="20"/>
                     <Setter Property="ScaleTransform.ScaleX" Value="0.85"/>
                     <Setter Property="ScaleTransform.ScaleY" Value="0.85"/>
                 </KeyFrame>
                 <KeyFrame Cue="30%">
-                    <Setter Property="TranslateTransform.Y" Value="20"/>
+                    <Setter Property="TranslateTransform.Y" Value="-20"/>
                 </KeyFrame>
                 <KeyFrame Cue="100%">
                     <Setter Property="Opacity" Value="1"/>
@@ -64,14 +61,18 @@
     <Style Selector="Notification[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
         <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
         <Style.Animations>
-            <Animation Duration="0:0:0.25" Easing="QuadraticEaseOut" FillMode="Forward">
+            <Animation Duration="0:0:0.75" Easing="QuadraticEaseOut" FillMode="Forward">
                 <KeyFrame Cue="0%">
-                    <Setter Property="Opacity" Value="1"/>
+                    <Setter Property="TranslateTransform.X" Value="0"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
+                </KeyFrame>
+                <KeyFrame Cue="70%">
+                    <Setter Property="TranslateTransform.X" Value="800"/>
                     <Setter Property="ScaleTransform.ScaleY" Value="1"/>
                 </KeyFrame>
                 <KeyFrame Cue="100%">
-                    <Setter Property="Opacity" Value="0"/>
                     <Setter Property="ScaleTransform.ScaleY" Value="0"/>
+                    <Setter Property="TranslateTransform.X" Value="800"/>
                 </KeyFrame>
             </Animation>
         </Style.Animations>
@@ -79,7 +80,7 @@
 
     <Style Selector="Notification[IsClosing=true]">
         <Style.Animations>
-            <Animation Duration="0:0:0.25" Easing="QuadraticEaseOut" FillMode="Forward">
+            <Animation Duration="0:0:1.25" Easing="QuadraticEaseOut" FillMode="Forward">
                 <KeyFrame Cue="100%">
                     <Setter Property="IsClosed" Value="True"/>
                 </KeyFrame>
@@ -98,25 +99,17 @@
         <Setter Property="HorizontalAlignment" Value="Right"/>
         <Setter Property="VerticalAlignment" Value="Top"/>
     </Style>
-
-    <Style Selector="Notification">
-        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
-        <Setter Property="Background" Value="#444444"/>
-    </Style>
+    
     <Style Selector="Notification:information">
-        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
-        <Setter Property="Background" Value="CornflowerBlue"/>
+        <Setter Property="Background" Value="Teal"/>
     </Style>
     <Style Selector="Notification:success">
-        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
         <Setter Property="Background" Value="LimeGreen"/>
     </Style>
     <Style Selector="Notification:warning">
-        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
         <Setter Property="Background" Value="Orange"/>
     </Style>
     <Style Selector="Notification:error">
-        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
         <Setter Property="Background" Value="OrangeRed"/>
     </Style>
 

From 77dd5079d11c9d8a9c93b51d366cbf519aaf7ea0 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 22:15:19 +0100
Subject: [PATCH 27/70] notification area is customizable via attached
 properties.

---
 samples/ControlCatalog/MainWindow.xaml        |  5 ++-
 .../Notifications/NotificationArea.cs         | 34 +++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index ee8706d1e2..28d8346c10 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -5,7 +5,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
         xmlns:v="clr-namespace:ControlCatalog.Views"
-        x:Class="ControlCatalog.MainWindow" LocalNotificationManager="{Binding NotificationManager, Mode=OneWayToSource}">
+        x:Class="ControlCatalog.MainWindow" 
+        LocalNotificationManager="{Binding NotificationManager, Mode=OneWayToSource}" 
+        NotificationArea.Position="BottomRight"
+        NotificationArea.MaxItems="3">
     <Window.DataTemplates>
         <DataTemplate DataType="vm:NotificationViewModel">
             <v:NotificationView />
diff --git a/src/Avalonia.Controls/Notifications/NotificationArea.cs b/src/Avalonia.Controls/Notifications/NotificationArea.cs
index d009ece3a1..3fe9a4a190 100644
--- a/src/Avalonia.Controls/Notifications/NotificationArea.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationArea.cs
@@ -11,24 +11,44 @@ namespace Avalonia.Controls.Notifications
     {
         private IList _items;
 
+        public static NotificationPosition GetPosition(TopLevel obj)
+        {
+            return obj.GetValue(PositionProperty);
+        }
+
+        public static void SetPosition(TopLevel obj, NotificationPosition value)
+        {
+            obj.SetValue(PositionProperty, value);
+        }
+
+        public static readonly AvaloniaProperty<NotificationPosition> PositionProperty =
+          AvaloniaProperty.RegisterAttached<NotificationArea, TopLevel, NotificationPosition>("Position", defaultValue: NotificationPosition.TopLeft , inherits: true);
+
         public NotificationPosition Position
         {
-            get { return (NotificationPosition)GetValue(PositionProperty); }
+            get { return GetValue(PositionProperty); }
             set { SetValue(PositionProperty, value); }
         }
 
-        public static readonly StyledProperty<NotificationPosition> PositionProperty =
-            AvaloniaProperty.Register<NotificationArea, NotificationPosition>(nameof(Position), NotificationPosition.BottomRight);
+        public static int GetMaxItems(TopLevel obj)
+        {
+            return obj.GetValue(MaxItemsProperty);
+        }
+
+        public static void SetMaxItems(TopLevel obj, int value)
+        {
+            obj.SetValue(MaxItemsProperty, value);
+        }
+
+        public static readonly AvaloniaProperty<int> MaxItemsProperty =
+          AvaloniaProperty.RegisterAttached<NotificationArea, TopLevel, int>("Position", defaultValue: 5, inherits: true);
 
         public int MaxItems
         {
-            get { return (int)GetValue(MaxItemsProperty); }
+            get { return GetValue(MaxItemsProperty); }
             set { SetValue(MaxItemsProperty, value); }
         }
 
-        public static readonly AvaloniaProperty MaxItemsProperty =
-            AvaloniaProperty.Register<NotificationArea, int>(nameof(MaxItems), int.MaxValue);
-
         static NotificationArea()
         {
             PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopLeft, ":topleft");

From b84634af83a3290b012e2e158fb644c4a1678c02 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 22:30:27 +0100
Subject: [PATCH 28/70] tidy custom notification example.

---
 samples/ControlCatalog/Views/NotificationView.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/Views/NotificationView.xaml b/samples/ControlCatalog/Views/NotificationView.xaml
index 9ba9badd80..85defe7a04 100644
--- a/samples/ControlCatalog/Views/NotificationView.xaml
+++ b/samples/ControlCatalog/Views/NotificationView.xaml
@@ -8,7 +8,7 @@
             </Panel>
             <DockPanel Grid.Column="1">
                 <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
-                <StackPanel Spacing="20" DockPanel.Dock="Bottom" Margin="0,8,0,0">
+                <StackPanel Spacing="20" DockPanel.Dock="Bottom" Margin="0,8,0,0" Orientation="Horizontal">
                     <Button Content="No" DockPanel.Dock="Right" Notification.CloseOnClick="True" Command="{Binding NoCommand}"  Margin="0,0,8,0" />
                     <Button Content="Yes" DockPanel.Dock="Right" Notification.CloseOnClick="True" Command="{Binding YesCommand}" />
                 </StackPanel>

From 9284f2c78f6fd4efab1b8f7d0a0068642f924f87 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 22:30:43 +0100
Subject: [PATCH 29/70] fix custom notification styling

---
 .../NotificationArea.xaml                      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
index e5b71f81f6..1c314bbfa2 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -1,4 +1,5 @@
-<Styles xmlns="https://github.com/avaloniaui">
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Style Selector="NotificationArea">
         <Setter Property="Margin" Value="0 0 8 8"/>
         <Setter Property="Template">
@@ -6,11 +7,14 @@
                 <StackPanel Name="PART_Items">
                     <StackPanel.DataTemplates>
                         <DataTemplate DataType="NotificationContent">
-                            <StackPanel Spacing="8">
+                            <StackPanel Spacing="8" Margin="12">
                                 <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
-                                <TextBlock MaxHeight="80" Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,0,12,0"/>
+                                <TextBlock MaxHeight="80" Text="{Binding Message}" TextWrapping="Wrap" Margin="0,0,12,0"/>
                             </StackPanel>
                         </DataTemplate>
+                        <DataTemplate DataType="x:String">
+                            <TextBlock Text="{Binding }" Margin="12" />
+                        </DataTemplate>
                     </StackPanel.DataTemplates>
                 </StackPanel>
             </ControlTemplate>
@@ -29,8 +33,7 @@
                     <Border Background="{TemplateBinding Background}" 
                             BorderBrush="{TemplateBinding BorderBrush}" 
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            Margin="8,8,0,0"
-                            Padding="12">
+                            Margin="8,8,0,0">
                         <ContentControl MinHeight="150" Content="{TemplateBinding Content}" />
                     </Border>
                 </LayoutTransformControl>
@@ -99,7 +102,10 @@
         <Setter Property="HorizontalAlignment" Value="Right"/>
         <Setter Property="VerticalAlignment" Value="Top"/>
     </Style>
-    
+
+    <Style Selector="Notification">
+        <Setter Property="Background" Value="#444444"/>
+    </Style>
     <Style Selector="Notification:information">
         <Setter Property="Background" Value="Teal"/>
     </Style>

From 5d3c74d29433e05d715b1cbeb558a8ca0f627829 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 22:31:03 +0100
Subject: [PATCH 30/70] custom notification color

---
 samples/ControlCatalog/Views/NotificationView.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/Views/NotificationView.xaml b/samples/ControlCatalog/Views/NotificationView.xaml
index 85defe7a04..a7576f11c3 100644
--- a/samples/ControlCatalog/Views/NotificationView.xaml
+++ b/samples/ControlCatalog/Views/NotificationView.xaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Views.NotificationView">
-    <Border Padding="12" MinHeight="20" Background="#FF444444">
+    <Border Padding="12" MinHeight="20" Background="Teal">
         <Grid ColumnDefinitions="Auto,*">
             <Panel Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
                 <TextBlock Text="&#xE115;" FontFamily="Segoe UI Symbol" FontSize="20" TextAlignment="Center" VerticalAlignment="Center"/>

From 51b5ebe3c671cdfd90948e3921598525d2557e74 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 22:31:21 +0100
Subject: [PATCH 31/70] polish notification example code.

---
 samples/ControlCatalog/MainWindow.xaml                   | 2 +-
 samples/ControlCatalog/ViewModels/MainWindowViewModel.cs | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 28d8346c10..19908624cf 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:v="clr-namespace:ControlCatalog.Views"
         x:Class="ControlCatalog.MainWindow" 
         LocalNotificationManager="{Binding NotificationManager, Mode=OneWayToSource}" 
-        NotificationArea.Position="BottomRight"
+        NotificationArea.Position="TopRight"
         NotificationArea.MaxItems="3">
     <Window.DataTemplates>
         <DataTemplate DataType="vm:NotificationViewModel">
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 3c9cb166e8..95995b9f26 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -24,6 +24,9 @@ namespace ControlCatalog.ViewModels
                 await Task.Delay(2500);
                 NotificationManager.Show(new NotificationContent { Title = "Title", Message = "Test4", Type = NotificationType.Success });
 
+                await Task.Delay(2500);
+                NotificationManager.Show(new NotificationContent { Title = "Title", Message = "Test5", Type = NotificationType.Information });
+
                 await Task.Delay(500);
                 NotificationManager.Show("Test5");
 

From 366cdfdb0f84fe603e4eaa91fd47fc67eeca164a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 22:36:31 +0100
Subject: [PATCH 32/70] add a notifications page to control catalog

---
 samples/ControlCatalog/MainView.xaml           |  2 ++
 .../Pages/NotificationsPage.xaml               |  9 +++++++++
 .../Pages/NotificationsPage.xaml.cs            | 18 ++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 samples/ControlCatalog/Pages/NotificationsPage.xaml
 create mode 100644 samples/ControlCatalog/Pages/NotificationsPage.xaml.cs

diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index b79db9f053..ce79a4bddd 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -29,6 +29,8 @@
       <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
       <TabItem Header="ListBox"><pages:ListBoxPage/></TabItem>
       <TabItem Header="Menu"><pages:MenuPage/></TabItem>
+      <TabItem Header="Notifications"><pages:NotificationPage/></TabItem>
+	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
 	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
       <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
       <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml b/samples/ControlCatalog/Pages/NotificationsPage.xaml
new file mode 100644
index 0000000000..3f68878337
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml
@@ -0,0 +1,9 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.NotificationsPage">
+  <StackPanel Orientation="Vertical" Spacing="4">
+        <Button Content="Show Custom Managed Notification" />
+        <Button Content="Show Standard Managed Notification" />
+        <Button Content="Show Native Notification" />
+    </StackPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs b/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
new file mode 100644
index 0000000000..eadf92b602
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
@@ -0,0 +1,18 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class NotificationsPage : UserControl
+    {
+        public NotificationsPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}

From 96d912c46c2f1cf3e3f1087994735ae8a1e1800a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 22:52:16 +0100
Subject: [PATCH 33/70] implement notifications page in control catalog

---
 samples/ControlCatalog/MainView.xaml          |  2 +-
 .../Pages/NotificationsPage.xaml              |  9 ++---
 .../ViewModels/MainWindowViewModel.cs         | 36 +++++++++----------
 .../Views/NotificationView.xaml               |  2 +-
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index ce79a4bddd..b6b4e0c242 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -29,7 +29,7 @@
       <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
       <TabItem Header="ListBox"><pages:ListBoxPage/></TabItem>
       <TabItem Header="Menu"><pages:MenuPage/></TabItem>
-      <TabItem Header="Notifications"><pages:NotificationPage/></TabItem>
+      <TabItem Header="Notifications"><pages:NotificationsPage/></TabItem>
 	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
 	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
       <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml b/samples/ControlCatalog/Pages/NotificationsPage.xaml
index 3f68878337..94e2314dc7 100644
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml
@@ -1,9 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.NotificationsPage">
-  <StackPanel Orientation="Vertical" Spacing="4">
-        <Button Content="Show Custom Managed Notification" />
-        <Button Content="Show Standard Managed Notification" />
-        <Button Content="Show Native Notification" />
+  <StackPanel Orientation="Vertical" Spacing="4" HorizontalAlignment="Left">
+        <TextBlock Classes="h1">Notifications</TextBlock>
+        <Button Content="Show Standard Managed Notification" Command="{Binding ShowManagedNotificationCommand}" />
+        <Button Content="Show Custom Managed Notification" Command="{Binding ShowCustomManagedNotificationCommand}" />
+        <Button Content="Show Native Notification" Command="{Binding ShowNativeNotificationCommand}" />
     </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 95995b9f26..4623149a88 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -1,7 +1,9 @@
+using System.Reactive;
 using System.Threading.Tasks;
 using Avalonia.Controls.Notifications;
 using Avalonia.Diagnostics.ViewModels;
 using Avalonia.Threading;
+using ReactiveUI;
 
 namespace ControlCatalog.ViewModels
 {
@@ -9,27 +11,19 @@ namespace ControlCatalog.ViewModels
     {
         public MainWindowViewModel()
         {
-            Dispatcher.UIThread.InvokeAsync(async () =>
+            ShowCustomManagedNotificationCommand = ReactiveCommand.Create(() =>
             {
-                await Task.Delay(5000);
-
-                NotificationManager.Show(new NotificationViewModel (NotificationManager) { Title = "Warning", Message = "Did you know that Avalonia now supports Notifications?" });
-
-                await Task.Delay(1500);
-                NotificationManager.Show(new NotificationContent { Title= "Title", Message = "Test2", Type = NotificationType.Error });
-
-                await Task.Delay(2000);
-                NotificationManager.Show(new NotificationContent { Title = "Title", Message = "Test3", Type = NotificationType.Warning });
-
-                await Task.Delay(2500);
-                NotificationManager.Show(new NotificationContent { Title = "Title", Message = "Test4", Type = NotificationType.Success });
-
-                await Task.Delay(2500);
-                NotificationManager.Show(new NotificationContent { Title = "Title", Message = "Test5", Type = NotificationType.Information });
+                NotificationManager.Show(new NotificationViewModel(NotificationManager) { Title = "Hey There!", Message = "Did you know that Avalonia now supports Custom In-Window Notifications?" });
+            });
 
-                await Task.Delay(500);
-                NotificationManager.Show("Test5");
+            ShowManagedNotificationCommand = ReactiveCommand.Create(() =>
+            {
+                NotificationManager.Show(new NotificationContent { Title = "Welcome", Message = "Avalonia now supports Notifications.", Type = NotificationType.Information });
+            });
 
+            ShowNativeNotificationCommand = ReactiveCommand.Create(() =>
+            {
+                NotificationManager.Show(new NotificationContent { Title = "Error", Message = "Native Notifications are not quite ready. Coming soon.", Type = NotificationType.Error });
             });
         }
 
@@ -40,5 +34,11 @@ namespace ControlCatalog.ViewModels
             get { return _notificationManager; }
             set { this.RaiseAndSetIfChanged(ref _notificationManager, value); }
         }
+
+        public ReactiveCommand<Unit, Unit> ShowCustomManagedNotificationCommand { get; }
+
+        public ReactiveCommand<Unit, Unit> ShowManagedNotificationCommand { get; }
+
+        public ReactiveCommand<Unit, Unit> ShowNativeNotificationCommand { get; }
     }
 }
diff --git a/samples/ControlCatalog/Views/NotificationView.xaml b/samples/ControlCatalog/Views/NotificationView.xaml
index a7576f11c3..5552aeb370 100644
--- a/samples/ControlCatalog/Views/NotificationView.xaml
+++ b/samples/ControlCatalog/Views/NotificationView.xaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Views.NotificationView">
-    <Border Padding="12" MinHeight="20" Background="Teal">
+    <Border Padding="12" MinHeight="20" Background="DodgerBlue">
         <Grid ColumnDefinitions="Auto,*">
             <Panel Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
                 <TextBlock Text="&#xE115;" FontFamily="Segoe UI Symbol" FontSize="20" TextAlignment="Center" VerticalAlignment="Center"/>

From e14cc277d79c0c4dfe93cf8bd0add5ab8a1e68e1 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 6 May 2019 17:56:23 +0100
Subject: [PATCH 34/70] dont use properties on toplevel

---
 samples/ControlCatalog/MainWindow.xaml        |  5 +-
 samples/ControlCatalog/MainWindow.xaml.cs     | 18 +++++-
 .../ViewModels/MainWindowViewModel.cs         |  4 +-
 .../Notifications/NotificationArea.cs         | 18 +++++-
 src/Avalonia.Controls/TopLevel.cs             | 57 -------------------
 5 files changed, 37 insertions(+), 65 deletions(-)

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 19908624cf..49d0ee72ff 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -5,10 +5,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
         xmlns:v="clr-namespace:ControlCatalog.Views"
-        x:Class="ControlCatalog.MainWindow" 
-        LocalNotificationManager="{Binding NotificationManager, Mode=OneWayToSource}" 
-        NotificationArea.Position="TopRight"
-        NotificationArea.MaxItems="3">
+        x:Class="ControlCatalog.MainWindow">
     <Window.DataTemplates>
         <DataTemplate DataType="vm:NotificationViewModel">
             <v:NotificationView />
diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index 02cc692949..1d54378f3a 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
+using Avalonia.Controls.Primitives;
 using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
 using ControlCatalog.ViewModels;
@@ -11,6 +12,8 @@ namespace ControlCatalog
 {
     public class MainWindow : Window
     {
+        private NotificationArea _notificationArea;
+
         public MainWindow()
         {
             this.InitializeComponent();
@@ -18,7 +21,13 @@ namespace ControlCatalog
             //Renderer.DrawFps = true;
             //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
 
-            DataContext = new MainWindowViewModel();
+            _notificationArea = new NotificationArea
+            {
+                Position = NotificationPosition.TopRight,
+                MaxItems = 3
+            };
+
+            DataContext = new MainWindowViewModel(_notificationArea);
         }
 
         private void InitializeComponent()
@@ -30,5 +39,12 @@ namespace ControlCatalog
             theme.TryGetResource("Button", out _);
             AvaloniaXamlLoader.Load(this);
         }
+
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            base.OnTemplateApplied(e);
+
+            _notificationArea.Install(this);
+        }
     }
 }
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 4623149a88..5ba969345c 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -9,8 +9,10 @@ namespace ControlCatalog.ViewModels
 {
     class MainWindowViewModel : ViewModelBase
     {
-        public MainWindowViewModel()
+        public MainWindowViewModel(INotificationManager notificationManager)
         {
+            _notificationManager = notificationManager;
+
             ShowCustomManagedNotificationCommand = ReactiveCommand.Create(() =>
             {
                 NotificationManager.Show(new NotificationViewModel(NotificationManager) { Title = "Hey There!", Message = "Did you know that Avalonia now supports Custom In-Window Notifications?" });
diff --git a/src/Avalonia.Controls/Notifications/NotificationArea.cs b/src/Avalonia.Controls/Notifications/NotificationArea.cs
index 3fe9a4a190..01655915e3 100644
--- a/src/Avalonia.Controls/Notifications/NotificationArea.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationArea.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Notifications
 {
@@ -22,7 +23,7 @@ namespace Avalonia.Controls.Notifications
         }
 
         public static readonly AvaloniaProperty<NotificationPosition> PositionProperty =
-          AvaloniaProperty.RegisterAttached<NotificationArea, TopLevel, NotificationPosition>("Position", defaultValue: NotificationPosition.TopLeft , inherits: true);
+          AvaloniaProperty.RegisterAttached<NotificationArea, TopLevel, NotificationPosition>("Position", defaultValue: NotificationPosition.TopLeft, inherits: true);
 
         public NotificationPosition Position
         {
@@ -70,7 +71,7 @@ namespace Avalonia.Controls.Notifications
 
         public void Show(NotificationContent content, TimeSpan? expirationTime, Action onClick, Action onClose)
         {
-             Show(content as object, expirationTime, onClick, onClose);
+            Show(content as object, expirationTime, onClick, onClose);
         }
 
         public async void Show(object content, TimeSpan? expirationTime, Action onClick, Action onClose)
@@ -116,6 +117,19 @@ namespace Avalonia.Controls.Notifications
             var notification = sender as Notification;
             _items.Remove(notification);
         }
+
+        public void Install(TopLevel host)
+        {
+            var adornerLayer = host.GetVisualDescendants()
+                .OfType<AdornerDecorator>()
+                .FirstOrDefault()
+                ?.AdornerLayer;
+
+            if (adornerLayer != null)
+            {
+                adornerLayer.Children.Add(this as IControl);
+            }
+        }
     }
 
     public enum NotificationPosition
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 7038237dcb..b08d55ff18 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -48,26 +48,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IInputElement> PointerOverElementProperty =
             AvaloniaProperty.Register<TopLevel, IInputElement>(nameof(IInputRoot.PointerOverElement));
 
-        /// <summary>
-        /// Defines the <see cref="LocalNotificationManager"/> property.
-        /// </summary>
-        public static readonly DirectProperty<TopLevel, NotificationArea> LocalNotificationManagerProperty =
-            AvaloniaProperty.RegisterDirect<TopLevel, NotificationArea>(nameof(LocalNotificationManager), o => o.LocalNotificationManager, (o, v) => o.LocalNotificationManager = v);
-
-        /// <summary>
-        /// Defines the <see cref="SystemNotificationManager"/> property.
-        /// </summary>
-        public static readonly DirectProperty<TopLevel, INotificationManager> SystemNotificationManagerProperty =
-            AvaloniaProperty.RegisterDirect<TopLevel, INotificationManager>(nameof(SystemNotificationManager), o => o.SystemNotificationManager, (o, v) => o.SystemNotificationManager = v);
-
         private readonly IInputManager _inputManager;
         private readonly IAccessKeyHandler _accessKeyHandler;
         private readonly IKeyboardNavigationHandler _keyboardNavigationHandler;
         private readonly IApplicationLifecycle _applicationLifecycle;
         private readonly IPlatformRenderInterface _renderInterface;
         private Size _clientSize;
-        private NotificationArea _localNotificationManager;
-        private INotificationManager _systemNotificationManager;
         private ILayoutManager _layoutManager;
 
         /// <summary>
@@ -104,8 +90,6 @@ namespace Avalonia.Controls
 
             PlatformImpl = impl;
 
-            LocalNotificationManager = new NotificationArea();
-
             dependencyResolver = dependencyResolver ?? AvaloniaLocator.Current;
             var styler = TryGetService<IStyler>(dependencyResolver);
 
@@ -115,13 +99,6 @@ namespace Avalonia.Controls
             _applicationLifecycle = TryGetService<IApplicationLifecycle>(dependencyResolver);
             _renderInterface = TryGetService<IPlatformRenderInterface>(dependencyResolver);
 
-            _systemNotificationManager = TryGetService<INotificationManager>(dependencyResolver);
-
-            if(_systemNotificationManager == null)
-            {
-                SystemNotificationManager = _localNotificationManager;
-            }
-
             Renderer = impl.CreateRenderer(this);
 
             if (Renderer != null)
@@ -181,25 +158,6 @@ namespace Avalonia.Controls
             protected set { SetAndRaise(ClientSizeProperty, ref _clientSize, value); }
         }
 
-        /// <summary>
-        /// Gets or sets the Local (in window managed) notification manager.
-        /// </summary>
-        public NotificationArea LocalNotificationManager
-        {
-            get => _localNotificationManager;
-            protected set => SetAndRaise(LocalNotificationManagerProperty, ref _localNotificationManager, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the System (native os) notification manager. If the system doesnt natively support notifications then this property
-        /// will match the <see cref="LocalNotificationManager"/>.
-        /// </summary>
-        public INotificationManager SystemNotificationManager
-        {
-            get => _systemNotificationManager;
-            protected set => SetAndRaise(SystemNotificationManagerProperty, ref _systemNotificationManager, value);
-        }
-
         public ILayoutManager LayoutManager
         {
             get
@@ -415,20 +373,5 @@ namespace Avalonia.Controls
         {
             (this as IInputRoot).MouseDevice.SceneInvalidated(this, e.DirtyRect);
         }
-
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
-        {
-            var adornerLayer = this.GetVisualDescendants()
-                .OfType<AdornerDecorator>()
-                .FirstOrDefault()
-                ?.AdornerLayer;
-
-            if (adornerLayer != null)
-            {
-                adornerLayer.Children.Add(LocalNotificationManager as IControl);
-            }
-
-            base.OnTemplateApplied(e);
-        }
     }
 }

From e45805aa50297257d4c151dff7122df73ddcd2a9 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 6 May 2019 18:27:43 +0100
Subject: [PATCH 35/70] suggested api changes

---
 samples/ControlCatalog/MainWindow.xaml.cs     |  4 +-
 .../ViewModels/MainWindowViewModel.cs         | 14 ++---
 .../ViewModels/NotificationViewModel.cs       |  5 +-
 .../Notifications/INotificationManager.cs     | 22 +++++++-
 .../Notifications/Notification.cs             |  2 +-
 .../Notifications/NotificationContent.cs      | 27 ---------
 .../Notifications/SimpleNotification.cs       | 56 +++++++++++++++++++
 ...onArea.cs => WindowNotificationManager.cs} | 55 ++++++++++--------
 .../Avalonia.Themes.Default.csproj            |  5 ++
 src/Avalonia.Themes.Default/DefaultTheme.xaml |  2 +-
 ...ea.xaml => WindowNotificationManager.xaml} | 12 ++--
 11 files changed, 130 insertions(+), 74 deletions(-)
 delete mode 100644 src/Avalonia.Controls/Notifications/NotificationContent.cs
 create mode 100644 src/Avalonia.Controls/Notifications/SimpleNotification.cs
 rename src/Avalonia.Controls/Notifications/{NotificationArea.cs => WindowNotificationManager.cs} (55%)
 rename src/Avalonia.Themes.Default/{NotificationArea.xaml => WindowNotificationManager.xaml} (92%)

diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index 1d54378f3a..b5e315573d 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -12,7 +12,7 @@ namespace ControlCatalog
 {
     public class MainWindow : Window
     {
-        private NotificationArea _notificationArea;
+        private WindowNotificationManager _notificationArea;
 
         public MainWindow()
         {
@@ -21,7 +21,7 @@ namespace ControlCatalog
             //Renderer.DrawFps = true;
             //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
 
-            _notificationArea = new NotificationArea
+            _notificationArea = new WindowNotificationManager
             {
                 Position = NotificationPosition.TopRight,
                 MaxItems = 3
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 5ba969345c..962a3227d4 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -1,15 +1,15 @@
 using System.Reactive;
-using System.Threading.Tasks;
 using Avalonia.Controls.Notifications;
 using Avalonia.Diagnostics.ViewModels;
-using Avalonia.Threading;
 using ReactiveUI;
 
 namespace ControlCatalog.ViewModels
 {
     class MainWindowViewModel : ViewModelBase
     {
-        public MainWindowViewModel(INotificationManager notificationManager)
+        private IManagedNotificationManager _notificationManager;
+
+        public MainWindowViewModel(IManagedNotificationManager notificationManager)
         {
             _notificationManager = notificationManager;
 
@@ -20,18 +20,16 @@ namespace ControlCatalog.ViewModels
 
             ShowManagedNotificationCommand = ReactiveCommand.Create(() =>
             {
-                NotificationManager.Show(new NotificationContent { Title = "Welcome", Message = "Avalonia now supports Notifications.", Type = NotificationType.Information });
+                NotificationManager.Show(SimpleNotification.Create("Welcome", "Avalonia now supports Notifications.",  NotificationType.Information));
             });
 
             ShowNativeNotificationCommand = ReactiveCommand.Create(() =>
             {
-                NotificationManager.Show(new NotificationContent { Title = "Error", Message = "Native Notifications are not quite ready. Coming soon.", Type = NotificationType.Error });
+                NotificationManager.Show(SimpleNotification.Create("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
             });
         }
 
-        private INotificationManager _notificationManager;
-
-        public INotificationManager NotificationManager
+        public IManagedNotificationManager NotificationManager
         {
             get { return _notificationManager; }
             set { this.RaiseAndSetIfChanged(ref _notificationManager, value); }
diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
index 9e60700e71..2fba6865c9 100644
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -1,5 +1,4 @@
 using System.Reactive;
-using Avalonia;
 using Avalonia.Controls.Notifications;
 using ReactiveUI;
 
@@ -11,12 +10,12 @@ namespace ControlCatalog.ViewModels
         {
             YesCommand = ReactiveCommand.Create(() =>
             {
-                manager.Show(new NotificationContent { Title = "Avalonia Notifications", Message = "Start adding notifications to your app today." });
+                manager.Show(SimpleNotification.Create("Avalonia Notifications", "Start adding notifications to your app today."));
             });
 
             NoCommand = ReactiveCommand.Create(() =>
             {
-                manager.Show(new NotificationContent { Title = "Avalonia Notifications", Message = "Start adding notifications to your app today. To find out more visit..." });
+                manager.Show(SimpleNotification.Create("Avalonia Notifications", "Start adding notifications to your app today. To find out more visit..."));
             });
         }
 
diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
index 45a7c8ff9b..f2af87fb4a 100644
--- a/src/Avalonia.Controls/Notifications/INotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -2,10 +2,28 @@
 
 namespace Avalonia.Controls.Notifications
 {
+    public interface INotification
+    {
+        string Title { get; }
+
+        string Message { get; }
+
+        NotificationType Type { get; }
+
+        TimeSpan Expiration { get; }
+
+        Action OnClick { get; }
+
+        Action OnClose { get; }
+    }
+
     public interface INotificationManager
     {
-        void Show(object content, TimeSpan? expirationTime = null, Action onClick = null, Action onClose = null);
+        void Show(INotification notification);
+    }
 
-        void Show(NotificationContent content, TimeSpan? expirationTime = null, Action onClick = null, Action onClose = null);
+    public interface IManagedNotificationManager : INotificationManager
+    {
+        void Show(object content);
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index d4cee99ba3..54a8e81f86 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Controls.Notifications
         public Notification()
         {
             this.GetObservable(ContentProperty)
-                .OfType<NotificationContent>()
+                .OfType<SimpleNotification>()
                 .Subscribe(x =>
                 {
                     switch (x.Type)
diff --git a/src/Avalonia.Controls/Notifications/NotificationContent.cs b/src/Avalonia.Controls/Notifications/NotificationContent.cs
deleted file mode 100644
index 637254aff8..0000000000
--- a/src/Avalonia.Controls/Notifications/NotificationContent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Controls.Notifications
-{
-    /// <summary>
-    /// Defines content for a <see cref="Notification"/> control.
-    /// </summary>
-    /// <remarks>
-    /// This notification content type is compatible with native notifications.
-    /// </remarks>
-    public class NotificationContent
-    {
-        public string Title { get; set; }
-        public string Message { get; set; }
-        public NotificationType Type { get; set; }
-    }
-
-    public enum NotificationType
-    {
-        Information,
-        Success,
-        Warning,
-        Error
-    }
-}
diff --git a/src/Avalonia.Controls/Notifications/SimpleNotification.cs b/src/Avalonia.Controls/Notifications/SimpleNotification.cs
new file mode 100644
index 0000000000..16e1bb483e
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/SimpleNotification.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Controls.Notifications
+{
+    /// <summary>
+    /// Defines content for a <see cref="Notification"/> control.
+    /// </summary>
+    /// <remarks>
+    /// This notification content type is compatible with native notifications.
+    /// </remarks>
+    public class SimpleNotification : INotification
+    {
+        public static INotification Create (
+            string title, 
+            string message, 
+            NotificationType type = NotificationType.Information, 
+            TimeSpan? expiration = null, 
+            Action onClick = null, 
+            Action onClose = null)
+        {
+            var result = new SimpleNotification
+            {
+                Title = title,
+                Message = message,
+                Type = type,
+                Expiration = expiration.HasValue ? expiration.Value : TimeSpan.FromSeconds(5),
+                OnClick = onClick,
+                OnClose = onClose
+            };
+
+            return result;
+        }
+
+        public string Title { get; private set; }
+
+        public string Message { get; private set; }
+
+        public NotificationType Type { get; private set; }
+
+        public TimeSpan Expiration { get; private set; }
+
+        public Action OnClick { get; private set; }
+
+        public Action OnClose { get; private set; }
+    }
+
+    public enum NotificationType
+    {
+        Information,
+        Success,
+        Warning,
+        Error
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationArea.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
similarity index 55%
rename from src/Avalonia.Controls/Notifications/NotificationArea.cs
rename to src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 01655915e3..676ea230f2 100644
--- a/src/Avalonia.Controls/Notifications/NotificationArea.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -8,7 +8,7 @@ using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Notifications
 {
-    public class NotificationArea : TemplatedControl, INotificationManager
+    public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager
     {
         private IList _items;
 
@@ -23,7 +23,7 @@ namespace Avalonia.Controls.Notifications
         }
 
         public static readonly AvaloniaProperty<NotificationPosition> PositionProperty =
-          AvaloniaProperty.RegisterAttached<NotificationArea, TopLevel, NotificationPosition>("Position", defaultValue: NotificationPosition.TopLeft, inherits: true);
+          AvaloniaProperty.RegisterAttached<WindowNotificationManager, TopLevel, NotificationPosition>("Position", defaultValue: NotificationPosition.TopLeft, inherits: true);
 
         public NotificationPosition Position
         {
@@ -42,7 +42,7 @@ namespace Avalonia.Controls.Notifications
         }
 
         public static readonly AvaloniaProperty<int> MaxItemsProperty =
-          AvaloniaProperty.RegisterAttached<NotificationArea, TopLevel, int>("Position", defaultValue: 5, inherits: true);
+          AvaloniaProperty.RegisterAttached<WindowNotificationManager, TopLevel, int>("Position", defaultValue: 5, inherits: true);
 
         public int MaxItems
         {
@@ -50,15 +50,15 @@ namespace Avalonia.Controls.Notifications
             set { SetValue(MaxItemsProperty, value); }
         }
 
-        static NotificationArea()
+        static WindowNotificationManager()
         {
-            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopLeft, ":topleft");
-            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopRight, ":topright");
-            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomLeft, ":bottomleft");
-            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomRight, ":bottomright");
+            PseudoClass<WindowNotificationManager, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopLeft, ":topleft");
+            PseudoClass<WindowNotificationManager, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopRight, ":topright");
+            PseudoClass<WindowNotificationManager, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomLeft, ":bottomleft");
+            PseudoClass<WindowNotificationManager, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomRight, ":bottomright");
 
-            HorizontalAlignmentProperty.OverrideDefaultValue<NotificationArea>(Layout.HorizontalAlignment.Stretch);
-            VerticalAlignmentProperty.OverrideDefaultValue<NotificationArea>(Layout.VerticalAlignment.Stretch);
+            HorizontalAlignmentProperty.OverrideDefaultValue<WindowNotificationManager>(Layout.HorizontalAlignment.Stretch);
+            VerticalAlignmentProperty.OverrideDefaultValue<WindowNotificationManager>(Layout.VerticalAlignment.Stretch);
         }
 
         protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
@@ -69,32 +69,39 @@ namespace Avalonia.Controls.Notifications
             _items = itemsControl?.Children;
         }
 
-        public void Show(NotificationContent content, TimeSpan? expirationTime, Action onClick, Action onClose)
+        public void Show(INotification content)
         {
-            Show(content as object, expirationTime, onClick, onClose);
+            Show(content as object);
         }
 
-        public async void Show(object content, TimeSpan? expirationTime, Action onClick, Action onClose)
+        public async void Show(object content)
         {
-            var notification = new Notification
+            var notification = content as INotification;
+
+            var notificationControl = new Notification
             {
                 Content = content
             };
 
-            notification.PointerPressed += (sender, args) =>
+            if (notification != null)
+            {
+                notificationControl.NotificationClosed += (sender, args) => notification.OnClose?.Invoke();
+            }
+
+            notificationControl.NotificationClosed += OnNotificationClosed;
+
+            notificationControl.PointerPressed += (sender, args) =>
             {
-                if (onClick != null)
+                if (notification != null && notification.OnClick != null)
                 {
-                    onClick.Invoke();
+                    notification.OnClick.Invoke();
                     (sender as Notification)?.Close();
                 }
             };
-            notification.NotificationClosed += (sender, args) => onClose?.Invoke();
-            notification.NotificationClosed += OnNotificationClosed;
 
             lock (_items)
             {
-                _items.Add(notification);
+                _items.Add(notificationControl);
 
                 if (_items.OfType<Notification>().Count(i => !i.IsClosing) > MaxItems)
                 {
@@ -102,14 +109,14 @@ namespace Avalonia.Controls.Notifications
                 }
             }
 
-            if (expirationTime == TimeSpan.MaxValue)
+            if (notification != null && notification.Expiration == TimeSpan.MaxValue)
             {
                 return;
             }
 
-            await Task.Delay(expirationTime ?? TimeSpan.FromSeconds(5));
+            await Task.Delay(notification?.Expiration ?? TimeSpan.FromSeconds(5));
 
-            notification.Close();
+            notificationControl.Close();
         }
 
         private void OnNotificationClosed(object sender, RoutedEventArgs routedEventArgs)
@@ -118,7 +125,7 @@ namespace Avalonia.Controls.Notifications
             _items.Remove(notification);
         }
 
-        public void Install(TopLevel host)
+        public void Install(Window host)
         {
             var adornerLayer = host.GetVisualDescendants()
                 .OfType<AdornerDecorator>()
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index 7dedcdef57..49ec1ad764 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -26,4 +26,9 @@
       <Generator>MSBuild:Compile</Generator>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Update="WindowNotificationManager.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 801fb61a4d..5122bf9c9a 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -46,5 +46,5 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.ButtonSpinner.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.NumericUpDown.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.AutoCompleteBox.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.NotificationArea.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.WindowNotificationManager.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
similarity index 92%
rename from src/Avalonia.Themes.Default/NotificationArea.xaml
rename to src/Avalonia.Themes.Default/WindowNotificationManager.xaml
index 1c314bbfa2..2eba134b94 100644
--- a/src/Avalonia.Themes.Default/NotificationArea.xaml
+++ b/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
@@ -1,12 +1,12 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style Selector="NotificationArea">
+    <Style Selector="WindowNotificationManager">
         <Setter Property="Margin" Value="0 0 8 8"/>
         <Setter Property="Template">
             <ControlTemplate>
                 <StackPanel Name="PART_Items">
                     <StackPanel.DataTemplates>
-                        <DataTemplate DataType="NotificationContent">
+                        <DataTemplate DataType="INotification">
                             <StackPanel Spacing="8" Margin="12">
                                 <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
                                 <TextBlock MaxHeight="80" Text="{Binding Message}" TextWrapping="Wrap" Margin="0,0,12,0"/>
@@ -119,23 +119,23 @@
         <Setter Property="Background" Value="OrangeRed"/>
     </Style>
 
-    <Style Selector="NotificationArea:topleft /template/ StackPanel#PART_Items">
+    <Style Selector="WindowNotificationManager:topleft /template/ StackPanel#PART_Items">
         <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
     </Style>
 
-    <Style Selector="NotificationArea:topright /template/ StackPanel#PART_Items">
+    <Style Selector="WindowNotificationManager:topright /template/ StackPanel#PART_Items">
         <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="HorizontalAlignment" Value="Right"/>
     </Style>
 
-    <Style Selector="NotificationArea:bottomleft /template/ StackPanel#PART_Items">
+    <Style Selector="WindowNotificationManager:bottomleft /template/ StackPanel#PART_Items">
         <Setter Property="ReverseOrder" Value="True"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
     </Style>
 
-    <Style Selector="NotificationArea:bottomright /template/ StackPanel#PART_Items">
+    <Style Selector="WindowNotificationManager:bottomright /template/ StackPanel#PART_Items">
         <Setter Property="ReverseOrder" Value="True"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
         <Setter Property="HorizontalAlignment" Value="Right"/>

From b1125d73a14bbc74efb031863af9ab3dfc493158 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 7 May 2019 22:47:57 +0100
Subject: [PATCH 36/70] remove messy install step.

---
 samples/ControlCatalog/MainWindow.xaml.cs     |  9 +-------
 .../WindowNotificationManager.cs              | 23 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index b5e315573d..91d9f034a5 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -21,7 +21,7 @@ namespace ControlCatalog
             //Renderer.DrawFps = true;
             //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
 
-            _notificationArea = new WindowNotificationManager
+            _notificationArea = new WindowNotificationManager(this)
             {
                 Position = NotificationPosition.TopRight,
                 MaxItems = 3
@@ -39,12 +39,5 @@ namespace ControlCatalog
             theme.TryGetResource("Button", out _);
             AvaloniaXamlLoader.Load(this);
         }
-
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
-        {
-            base.OnTemplateApplied(e);
-
-            _notificationArea.Install(this);
-        }
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 676ea230f2..d2a2b7b3bf 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
@@ -50,6 +51,26 @@ namespace Avalonia.Controls.Notifications
             set { SetValue(MaxItemsProperty, value); }
         }
 
+        public WindowNotificationManager(Window host)
+        {
+            if (VisualChildren.Count != 0)
+            {
+                Install(host);
+            }
+            else
+            {
+                IDisposable stopListening = null;
+
+                stopListening = Observable.FromEventPattern<TemplateAppliedEventArgs>(host, nameof(host.TemplateApplied))
+                    .Subscribe(_ =>
+                    {
+                        stopListening.Dispose();
+
+                        Install(host);
+                    });
+            }
+        }
+
         static WindowNotificationManager()
         {
             PseudoClass<WindowNotificationManager, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopLeft, ":topleft");
@@ -125,7 +146,7 @@ namespace Avalonia.Controls.Notifications
             _items.Remove(notification);
         }
 
-        public void Install(Window host)
+        private void Install(Window host)
         {
             var adornerLayer = host.GetVisualDescendants()
                 .OfType<AdornerDecorator>()

From d5a02ff02371245ec0b3f79210d20d33f9a53f47 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 8 May 2019 10:20:54 +0100
Subject: [PATCH 37/70] remove redundant cast

---
 .../Notifications/WindowNotificationManager.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index d2a2b7b3bf..0ffef01a66 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -155,7 +155,7 @@ namespace Avalonia.Controls.Notifications
 
             if (adornerLayer != null)
             {
-                adornerLayer.Children.Add(this as IControl);
+                adornerLayer.Children.Add(this);
             }
         }
     }

From 41102bad249c5d8848327758a6139a4acab13599 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 8 May 2019 10:35:06 +0100
Subject: [PATCH 38/70] Notification control is not notification card and
 simple notification is now Notification.

---
 .../ViewModels/MainWindowViewModel.cs         |   4 +-
 .../ViewModels/NotificationViewModel.cs       |   4 +-
 .../Views/NotificationView.xaml               |   4 +-
 .../Notifications/Notification.cs             | 186 +++---------------
 .../Notifications/NotificationCard.cs         | 176 +++++++++++++++++
 .../Notifications/NotificationType.cs         |  10 +
 .../Notifications/SimpleNotification.cs       |  56 ------
 .../WindowNotificationManager.cs              |  10 +-
 .../Avalonia.Themes.Default.csproj            |  10 -
 src/Avalonia.Themes.Default/DefaultTheme.xaml |   1 +
 .../NotificationCard.xaml                     | 100 ++++++++++
 .../WindowNotificationManager.xaml            |  98 ---------
 12 files changed, 323 insertions(+), 336 deletions(-)
 create mode 100644 src/Avalonia.Controls/Notifications/NotificationCard.cs
 create mode 100644 src/Avalonia.Controls/Notifications/NotificationType.cs
 delete mode 100644 src/Avalonia.Controls/Notifications/SimpleNotification.cs
 create mode 100644 src/Avalonia.Themes.Default/NotificationCard.xaml

diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 962a3227d4..28cb84dad0 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -20,12 +20,12 @@ namespace ControlCatalog.ViewModels
 
             ShowManagedNotificationCommand = ReactiveCommand.Create(() =>
             {
-                NotificationManager.Show(SimpleNotification.Create("Welcome", "Avalonia now supports Notifications.",  NotificationType.Information));
+                NotificationManager.Show(new Avalonia.Controls.Notifications.Notification("Welcome", "Avalonia now supports Notifications.", NotificationType.Information));
             });
 
             ShowNativeNotificationCommand = ReactiveCommand.Create(() =>
             {
-                NotificationManager.Show(SimpleNotification.Create("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
+                NotificationManager.Show(new Avalonia.Controls.Notifications.Notification("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
             });
         }
 
diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
index 2fba6865c9..8724ba344b 100644
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -10,12 +10,12 @@ namespace ControlCatalog.ViewModels
         {
             YesCommand = ReactiveCommand.Create(() =>
             {
-                manager.Show(SimpleNotification.Create("Avalonia Notifications", "Start adding notifications to your app today."));
+                manager.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today."));
             });
 
             NoCommand = ReactiveCommand.Create(() =>
             {
-                manager.Show(SimpleNotification.Create("Avalonia Notifications", "Start adding notifications to your app today. To find out more visit..."));
+                manager.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today. To find out more visit..."));
             });
         }
 
diff --git a/samples/ControlCatalog/Views/NotificationView.xaml b/samples/ControlCatalog/Views/NotificationView.xaml
index 5552aeb370..4f8f82b37f 100644
--- a/samples/ControlCatalog/Views/NotificationView.xaml
+++ b/samples/ControlCatalog/Views/NotificationView.xaml
@@ -9,8 +9,8 @@
             <DockPanel Grid.Column="1">
                 <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
                 <StackPanel Spacing="20" DockPanel.Dock="Bottom" Margin="0,8,0,0" Orientation="Horizontal">
-                    <Button Content="No" DockPanel.Dock="Right" Notification.CloseOnClick="True" Command="{Binding NoCommand}"  Margin="0,0,8,0" />
-                    <Button Content="Yes" DockPanel.Dock="Right" Notification.CloseOnClick="True" Command="{Binding YesCommand}" />
+                    <Button Content="No" DockPanel.Dock="Right" NotificationCard.CloseOnClick="True" Command="{Binding NoCommand}"  Margin="0,0,8,0" />
+                    <Button Content="Yes" DockPanel.Dock="Right" NotificationCard.CloseOnClick="True" Command="{Binding YesCommand}" />
                 </StackPanel>
                 <TextBlock Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,8,0,0"/>
             </DockPanel>
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 54a8e81f86..4aea4e5f9d 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -1,176 +1,40 @@
 using System;
-using System.Linq;
-using System.Reactive.Linq;
-using Avalonia.Controls.Primitives;
-using Avalonia.Interactivity;
-using Avalonia.LogicalTree;
 
 namespace Avalonia.Controls.Notifications
 {
-    public class Notification : ContentControl
+    /// <summary>
+    /// Defines content for a <see cref="NotificationCard"/> control.
+    /// </summary>
+    /// <remarks>
+    /// This notification content type is compatible with native notifications.
+    /// </remarks>
+    public class Notification : INotification
     {
-        private bool _isClosed;
-        private bool _isClosing;
-
-        static Notification()
-        {
-            IsClosedProperty.Changed.AddClassHandler<Notification>(IsClosedChanged);
-        }
-
-        public Notification()
-        {
-            this.GetObservable(ContentProperty)
-                .OfType<SimpleNotification>()
-                .Subscribe(x =>
-                {
-                    switch (x.Type)
-                    {
-                        case NotificationType.Error:
-                            PseudoClasses.Add(":error");
-                            break;
-
-                        case NotificationType.Information:
-                            PseudoClasses.Add(":information");
-                            break;
-
-                        case NotificationType.Success:
-                            PseudoClasses.Add(":success");
-                            break;
-
-                        case NotificationType.Warning:
-                            PseudoClasses.Add(":warning");
-                            break;
-                    }
-                });
-        }
-
-        /// <summary>
-        /// Determines if the notification is already closing.
-        /// </summary>
-        public bool IsClosing
-        {
-            get { return _isClosing; }
-            private set { SetAndRaise(IsClosingProperty, ref _isClosing, value); }
-        }
-
-        public static readonly DirectProperty<Notification, bool> IsClosingProperty =
-            AvaloniaProperty.RegisterDirect<Notification, bool>(nameof(IsClosing), o => o.IsClosing);
-
-        /// <summary>
-        /// Determines if the notification is closed.
-        /// </summary>
-        public bool IsClosed
-        {
-            get { return _isClosed; }
-            set { SetAndRaise(IsClosedProperty, ref _isClosed, value); }
-        }
-
-        /// <summary>
-        /// Defines the <see cref="IsClosed"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Notification, bool> IsClosedProperty =
-            AvaloniaProperty.RegisterDirect<Notification, bool>(nameof(IsClosed), o => o.IsClosed, (o, v) => o.IsClosed = v);
-
-        /// <summary>
-        /// Defines the <see cref="NotificationCloseInvoked"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<RoutedEventArgs> NotificationCloseInvokedEvent =
-            RoutedEvent.Register<Notification, RoutedEventArgs>(nameof(NotificationCloseInvoked), RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Defines the <see cref="NotificationClosed"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<RoutedEventArgs> NotificationClosedEvent =
-            RoutedEvent.Register<Notification, RoutedEventArgs>(nameof(NotificationClosed), RoutingStrategies.Bubble);
-
-        /// <summary>
-        /// Raised when notification close event is invoked.
-        /// </summary>
-        public event EventHandler<RoutedEventArgs> NotificationCloseInvoked
-        {
-            add { AddHandler(NotificationCloseInvokedEvent, value); }
-            remove { RemoveHandler(NotificationCloseInvokedEvent, value); }
-        }
-
-        public event EventHandler<RoutedEventArgs> NotificationClosed
-        {
-            add { AddHandler(NotificationClosedEvent, value); }
-            remove { RemoveHandler(NotificationClosedEvent, value); }
-        }
-
-        public static bool GetCloseOnClick(Notification obj)
-        {
-            return (bool)obj.GetValue(CloseOnClickProperty);
-        }
-
-        public static void SetCloseOnClick(Notification obj, bool value)
-        {
-            obj.SetValue(CloseOnClickProperty, value);
-        }
-
-        public static readonly AvaloniaProperty CloseOnClickProperty =
-          AvaloniaProperty.RegisterAttached<Button, bool>("CloseOnClick", typeof(Notification), validate: CloseOnClickChanged);
-
-        private static bool CloseOnClickChanged(Button button, bool value)
-        {
-            if (value)
-            {
-                button.Click += Button_Click;
-            }
-            else
-            {
-                button.Click -= Button_Click;
-            }
-
-            return true;
-        }
-
-        private static void Button_Click(object sender, RoutedEventArgs e)
-        {
-            var btn = sender as ILogical;
-            var notification = btn.GetLogicalAncestors().OfType<Notification>().FirstOrDefault();
-            notification?.Close();
-        }
-
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        public Notification(string title,
+            string message,
+            NotificationType type = NotificationType.Information,
+            TimeSpan? expiration = null,
+            Action onClick = null,
+            Action onClose = null)
         {
-            base.OnTemplateApplied(e);
-            var closeButton = this.FindControl<Button>("PART_CloseButton");
-            if (closeButton != null)
-                closeButton.Click += OnCloseButtonOnClick;
-
+            Title = title;
+            Message = message;
+            Type = type;
+            Expiration = expiration.HasValue ? expiration.Value : TimeSpan.FromSeconds(5);
+            OnClick = onClick;
+            OnClose = onClose;
         }
 
-        private void OnCloseButtonOnClick(object sender, RoutedEventArgs args)
-        {
-            var button = sender as Button;
-            if (button == null)
-                return;
-
-            button.Click -= OnCloseButtonOnClick;
-            Close();
-        }
+        public string Title { get; private set; }
 
-        public void Close()
-        {
-            if (IsClosing)
-            {
-                return;
-            }
+        public string Message { get; private set; }
 
-            IsClosing = true;
+        public NotificationType Type { get; private set; }
 
-            RaiseEvent(new RoutedEventArgs(NotificationCloseInvokedEvent));
-        }
+        public TimeSpan Expiration { get; private set; }
 
-        private static void IsClosedChanged(Notification target, AvaloniaPropertyChangedEventArgs arg2)
-        {
-            if (!target.IsClosing & !target.IsClosed)
-            {
-                return;
-            }
+        public Action OnClick { get; private set; }
 
-            target.RaiseEvent(new RoutedEventArgs(NotificationClosedEvent));
-        }
+        public Action OnClose { get; private set; }
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/NotificationCard.cs b/src/Avalonia.Controls/Notifications/NotificationCard.cs
new file mode 100644
index 0000000000..268d373542
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/NotificationCard.cs
@@ -0,0 +1,176 @@
+using System;
+using System.Linq;
+using System.Reactive.Linq;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+
+namespace Avalonia.Controls.Notifications
+{
+    public class NotificationCard : ContentControl
+    {
+        private bool _isClosed;
+        private bool _isClosing;
+
+        static NotificationCard()
+        {
+            IsClosedProperty.Changed.AddClassHandler<NotificationCard>(IsClosedChanged);
+        }
+
+        public NotificationCard()
+        {
+            this.GetObservable(ContentProperty)
+                .OfType<Notification>()
+                .Subscribe(x =>
+                {
+                    switch (x.Type)
+                    {
+                        case NotificationType.Error:
+                            PseudoClasses.Add(":error");
+                            break;
+
+                        case NotificationType.Information:
+                            PseudoClasses.Add(":information");
+                            break;
+
+                        case NotificationType.Success:
+                            PseudoClasses.Add(":success");
+                            break;
+
+                        case NotificationType.Warning:
+                            PseudoClasses.Add(":warning");
+                            break;
+                    }
+                });
+        }
+
+        /// <summary>
+        /// Determines if the notification is already closing.
+        /// </summary>
+        public bool IsClosing
+        {
+            get { return _isClosing; }
+            private set { SetAndRaise(IsClosingProperty, ref _isClosing, value); }
+        }
+
+        public static readonly DirectProperty<NotificationCard, bool> IsClosingProperty =
+            AvaloniaProperty.RegisterDirect<NotificationCard, bool>(nameof(IsClosing), o => o.IsClosing);
+
+        /// <summary>
+        /// Determines if the notification is closed.
+        /// </summary>
+        public bool IsClosed
+        {
+            get { return _isClosed; }
+            set { SetAndRaise(IsClosedProperty, ref _isClosed, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="IsClosed"/> property.
+        /// </summary>
+        public static readonly DirectProperty<NotificationCard, bool> IsClosedProperty =
+            AvaloniaProperty.RegisterDirect<NotificationCard, bool>(nameof(IsClosed), o => o.IsClosed, (o, v) => o.IsClosed = v);
+
+        /// <summary>
+        /// Defines the <see cref="NotificationCloseInvoked"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> NotificationCloseInvokedEvent =
+            RoutedEvent.Register<NotificationCard, RoutedEventArgs>(nameof(NotificationCloseInvoked), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Defines the <see cref="NotificationClosed"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<RoutedEventArgs> NotificationClosedEvent =
+            RoutedEvent.Register<NotificationCard, RoutedEventArgs>(nameof(NotificationClosed), RoutingStrategies.Bubble);
+
+        /// <summary>
+        /// Raised when notification close event is invoked.
+        /// </summary>
+        public event EventHandler<RoutedEventArgs> NotificationCloseInvoked
+        {
+            add { AddHandler(NotificationCloseInvokedEvent, value); }
+            remove { RemoveHandler(NotificationCloseInvokedEvent, value); }
+        }
+
+        public event EventHandler<RoutedEventArgs> NotificationClosed
+        {
+            add { AddHandler(NotificationClosedEvent, value); }
+            remove { RemoveHandler(NotificationClosedEvent, value); }
+        }
+
+        public static bool GetCloseOnClick(NotificationCard obj)
+        {
+            return (bool)obj.GetValue(CloseOnClickProperty);
+        }
+
+        public static void SetCloseOnClick(NotificationCard obj, bool value)
+        {
+            obj.SetValue(CloseOnClickProperty, value);
+        }
+
+        public static readonly AvaloniaProperty CloseOnClickProperty =
+          AvaloniaProperty.RegisterAttached<Button, bool>("CloseOnClick", typeof(NotificationCard), validate: CloseOnClickChanged);
+
+        private static bool CloseOnClickChanged(Button button, bool value)
+        {
+            if (value)
+            {
+                button.Click += Button_Click;
+            }
+            else
+            {
+                button.Click -= Button_Click;
+            }
+
+            return true;
+        }
+
+        private static void Button_Click(object sender, RoutedEventArgs e)
+        {
+            var btn = sender as ILogical;
+            var notification = btn.GetLogicalAncestors().OfType<NotificationCard>().FirstOrDefault();
+            notification?.Close();
+        }
+
+        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        {
+            base.OnTemplateApplied(e);
+            var closeButton = this.FindControl<Button>("PART_CloseButton");
+            if (closeButton != null)
+                closeButton.Click += OnCloseButtonOnClick;
+
+        }
+
+        private void OnCloseButtonOnClick(object sender, RoutedEventArgs args)
+        {
+            var button = sender as Button;
+            if (button == null)
+                return;
+
+            button.Click -= OnCloseButtonOnClick;
+            Close();
+        }
+
+        public void Close()
+        {
+            if (IsClosing)
+            {
+                return;
+            }
+
+            IsClosing = true;
+
+            RaiseEvent(new RoutedEventArgs(NotificationCloseInvokedEvent));
+        }
+
+        private static void IsClosedChanged(NotificationCard target, AvaloniaPropertyChangedEventArgs arg2)
+        {
+            if (!target.IsClosing & !target.IsClosed)
+            {
+                return;
+            }
+
+            target.RaiseEvent(new RoutedEventArgs(NotificationClosedEvent));
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationType.cs b/src/Avalonia.Controls/Notifications/NotificationType.cs
new file mode 100644
index 0000000000..cbacc85aef
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/NotificationType.cs
@@ -0,0 +1,10 @@
+namespace Avalonia.Controls.Notifications
+{
+    public enum NotificationType
+    {
+        Information,
+        Success,
+        Warning,
+        Error
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/SimpleNotification.cs b/src/Avalonia.Controls/Notifications/SimpleNotification.cs
deleted file mode 100644
index 16e1bb483e..0000000000
--- a/src/Avalonia.Controls/Notifications/SimpleNotification.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Controls.Notifications
-{
-    /// <summary>
-    /// Defines content for a <see cref="Notification"/> control.
-    /// </summary>
-    /// <remarks>
-    /// This notification content type is compatible with native notifications.
-    /// </remarks>
-    public class SimpleNotification : INotification
-    {
-        public static INotification Create (
-            string title, 
-            string message, 
-            NotificationType type = NotificationType.Information, 
-            TimeSpan? expiration = null, 
-            Action onClick = null, 
-            Action onClose = null)
-        {
-            var result = new SimpleNotification
-            {
-                Title = title,
-                Message = message,
-                Type = type,
-                Expiration = expiration.HasValue ? expiration.Value : TimeSpan.FromSeconds(5),
-                OnClick = onClick,
-                OnClose = onClose
-            };
-
-            return result;
-        }
-
-        public string Title { get; private set; }
-
-        public string Message { get; private set; }
-
-        public NotificationType Type { get; private set; }
-
-        public TimeSpan Expiration { get; private set; }
-
-        public Action OnClick { get; private set; }
-
-        public Action OnClose { get; private set; }
-    }
-
-    public enum NotificationType
-    {
-        Information,
-        Success,
-        Warning,
-        Error
-    }
-}
diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 0ffef01a66..bf7a111025 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -99,7 +99,7 @@ namespace Avalonia.Controls.Notifications
         {
             var notification = content as INotification;
 
-            var notificationControl = new Notification
+            var notificationControl = new NotificationCard
             {
                 Content = content
             };
@@ -116,7 +116,7 @@ namespace Avalonia.Controls.Notifications
                 if (notification != null && notification.OnClick != null)
                 {
                     notification.OnClick.Invoke();
-                    (sender as Notification)?.Close();
+                    (sender as NotificationCard)?.Close();
                 }
             };
 
@@ -124,9 +124,9 @@ namespace Avalonia.Controls.Notifications
             {
                 _items.Add(notificationControl);
 
-                if (_items.OfType<Notification>().Count(i => !i.IsClosing) > MaxItems)
+                if (_items.OfType<NotificationCard>().Count(i => !i.IsClosing) > MaxItems)
                 {
-                    _items.OfType<Notification>().First(i => !i.IsClosing).Close();
+                    _items.OfType<NotificationCard>().First(i => !i.IsClosing).Close();
                 }
             }
 
@@ -142,7 +142,7 @@ namespace Avalonia.Controls.Notifications
 
         private void OnNotificationClosed(object sender, RoutedEventArgs routedEventArgs)
         {
-            var notification = sender as Notification;
+            var notification = sender as NotificationCard;
             _items.Remove(notification);
         }
 
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index 49ec1ad764..7edf4a0f81 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -21,14 +21,4 @@
   <Import Project="..\..\build\EmbedXaml.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
-  <ItemGroup>
-    <EmbeddedResource Update="NotificationArea.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="WindowNotificationManager.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 5122bf9c9a..aa35036f35 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -47,4 +47,5 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.NumericUpDown.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.AutoCompleteBox.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.WindowNotificationManager.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.NotificationCard.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Default/NotificationCard.xaml b/src/Avalonia.Themes.Default/NotificationCard.xaml
new file mode 100644
index 0000000000..67ce573f3c
--- /dev/null
+++ b/src/Avalonia.Themes.Default/NotificationCard.xaml
@@ -0,0 +1,100 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style Selector="NotificationCard">
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Setter Property="Width" Value="350"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
+        <Setter Property="Template">
+            <ControlTemplate>
+                <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
+                    <Border Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Margin="8,8,0,0">
+                        <ContentControl MinHeight="150" Content="{TemplateBinding Content}" />
+                    </Border>
+                </LayoutTransformControl>
+            </ControlTemplate>
+        </Setter>
+
+        <Style.Animations>
+            <Animation Duration="0:0:0.45" Easing="QuadraticEaseIn" FillMode="Forward">
+                <KeyFrame Cue="0%">
+                    <Setter Property="Opacity" Value="0"/>
+                    <Setter Property="TranslateTransform.Y" Value="20"/>
+                    <Setter Property="ScaleTransform.ScaleX" Value="0.85"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="0.85"/>
+                </KeyFrame>
+                <KeyFrame Cue="30%">
+                    <Setter Property="TranslateTransform.Y" Value="-20"/>
+                </KeyFrame>
+                <KeyFrame Cue="100%">
+                    <Setter Property="Opacity" Value="1"/>
+                    <Setter Property="TranslateTransform.Y" Value="0"/>
+                    <Setter Property="ScaleTransform.ScaleX" Value="1"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
+                </KeyFrame>
+            </Animation>
+        </Style.Animations>
+    </Style>
+
+    <Style Selector="NotificationCard[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
+        <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
+        <Style.Animations>
+            <Animation Duration="0:0:0.75" Easing="QuadraticEaseOut" FillMode="Forward">
+                <KeyFrame Cue="0%">
+                    <Setter Property="TranslateTransform.X" Value="0"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
+                </KeyFrame>
+                <KeyFrame Cue="70%">
+                    <Setter Property="TranslateTransform.X" Value="800"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
+                </KeyFrame>
+                <KeyFrame Cue="100%">
+                    <Setter Property="ScaleTransform.ScaleY" Value="0"/>
+                    <Setter Property="TranslateTransform.X" Value="800"/>
+                </KeyFrame>
+            </Animation>
+        </Style.Animations>
+    </Style>
+
+    <Style Selector="NotificationCard[IsClosing=true]">
+        <Style.Animations>
+            <Animation Duration="0:0:1.25" Easing="QuadraticEaseOut" FillMode="Forward">
+                <KeyFrame Cue="100%">
+                    <Setter Property="IsClosed" Value="True"/>
+                </KeyFrame>
+            </Animation>
+        </Style.Animations>
+    </Style>
+
+    <Style Selector="NotificationCard /template/ Button#PART_CloseButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <TextBlock Text="X" FontSize="12" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
+    </Style>
+
+    <Style Selector="NotificationCard">
+        <Setter Property="Background" Value="#444444"/>
+    </Style>
+    <Style Selector="NotificationCard:information">
+        <Setter Property="Background" Value="Teal"/>
+    </Style>
+    <Style Selector="NotificationCard:success">
+        <Setter Property="Background" Value="LimeGreen"/>
+    </Style>
+    <Style Selector="NotificationCard:warning">
+        <Setter Property="Background" Value="Orange"/>
+    </Style>
+    <Style Selector="NotificationCard:error">
+        <Setter Property="Background" Value="OrangeRed"/>
+    </Style>
+</Styles>
diff --git a/src/Avalonia.Themes.Default/WindowNotificationManager.xaml b/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
index 2eba134b94..91fb16d29f 100644
--- a/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
+++ b/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
@@ -21,104 +21,6 @@
         </Setter>
     </Style>
 
-    <Style Selector="Notification">
-        <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="Width" Value="350"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
-                    <Border Background="{TemplateBinding Background}" 
-                            BorderBrush="{TemplateBinding BorderBrush}" 
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Margin="8,8,0,0">
-                        <ContentControl MinHeight="150" Content="{TemplateBinding Content}" />
-                    </Border>
-                </LayoutTransformControl>
-            </ControlTemplate>
-        </Setter>
-
-        <Style.Animations>
-            <Animation Duration="0:0:0.45" Easing="QuadraticEaseIn" FillMode="Forward">
-                <KeyFrame Cue="0%">
-                    <Setter Property="Opacity" Value="0"/>
-                    <Setter Property="TranslateTransform.Y" Value="20"/>
-                    <Setter Property="ScaleTransform.ScaleX" Value="0.85"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="0.85"/>
-                </KeyFrame>
-                <KeyFrame Cue="30%">
-                    <Setter Property="TranslateTransform.Y" Value="-20"/>
-                </KeyFrame>
-                <KeyFrame Cue="100%">
-                    <Setter Property="Opacity" Value="1"/>
-                    <Setter Property="TranslateTransform.Y" Value="0"/>
-                    <Setter Property="ScaleTransform.ScaleX" Value="1"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-                </KeyFrame>
-            </Animation>
-        </Style.Animations>
-    </Style>
-
-    <Style Selector="Notification[IsClosing=true] /template/ LayoutTransformControl#PART_LayoutTransformControl">
-        <Setter Property="RenderTransformOrigin" Value="50%,0%"/>
-        <Style.Animations>
-            <Animation Duration="0:0:0.75" Easing="QuadraticEaseOut" FillMode="Forward">
-                <KeyFrame Cue="0%">
-                    <Setter Property="TranslateTransform.X" Value="0"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-                </KeyFrame>
-                <KeyFrame Cue="70%">
-                    <Setter Property="TranslateTransform.X" Value="800"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="1"/>
-                </KeyFrame>
-                <KeyFrame Cue="100%">
-                    <Setter Property="ScaleTransform.ScaleY" Value="0"/>
-                    <Setter Property="TranslateTransform.X" Value="800"/>
-                </KeyFrame>
-            </Animation>
-        </Style.Animations>
-    </Style>
-
-    <Style Selector="Notification[IsClosing=true]">
-        <Style.Animations>
-            <Animation Duration="0:0:1.25" Easing="QuadraticEaseOut" FillMode="Forward">
-                <KeyFrame Cue="100%">
-                    <Setter Property="IsClosed" Value="True"/>
-                </KeyFrame>
-            </Animation>
-        </Style.Animations>
-    </Style>
-
-    <Style Selector="Notification /template/ Button#PART_CloseButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <TextBlock Text="X" FontSize="12" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="HorizontalAlignment" Value="Right"/>
-        <Setter Property="VerticalAlignment" Value="Top"/>
-    </Style>
-
-    <Style Selector="Notification">
-        <Setter Property="Background" Value="#444444"/>
-    </Style>
-    <Style Selector="Notification:information">
-        <Setter Property="Background" Value="Teal"/>
-    </Style>
-    <Style Selector="Notification:success">
-        <Setter Property="Background" Value="LimeGreen"/>
-    </Style>
-    <Style Selector="Notification:warning">
-        <Setter Property="Background" Value="Orange"/>
-    </Style>
-    <Style Selector="Notification:error">
-        <Setter Property="Background" Value="OrangeRed"/>
-    </Style>
-
     <Style Selector="WindowNotificationManager:topleft /template/ StackPanel#PART_Items">
         <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>

From 0965a72a0f14b4ee1c94fba576a106c8a8461398 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 9 May 2019 13:30:33 +0100
Subject: [PATCH 39/70] fix close on click

---
 src/Avalonia.Controls/Notifications/NotificationCard.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/NotificationCard.cs b/src/Avalonia.Controls/Notifications/NotificationCard.cs
index 268d373542..feb9479a19 100644
--- a/src/Avalonia.Controls/Notifications/NotificationCard.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationCard.cs
@@ -98,12 +98,12 @@ namespace Avalonia.Controls.Notifications
             remove { RemoveHandler(NotificationClosedEvent, value); }
         }
 
-        public static bool GetCloseOnClick(NotificationCard obj)
+        public static bool GetCloseOnClick(Button obj)
         {
             return (bool)obj.GetValue(CloseOnClickProperty);
         }
 
-        public static void SetCloseOnClick(NotificationCard obj, bool value)
+        public static void SetCloseOnClick(Button obj, bool value)
         {
             obj.SetValue(CloseOnClickProperty, value);
         }

From 0c3469d03e2a60861a573540f26f7784d639c8d5 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 17:39:14 +0100
Subject: [PATCH 40/70] remove redundant dockpanel dock.

---
 src/Avalonia.Themes.Default/WindowNotificationManager.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Default/WindowNotificationManager.xaml b/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
index 91fb16d29f..4d04d30311 100644
--- a/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
+++ b/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
@@ -8,7 +8,7 @@
                     <StackPanel.DataTemplates>
                         <DataTemplate DataType="INotification">
                             <StackPanel Spacing="8" Margin="12">
-                                <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
+                                <TextBlock Text="{Binding Title}" FontWeight="Medium" />
                                 <TextBlock MaxHeight="80" Text="{Binding Message}" TextWrapping="Wrap" Margin="0,0,12,0"/>
                             </StackPanel>
                         </DataTemplate>

From fd48caaf673a936519703cc2dfb9c9135ea7c18d Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 17:50:01 +0100
Subject: [PATCH 41/70] fix notification event handlers naming.

---
 .../WindowNotificationManager.cs              | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index bf7a111025..93cb3b96b5 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -106,28 +106,29 @@ namespace Avalonia.Controls.Notifications
 
             if (notification != null)
             {
-                notificationControl.NotificationClosed += (sender, args) => notification.OnClose?.Invoke();
-            }
+                notificationControl.NotificationClosed += (sender, args) =>
+                {
+                    notification.OnClose?.Invoke();
 
-            notificationControl.NotificationClosed += OnNotificationClosed;
+                    _items.Remove(notification);
+                };
+            }
 
             notificationControl.PointerPressed += (sender, args) =>
             {
                 if (notification != null && notification.OnClick != null)
                 {
                     notification.OnClick.Invoke();
-                    (sender as NotificationCard)?.Close();
                 }
+
+                (sender as NotificationCard)?.Close();
             };
 
-            lock (_items)
-            {
-                _items.Add(notificationControl);
+            _items.Add(notificationControl);
 
-                if (_items.OfType<NotificationCard>().Count(i => !i.IsClosing) > MaxItems)
-                {
-                    _items.OfType<NotificationCard>().First(i => !i.IsClosing).Close();
-                }
+            if (_items.OfType<NotificationCard>().Count(i => !i.IsClosing) > MaxItems)
+            {
+                _items.OfType<NotificationCard>().First(i => !i.IsClosing).Close();
             }
 
             if (notification != null && notification.Expiration == TimeSpan.MaxValue)
@@ -140,12 +141,6 @@ namespace Avalonia.Controls.Notifications
             notificationControl.Close();
         }
 
-        private void OnNotificationClosed(object sender, RoutedEventArgs routedEventArgs)
-        {
-            var notification = sender as NotificationCard;
-            _items.Remove(notification);
-        }
-
         private void Install(Window host)
         {
             var adornerLayer = host.GetVisualDescendants()

From d185be1adfaa8efb17390a9b253079bc3f36454e Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 17:50:19 +0100
Subject: [PATCH 42/70] remove references to PART_CloseButton as no longer
 required.

---
 src/Avalonia.Themes.Default/NotificationCard.xaml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/Avalonia.Themes.Default/NotificationCard.xaml b/src/Avalonia.Themes.Default/NotificationCard.xaml
index 67ce573f3c..8e063949bd 100644
--- a/src/Avalonia.Themes.Default/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Default/NotificationCard.xaml
@@ -70,18 +70,6 @@
         </Style.Animations>
     </Style>
 
-    <Style Selector="NotificationCard /template/ Button#PART_CloseButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <TextBlock Text="X" FontSize="12" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="HorizontalAlignment" Value="Right"/>
-        <Setter Property="VerticalAlignment" Value="Top"/>
-    </Style>
-
     <Style Selector="NotificationCard">
         <Setter Property="Background" Value="#444444"/>
     </Style>

From f7fe5380b443925f7b80cf1fb138fa6758f3dd0c Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 17:51:21 +0100
Subject: [PATCH 43/70] Use Take(1) to unsubscribe the event.

---
 .../Notifications/WindowNotificationManager.cs              | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 93cb3b96b5..b1ae81abc9 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -59,13 +59,9 @@ namespace Avalonia.Controls.Notifications
             }
             else
             {
-                IDisposable stopListening = null;
-
-                stopListening = Observable.FromEventPattern<TemplateAppliedEventArgs>(host, nameof(host.TemplateApplied))
+                Observable.FromEventPattern<TemplateAppliedEventArgs>(host, nameof(host.TemplateApplied)).Take(1)
                     .Subscribe(_ =>
                     {
-                        stopListening.Dispose();
-
                         Install(host);
                     });
             }

From ae6a33ccbe1893106d93be1996379724b1b8ef15 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 17:56:30 +0100
Subject: [PATCH 44/70] fix invalid property name,

---
 .../Notifications/WindowNotificationManager.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index b1ae81abc9..103e8ee913 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -43,7 +43,7 @@ namespace Avalonia.Controls.Notifications
         }
 
         public static readonly AvaloniaProperty<int> MaxItemsProperty =
-          AvaloniaProperty.RegisterAttached<WindowNotificationManager, TopLevel, int>("Position", defaultValue: 5, inherits: true);
+          AvaloniaProperty.RegisterAttached<WindowNotificationManager, TopLevel, int>("MaxItems", defaultValue: 5, inherits: true);
 
         public int MaxItems
         {

From c644fa2550a97c1c76d55904e32532b381886299 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 18:06:13 +0100
Subject: [PATCH 45/70] dont make maxitems and position attached properties.

---
 .../WindowNotificationManager.cs              | 31 +++----------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 103e8ee913..b17b253569 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls.Primitives;
-using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Notifications
@@ -13,18 +12,8 @@ namespace Avalonia.Controls.Notifications
     {
         private IList _items;
 
-        public static NotificationPosition GetPosition(TopLevel obj)
-        {
-            return obj.GetValue(PositionProperty);
-        }
-
-        public static void SetPosition(TopLevel obj, NotificationPosition value)
-        {
-            obj.SetValue(PositionProperty, value);
-        }
-
-        public static readonly AvaloniaProperty<NotificationPosition> PositionProperty =
-          AvaloniaProperty.RegisterAttached<WindowNotificationManager, TopLevel, NotificationPosition>("Position", defaultValue: NotificationPosition.TopLeft, inherits: true);
+        public static readonly StyledProperty<NotificationPosition> PositionProperty =
+          AvaloniaProperty.Register<WindowNotificationManager, NotificationPosition>(nameof(Position), NotificationPosition.TopRight);
 
         public NotificationPosition Position
         {
@@ -32,18 +21,8 @@ namespace Avalonia.Controls.Notifications
             set { SetValue(PositionProperty, value); }
         }
 
-        public static int GetMaxItems(TopLevel obj)
-        {
-            return obj.GetValue(MaxItemsProperty);
-        }
-
-        public static void SetMaxItems(TopLevel obj, int value)
-        {
-            obj.SetValue(MaxItemsProperty, value);
-        }
-
-        public static readonly AvaloniaProperty<int> MaxItemsProperty =
-          AvaloniaProperty.RegisterAttached<WindowNotificationManager, TopLevel, int>("MaxItems", defaultValue: 5, inherits: true);
+        public static readonly StyledProperty<int> MaxItemsProperty =
+          AvaloniaProperty.Register<WindowNotificationManager, int>(nameof(MaxItems), 5);
 
         public int MaxItems
         {
@@ -106,7 +85,7 @@ namespace Avalonia.Controls.Notifications
                 {
                     notification.OnClose?.Invoke();
 
-                    _items.Remove(notification);
+                    _items.Remove(sender);
                 };
             }
 

From 63da339fba92a74d310a8d632ba42bdd8be578f6 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 18:09:09 +0100
Subject: [PATCH 46/70] rename to custom notification view.

---
 samples/ControlCatalog/MainWindow.xaml                        | 2 +-
 .../{NotificationView.xaml => CustomNotificationView.xaml}    | 2 +-
 ...otificationView.xaml.cs => CustomNotificationView.xaml.cs} | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename samples/ControlCatalog/Views/{NotificationView.xaml => CustomNotificationView.xaml} (94%)
 rename samples/ControlCatalog/Views/{NotificationView.xaml.cs => CustomNotificationView.xaml.cs} (74%)

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 49d0ee72ff..6f3bf76cec 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -8,7 +8,7 @@
         x:Class="ControlCatalog.MainWindow">
     <Window.DataTemplates>
         <DataTemplate DataType="vm:NotificationViewModel">
-            <v:NotificationView />
+            <v:CustomNotificationView />
         </DataTemplate>
     </Window.DataTemplates>
     <Panel>
diff --git a/samples/ControlCatalog/Views/NotificationView.xaml b/samples/ControlCatalog/Views/CustomNotificationView.xaml
similarity index 94%
rename from samples/ControlCatalog/Views/NotificationView.xaml
rename to samples/ControlCatalog/Views/CustomNotificationView.xaml
index 4f8f82b37f..5b99ed8e4d 100644
--- a/samples/ControlCatalog/Views/NotificationView.xaml
+++ b/samples/ControlCatalog/Views/CustomNotificationView.xaml
@@ -1,6 +1,6 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Views.NotificationView">
+             x:Class="ControlCatalog.Views.CustomNotificationView">
     <Border Padding="12" MinHeight="20" Background="DodgerBlue">
         <Grid ColumnDefinitions="Auto,*">
             <Panel Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
diff --git a/samples/ControlCatalog/Views/NotificationView.xaml.cs b/samples/ControlCatalog/Views/CustomNotificationView.xaml.cs
similarity index 74%
rename from samples/ControlCatalog/Views/NotificationView.xaml.cs
rename to samples/ControlCatalog/Views/CustomNotificationView.xaml.cs
index e5ab408af9..50a782276a 100644
--- a/samples/ControlCatalog/Views/NotificationView.xaml.cs
+++ b/samples/ControlCatalog/Views/CustomNotificationView.xaml.cs
@@ -3,9 +3,9 @@ using Avalonia.Markup.Xaml;
 
 namespace ControlCatalog.Views
 {
-    public class NotificationView : UserControl
+    public class CustomNotificationView : UserControl
     {
-        public NotificationView()
+        public CustomNotificationView()
         {
             this.InitializeComponent();
         }

From 7f21cc426da16af4a08f8006568b873384acff8c Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 18:20:25 +0100
Subject: [PATCH 47/70] use a seperate control for stackpanel reversing until
 we have flow control available.

---
 .../Notifications/ReversibleStackPanel.cs     | 61 +++++++++++++++++++
 src/Avalonia.Controls/StackPanel.cs           | 17 +-----
 .../WindowNotificationManager.xaml            | 16 ++---
 3 files changed, 70 insertions(+), 24 deletions(-)
 create mode 100644 src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs

diff --git a/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs b/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs
new file mode 100644
index 0000000000..b635c790e1
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Avalonia.Layout;
+using Avalonia.Styling;
+
+namespace Avalonia.Controls
+{
+    public class ReversibleStackPanel : StackPanel
+    {
+        /// <summary>
+        /// Defines the <see cref="ReverseOrder"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> ReverseOrderProperty =
+            AvaloniaProperty.Register<ReversibleStackPanel, bool>(nameof(ReverseOrder));        
+
+        /// <summary>
+        /// Gets or sets if the child controls will be layed out in reverse order.
+        /// </summary>
+        public bool ReverseOrder
+        {
+            get => GetValue(ReverseOrderProperty);
+            set => SetValue(ReverseOrderProperty, value);
+        }
+
+        /// <inheritdoc/>
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            var orientation = Orientation;
+            var spacing = Spacing;
+            var finalRect = new Rect(finalSize);
+            var pos = 0.0;
+
+            var children = ReverseOrder ? Children.Reverse() : Children;
+
+            foreach (Control child in children)
+            {
+                double childWidth = child.DesiredSize.Width;
+                double childHeight = child.DesiredSize.Height;
+
+                if (orientation == Orientation.Vertical)
+                {
+                    var rect = new Rect(0, pos, childWidth, childHeight)
+                        .Align(finalRect, child.HorizontalAlignment, VerticalAlignment.Top);
+                    ArrangeChild(child, rect, finalSize, orientation);
+                    pos += childHeight + spacing;
+                }
+                else
+                {
+                    var rect = new Rect(pos, 0, childWidth, childHeight)
+                        .Align(finalRect, HorizontalAlignment.Left, child.VerticalAlignment);
+                    ArrangeChild(child, rect, finalSize, orientation);
+                    pos += childWidth + spacing;
+                }
+            }
+
+            return finalSize;
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/StackPanel.cs b/src/Avalonia.Controls/StackPanel.cs
index 0f55344769..07abb906b7 100644
--- a/src/Avalonia.Controls/StackPanel.cs
+++ b/src/Avalonia.Controls/StackPanel.cs
@@ -25,12 +25,6 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<Orientation> OrientationProperty =
             AvaloniaProperty.Register<StackPanel, Orientation>(nameof(Orientation), Orientation.Vertical);
 
-        /// <summary>
-        /// Defines the <see cref="ReverseOrder"/> property.
-        /// </summary>
-        public static readonly StyledProperty<bool> ReverseOrderProperty =
-            AvaloniaProperty.Register<StackPanel, bool>(nameof(ReverseOrder));
-
         /// <summary>
         /// Initializes static members of the <see cref="StackPanel"/> class.
         /// </summary>
@@ -58,15 +52,6 @@ namespace Avalonia.Controls
             set { SetValue(OrientationProperty, value); }
         }
 
-        /// <summary>
-        /// Gets or sets if the child controls will be layed out in reverse order.
-        /// </summary>
-        public bool ReverseOrder
-        {
-            get => GetValue(ReverseOrderProperty);
-            set => SetValue(ReverseOrderProperty, value);
-        }
-
         /// <summary>
         /// Gets the next control in the specified direction.
         /// </summary>
@@ -246,7 +231,7 @@ namespace Avalonia.Controls
             var finalRect = new Rect(finalSize);
             var pos = 0.0;
 
-            var children = ReverseOrder ? Children.Reverse() : Children;
+            var children = Children;
 
             foreach (Control child in children)
             {
diff --git a/src/Avalonia.Themes.Default/WindowNotificationManager.xaml b/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
index 4d04d30311..7c1efa2e82 100644
--- a/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
+++ b/src/Avalonia.Themes.Default/WindowNotificationManager.xaml
@@ -4,8 +4,8 @@
         <Setter Property="Margin" Value="0 0 8 8"/>
         <Setter Property="Template">
             <ControlTemplate>
-                <StackPanel Name="PART_Items">
-                    <StackPanel.DataTemplates>
+                <ReversibleStackPanel Name="PART_Items">
+                    <ReversibleStackPanel.DataTemplates>
                         <DataTemplate DataType="INotification">
                             <StackPanel Spacing="8" Margin="12">
                                 <TextBlock Text="{Binding Title}" FontWeight="Medium" />
@@ -15,29 +15,29 @@
                         <DataTemplate DataType="x:String">
                             <TextBlock Text="{Binding }" Margin="12" />
                         </DataTemplate>
-                    </StackPanel.DataTemplates>
-                </StackPanel>
+                    </ReversibleStackPanel.DataTemplates>
+                </ReversibleStackPanel>
             </ControlTemplate>
         </Setter>
     </Style>
 
-    <Style Selector="WindowNotificationManager:topleft /template/ StackPanel#PART_Items">
+    <Style Selector="WindowNotificationManager:topleft /template/ ReversibleStackPanel#PART_Items">
         <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
     </Style>
 
-    <Style Selector="WindowNotificationManager:topright /template/ StackPanel#PART_Items">
+    <Style Selector="WindowNotificationManager:topright /template/ ReversibleStackPanel#PART_Items">
         <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="HorizontalAlignment" Value="Right"/>
     </Style>
 
-    <Style Selector="WindowNotificationManager:bottomleft /template/ StackPanel#PART_Items">
+    <Style Selector="WindowNotificationManager:bottomleft /template/ ReversibleStackPanel#PART_Items">
         <Setter Property="ReverseOrder" Value="True"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
     </Style>
 
-    <Style Selector="WindowNotificationManager:bottomright /template/ StackPanel#PART_Items">
+    <Style Selector="WindowNotificationManager:bottomright /template/ ReversibleStackPanel#PART_Items">
         <Setter Property="ReverseOrder" Value="True"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
         <Setter Property="HorizontalAlignment" Value="Right"/>

From d2f1d7acb9168b11a419ea5f4702c83632835289 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 18:40:28 +0100
Subject: [PATCH 48/70] notificationcard default colours are defined as
 resources

---
 src/Avalonia.Themes.Default/Accents/BaseDark.xaml |  8 ++++++++
 src/Avalonia.Themes.Default/NotificationCard.xaml | 10 +++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
index e9d710b3f0..a5877b0e8b 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
@@ -46,6 +46,14 @@
         <SolidColorBrush x:Key="ErrorBrush" Color="{DynamicResource ErrorColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ErrorLowBrush" Color="{DynamicResource ErrorLowColor}"></SolidColorBrush>
 
+        <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444"/>
+        <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="Teal"/>
+        <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="LimeGreen"/>
+        <SolidColorBrush x:Key="NotificationCardWarningBackgroundBrush" Color="Orange"/>
+        <SolidColorBrush x:Key="NotificationCardErrorBackgroundBrush" Color="OrangeRed"/>
+
+
+
         <Thickness x:Key="ThemeBorderThickness">1,1,1,1</Thickness>
         <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
 
diff --git a/src/Avalonia.Themes.Default/NotificationCard.xaml b/src/Avalonia.Themes.Default/NotificationCard.xaml
index 8e063949bd..e94cb33d1e 100644
--- a/src/Avalonia.Themes.Default/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Default/NotificationCard.xaml
@@ -71,18 +71,18 @@
     </Style>
 
     <Style Selector="NotificationCard">
-        <Setter Property="Background" Value="#444444"/>
+        <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}"/>
     </Style>
     <Style Selector="NotificationCard:information">
-        <Setter Property="Background" Value="Teal"/>
+        <Setter Property="Background" Value="{DynamicResource NotificationCardInformationBackgroundBrush}"/>
     </Style>
     <Style Selector="NotificationCard:success">
-        <Setter Property="Background" Value="LimeGreen"/>
+        <Setter Property="Background" Value="{DynamicResource NotificationCardSuccessBackgroundBrush}"/>
     </Style>
     <Style Selector="NotificationCard:warning">
-        <Setter Property="Background" Value="Orange"/>
+        <Setter Property="Background" Value="{DynamicResource NotificationCardWarningBackgroundBrush}"/>
     </Style>
     <Style Selector="NotificationCard:error">
-        <Setter Property="Background" Value="OrangeRed"/>
+        <Setter Property="Background" Value="{DynamicResource NotificationCardErrorBackgroundBrush}"/>
     </Style>
 </Styles>

From 5aa0b6d62ae19c7a5a408d9918afe27e0e4f0260 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 18:42:29 +0100
Subject: [PATCH 49/70] add notificationcard resource colors to dark and light
 themes

---
 src/Avalonia.Themes.Default/Accents/BaseDark.xaml  | 2 --
 src/Avalonia.Themes.Default/Accents/BaseLight.xaml | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
index a5877b0e8b..5a79ba7d83 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseDark.xaml
@@ -52,8 +52,6 @@
         <SolidColorBrush x:Key="NotificationCardWarningBackgroundBrush" Color="Orange"/>
         <SolidColorBrush x:Key="NotificationCardErrorBackgroundBrush" Color="OrangeRed"/>
 
-
-
         <Thickness x:Key="ThemeBorderThickness">1,1,1,1</Thickness>
         <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
 
diff --git a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
index c40305151e..4a5bd71474 100644
--- a/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Default/Accents/BaseLight.xaml
@@ -46,6 +46,12 @@
         <SolidColorBrush x:Key="ErrorBrush" Color="{DynamicResource ErrorColor}"></SolidColorBrush>
         <SolidColorBrush x:Key="ErrorLowBrush" Color="{DynamicResource ErrorLowColor}"></SolidColorBrush>
 
+        <SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444"/>
+        <SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="Teal"/>
+        <SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="LimeGreen"/>
+        <SolidColorBrush x:Key="NotificationCardWarningBackgroundBrush" Color="Orange"/>
+        <SolidColorBrush x:Key="NotificationCardErrorBackgroundBrush" Color="OrangeRed"/>
+
         <Thickness x:Key="ThemeBorderThickness">1</Thickness>
         <sys:Double x:Key="ThemeDisabledOpacity">0.5</sys:Double>
 

From 4996c0b1730f17f1a5dc2aeecaa5de56b0b603d3 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 19:30:14 +0100
Subject: [PATCH 50/70] add xml comments.

---
 .../IManagedNotificationManager.cs            | 18 +++++
 .../Notifications/INotification.cs            | 44 ++++++++++++
 .../Notifications/INotificationManager.cs     | 30 +++-----
 .../Notifications/Notification.cs             | 24 ++++++-
 .../Notifications/NotificationCard.cs         | 72 +++++++++----------
 .../Notifications/NotificationPosition.cs     | 16 +++++
 .../Notifications/NotificationType.cs         |  8 ++-
 .../Notifications/ReversibleStackPanel.cs     | 13 ++--
 .../WindowNotificationManager.cs              | 40 ++++++++---
 9 files changed, 191 insertions(+), 74 deletions(-)
 create mode 100644 src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
 create mode 100644 src/Avalonia.Controls/Notifications/INotification.cs
 create mode 100644 src/Avalonia.Controls/Notifications/NotificationPosition.cs

diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
new file mode 100644
index 0000000000..330013317f
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -0,0 +1,18 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Controls.Notifications
+{
+    /// <summary>
+    /// Interface for a managed notification manager.
+    /// Managed notification managers can show any content.
+    /// </summary>
+    public interface IManagedNotificationManager : INotificationManager
+    {
+        /// <summary>
+        /// Shows a notification.
+        /// </summary>
+        /// <param name="content">The content to be displayed.</param>
+        void Show(object content);
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/INotification.cs b/src/Avalonia.Controls/Notifications/INotification.cs
new file mode 100644
index 0000000000..7ad2c770a6
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/INotification.cs
@@ -0,0 +1,44 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+
+namespace Avalonia.Controls.Notifications
+{
+    /// <summary>
+    /// Interface for a notification.
+    /// </summary>
+    public interface INotification
+    {
+        /// <summary>
+        /// Gets the Title of the notification.
+        /// </summary>
+        string Title { get; }
+
+        /// <summary>
+        /// Gets the Message of the notification.
+        /// </summary>
+        string Message { get; }
+
+        /// <summary>
+        /// Gets the <see cref="NotificationType"/> of the notification.
+        /// </summary>
+        NotificationType Type { get; }
+
+        /// <summary>
+        /// Gets the expiration time of the notification after which it will automatically close.
+        /// If the value is <see cref="TimeSpan.Zero"/> then the notification will remain open until the user closes it.
+        /// </summary>
+        TimeSpan Expiration { get; }
+
+        /// <summary>
+        /// Gets an Action to be run when the notification is clicked.
+        /// </summary>
+        Action OnClick { get; }
+
+        /// <summary>
+        /// Gets an Action to be run when the notification is closed.
+        /// </summary>
+        Action OnClose { get; }
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
index f2af87fb4a..53c3d68f8e 100644
--- a/src/Avalonia.Controls/Notifications/INotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -1,29 +1,17 @@
-using System;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 namespace Avalonia.Controls.Notifications
 {
-    public interface INotification
-    {
-        string Title { get; }
-
-        string Message { get; }
-
-        NotificationType Type { get; }
-
-        TimeSpan Expiration { get; }
-
-        Action OnClick { get; }
-
-        Action OnClose { get; }
-    }
-
+    /// <summary>
+    /// Defines the interfaces for NotificationManagers.
+    /// </summary>
     public interface INotificationManager
     {
+        /// <summary>
+        /// Show a notification.
+        /// </summary>
+        /// <param name="notification">The notification to be displayed.</param>
         void Show(INotification notification);
     }
-
-    public interface IManagedNotificationManager : INotificationManager
-    {
-        void Show(object content);
-    }
 }
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 4aea4e5f9d..b488d3a487 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -1,15 +1,29 @@
-using System;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
 
 namespace Avalonia.Controls.Notifications
 {
     /// <summary>
-    /// Defines content for a <see cref="NotificationCard"/> control.
+    /// Implements the INotification interfaces.
+    /// Can be displayed by both <see cref="INotificationManager"/> and <see cref="IManagedNotificationManager"/>
     /// </summary>
     /// <remarks>
     /// This notification content type is compatible with native notifications.
     /// </remarks>
     public class Notification : INotification
     {
+        /// <summary>
+        /// Instantiates an instance of <see cref="Notification"/>
+        /// </summary>
+        /// <param name="title">The title of the notification.</param>
+        /// <param name="message">The message to be displayed in the notification.</param>
+        /// <param name="type">The <see cref="NotificationType"/> of the notification.</param>
+        /// <param name="expiration">The expiry time at which the notification will close. 
+        /// Use <see cref="TimeSpan.Zero"/> for notifications that will remain open.</param>
+        /// <param name="onClick">The Action to call when the notification is clicked.</param>
+        /// <param name="onClose">The Action to call when the notification is closed.</param>
         public Notification(string title,
             string message,
             NotificationType type = NotificationType.Information,
@@ -25,16 +39,22 @@ namespace Avalonia.Controls.Notifications
             OnClose = onClose;
         }
 
+        /// <inheritdoc/>
         public string Title { get; private set; }
 
+        /// <inheritdoc/>
         public string Message { get; private set; }
 
+        /// <inheritdoc/>
         public NotificationType Type { get; private set; }
 
+        /// <inheritdoc/>
         public TimeSpan Expiration { get; private set; }
 
+        /// <inheritdoc/>
         public Action OnClick { get; private set; }
 
+        /// <inheritdoc/>
         public Action OnClose { get; private set; }
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/NotificationCard.cs b/src/Avalonia.Controls/Notifications/NotificationCard.cs
index feb9479a19..6b326073a6 100644
--- a/src/Avalonia.Controls/Notifications/NotificationCard.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationCard.cs
@@ -1,24 +1,38 @@
-using System;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
 using System.Linq;
 using System.Reactive.Linq;
-using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
 
 namespace Avalonia.Controls.Notifications
 {
+    /// <summary>
+    /// Control that represents and displays a notification.
+    /// </summary>
     public class NotificationCard : ContentControl
     {
         private bool _isClosed;
         private bool _isClosing;
 
-        static NotificationCard()
-        {
-            IsClosedProperty.Changed.AddClassHandler<NotificationCard>(IsClosedChanged);
-        }
-
+        /// <summary>
+        /// Instantiates a new instance of <see cref="NotificationCard"/>.
+        /// </summary>
         public NotificationCard()
         {
+            this.GetObservable(IsClosedProperty)
+                .Subscribe(x =>
+                {
+                    if (!IsClosing & !IsClosed)
+                    {
+                        return;
+                    }
+
+                    RaiseEvent(new RoutedEventArgs(NotificationClosedEvent));
+                });
+
             this.GetObservable(ContentProperty)
                 .OfType<Notification>()
                 .Subscribe(x =>
@@ -53,6 +67,9 @@ namespace Avalonia.Controls.Notifications
             private set { SetAndRaise(IsClosingProperty, ref _isClosing, value); }
         }
 
+        /// <summary>
+        /// Defines the <see cref="IsClosing"/> property.
+        /// </summary>
         public static readonly DirectProperty<NotificationCard, bool> IsClosingProperty =
             AvaloniaProperty.RegisterDirect<NotificationCard, bool>(nameof(IsClosing), o => o.IsClosing);
 
@@ -92,6 +109,9 @@ namespace Avalonia.Controls.Notifications
             remove { RemoveHandler(NotificationCloseInvokedEvent, value); }
         }
 
+        /// <summary>
+        /// Raised when the <see cref="NotificationCard"/> has closed.
+        /// </summary>
         public event EventHandler<RoutedEventArgs> NotificationClosed
         {
             add { AddHandler(NotificationClosedEvent, value); }
@@ -108,6 +128,9 @@ namespace Avalonia.Controls.Notifications
             obj.SetValue(CloseOnClickProperty, value);
         }
 
+        /// <summary>
+        /// Defines the CloseOnClick property.
+        /// </summary>
         public static readonly AvaloniaProperty CloseOnClickProperty =
           AvaloniaProperty.RegisterAttached<Button, bool>("CloseOnClick", typeof(NotificationCard), validate: CloseOnClickChanged);
 
@@ -125,6 +148,9 @@ namespace Avalonia.Controls.Notifications
             return true;
         }
 
+        /// <summary>
+        /// Called when a button inside the Notification is clicked.
+        /// </summary>
         private static void Button_Click(object sender, RoutedEventArgs e)
         {
             var btn = sender as ILogical;
@@ -132,25 +158,9 @@ namespace Avalonia.Controls.Notifications
             notification?.Close();
         }
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
-        {
-            base.OnTemplateApplied(e);
-            var closeButton = this.FindControl<Button>("PART_CloseButton");
-            if (closeButton != null)
-                closeButton.Click += OnCloseButtonOnClick;
-
-        }
-
-        private void OnCloseButtonOnClick(object sender, RoutedEventArgs args)
-        {
-            var button = sender as Button;
-            if (button == null)
-                return;
-
-            button.Click -= OnCloseButtonOnClick;
-            Close();
-        }
-
+        /// <summary>
+        /// Closes the <see cref="NotificationCard"/>.
+        /// </summary>
         public void Close()
         {
             if (IsClosing)
@@ -162,15 +172,5 @@ namespace Avalonia.Controls.Notifications
 
             RaiseEvent(new RoutedEventArgs(NotificationCloseInvokedEvent));
         }
-
-        private static void IsClosedChanged(NotificationCard target, AvaloniaPropertyChangedEventArgs arg2)
-        {
-            if (!target.IsClosing & !target.IsClosed)
-            {
-                return;
-            }
-
-            target.RaiseEvent(new RoutedEventArgs(NotificationClosedEvent));
-        }
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/NotificationPosition.cs b/src/Avalonia.Controls/Notifications/NotificationPosition.cs
new file mode 100644
index 0000000000..ce55aafdb9
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/NotificationPosition.cs
@@ -0,0 +1,16 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Controls.Notifications
+{
+    /// <summary>
+    /// Enumeration of Notifications positions.
+    /// </summary>
+    public enum NotificationPosition
+    {
+        TopLeft,
+        TopRight,
+        BottomLeft,
+        BottomRight
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationType.cs b/src/Avalonia.Controls/Notifications/NotificationType.cs
index cbacc85aef..fdcf5eec0a 100644
--- a/src/Avalonia.Controls/Notifications/NotificationType.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationType.cs
@@ -1,5 +1,11 @@
-namespace Avalonia.Controls.Notifications
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+namespace Avalonia.Controls.Notifications
 {
+    /// <summary>
+    /// Enumeration of types for <see cref="INotification"/>.
+    /// </summary>
     public enum NotificationType
     {
         Information,
diff --git a/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs b/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs
index b635c790e1..768d87c63e 100644
--- a/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs
+++ b/src/Avalonia.Controls/Notifications/ReversibleStackPanel.cs
@@ -1,19 +1,22 @@
-using System;
-using System.Collections.Generic;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
 using System.Linq;
-using System.Text;
 using Avalonia.Layout;
-using Avalonia.Styling;
 
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Implements a <see cref="StackPanel"/> where the flow direction of its items can be reversed.
+    /// </summary>
     public class ReversibleStackPanel : StackPanel
     {
         /// <summary>
         /// Defines the <see cref="ReverseOrder"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> ReverseOrderProperty =
-            AvaloniaProperty.Register<ReversibleStackPanel, bool>(nameof(ReverseOrder));        
+            AvaloniaProperty.Register<ReversibleStackPanel, bool>(nameof(ReverseOrder));
 
         /// <summary>
         /// Gets or sets if the child controls will be layed out in reverse order.
diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index b17b253569..3dffea160d 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -1,3 +1,6 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
 using System;
 using System.Collections;
 using System.Linq;
@@ -8,28 +11,47 @@ using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Notifications
 {
+    /// <summary>
+    /// Defines a WindowNotificationManager control.
+    /// </summary>
     public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager
     {
         private IList _items;
 
+        /// <summary>
+        /// Defines the <see cref="Position"/> property.
+        /// </summary>
         public static readonly StyledProperty<NotificationPosition> PositionProperty =
           AvaloniaProperty.Register<WindowNotificationManager, NotificationPosition>(nameof(Position), NotificationPosition.TopRight);
 
+        /// <summary>
+        /// Defines which corner of the screen notifications can be displayed in. <seealso cref="NotificationPosition"/>.
+        /// </summary>
         public NotificationPosition Position
         {
             get { return GetValue(PositionProperty); }
             set { SetValue(PositionProperty, value); }
         }
 
+        /// <summary>
+        /// Defines the <see cref="MaxItems"/> property.
+        /// </summary>
         public static readonly StyledProperty<int> MaxItemsProperty =
           AvaloniaProperty.Register<WindowNotificationManager, int>(nameof(MaxItems), 5);
 
+        /// <summary>
+        /// Defines the maximum number of notifications visible at once.
+        /// </summary>
         public int MaxItems
         {
             get { return GetValue(MaxItemsProperty); }
             set { SetValue(MaxItemsProperty, value); }
         }
 
+        /// <summary>
+        /// Instantiates a new instance of <see cref="WindowNotificationManager"/>.
+        /// </summary>
+        /// <param name="host">The window that will host the control.</param>
         public WindowNotificationManager(Window host)
         {
             if (VisualChildren.Count != 0)
@@ -57,6 +79,7 @@ namespace Avalonia.Controls.Notifications
             VerticalAlignmentProperty.OverrideDefaultValue<WindowNotificationManager>(Layout.VerticalAlignment.Stretch);
         }
 
+        /// <inheritdoc/>
         protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
         {
             base.OnTemplateApplied(e);
@@ -65,11 +88,13 @@ namespace Avalonia.Controls.Notifications
             _items = itemsControl?.Children;
         }
 
+        /// <inheritdoc/>
         public void Show(INotification content)
         {
             Show(content as object);
         }
 
+        /// <inheritdoc/>
         public async void Show(object content)
         {
             var notification = content as INotification;
@@ -106,7 +131,7 @@ namespace Avalonia.Controls.Notifications
                 _items.OfType<NotificationCard>().First(i => !i.IsClosing).Close();
             }
 
-            if (notification != null && notification.Expiration == TimeSpan.MaxValue)
+            if (notification != null && notification.Expiration == TimeSpan.Zero)
             {
                 return;
             }
@@ -116,6 +141,11 @@ namespace Avalonia.Controls.Notifications
             notificationControl.Close();
         }
 
+        /// <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(Window host)
         {
             var adornerLayer = host.GetVisualDescendants()
@@ -129,12 +159,4 @@ namespace Avalonia.Controls.Notifications
             }
         }
     }
-
-    public enum NotificationPosition
-    {
-        TopLeft,
-        TopRight,
-        BottomLeft,
-        BottomRight
-    }
 }

From 3725a7a8d5bd1ade3978799fd75e1590f13ed207 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 10 May 2019 19:50:40 +0100
Subject: [PATCH 51/70] remove accidentally pasted code.

---
 samples/ControlCatalog/MainView.xaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index b6b4e0c242..9f1899acc5 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -31,7 +31,6 @@
       <TabItem Header="Menu"><pages:MenuPage/></TabItem>
       <TabItem Header="Notifications"><pages:NotificationsPage/></TabItem>
 	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
-	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
       <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
       <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
       <TabItem Header="Slider"><pages:SliderPage/></TabItem>

From 62dc265b2e43495c2f7ac6aeaf70b67211ceeb78 Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 20:58:22 +0100
Subject: [PATCH 52/70] Update
 src/Avalonia.Controls/Notifications/INotification.cs

improve xml comments.

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 src/Avalonia.Controls/Notifications/INotification.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/INotification.cs b/src/Avalonia.Controls/Notifications/INotification.cs
index 7ad2c770a6..ae0ae8f4ea 100644
--- a/src/Avalonia.Controls/Notifications/INotification.cs
+++ b/src/Avalonia.Controls/Notifications/INotification.cs
@@ -6,7 +6,7 @@ using System;
 namespace Avalonia.Controls.Notifications
 {
     /// <summary>
-    /// Interface for a notification.
+    /// Represents a notification that can be shown in a window or by the host operating system.
     /// </summary>
     public interface INotification
     {

From 3aadfb4b5d66ac8ee16d3e61d7f59a03accba130 Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 20:58:46 +0100
Subject: [PATCH 53/70] Update
 src/Avalonia.Controls/Notifications/INotificationManager.cs

improve xml comment

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 src/Avalonia.Controls/Notifications/INotificationManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/INotificationManager.cs b/src/Avalonia.Controls/Notifications/INotificationManager.cs
index 53c3d68f8e..21430c900d 100644
--- a/src/Avalonia.Controls/Notifications/INotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/INotificationManager.cs
@@ -4,7 +4,8 @@
 namespace Avalonia.Controls.Notifications
 {
     /// <summary>
-    /// Defines the interfaces for NotificationManagers.
+    /// Represents a notification manager that can be used to show notifications in a window or using
+	/// the host operating system.
     /// </summary>
     public interface INotificationManager
     {

From fb0be60029ba0fcda8b56543bde49e12e0b85b72 Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 20:59:26 +0100
Subject: [PATCH 54/70] Update
 src/Avalonia.Controls/Notifications/Notification.cs

consistent xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 src/Avalonia.Controls/Notifications/Notification.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index b488d3a487..0b442de816 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Controls.Notifications
     public class Notification : INotification
     {
         /// <summary>
-        /// Instantiates an instance of <see cref="Notification"/>
+        /// Initializes a new instance of the <see cref="Notification"/> class.
         /// </summary>
         /// <param name="title">The title of the notification.</param>
         /// <param name="message">The message to be displayed in the notification.</param>

From 0119df4b9395efe79a3e1d97dd744392392363cd Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:01:20 +0100
Subject: [PATCH 55/70] Update
 src/Avalonia.Controls/Notifications/WindowNotificationManager.cs

improve xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 .../Notifications/WindowNotificationManager.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 3dffea160d..4b0b4a5c50 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -49,7 +49,7 @@ namespace Avalonia.Controls.Notifications
         }
 
         /// <summary>
-        /// Instantiates a new instance of <see cref="WindowNotificationManager"/>.
+        /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
         /// </summary>
         /// <param name="host">The window that will host the control.</param>
         public WindowNotificationManager(Window host)

From ad2b4c5ddfa76b3f88aa562173499949333f12b0 Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:01:57 +0100
Subject: [PATCH 56/70] Update
 src/Avalonia.Controls/Notifications/NotificationCard.cs

improved xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 src/Avalonia.Controls/Notifications/NotificationCard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/NotificationCard.cs b/src/Avalonia.Controls/Notifications/NotificationCard.cs
index 6b326073a6..db136492ad 100644
--- a/src/Avalonia.Controls/Notifications/NotificationCard.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationCard.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Controls.Notifications
         private bool _isClosing;
 
         /// <summary>
-        /// Instantiates a new instance of <see cref="NotificationCard"/>.
+        /// Initializes a new instance of the <see cref="NotificationCard"/> class.
         /// </summary>
         public NotificationCard()
         {

From cda6a58f7d6c45ebef8eb970952983f02c21902c Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:02:33 +0100
Subject: [PATCH 57/70] Update
 src/Avalonia.Controls/Notifications/Notification.cs

improved xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 src/Avalonia.Controls/Notifications/Notification.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 0b442de816..19280f2137 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -10,7 +10,8 @@ namespace Avalonia.Controls.Notifications
     /// Can be displayed by both <see cref="INotificationManager"/> and <see cref="IManagedNotificationManager"/>
     /// </summary>
     /// <remarks>
-    /// This notification content type is compatible with native notifications.
+    /// This class represents a notification that can be displayed either in a window using
+    /// <see cref="WindowNotificationManager"/> or by the host operating system (to be implemented).
     /// </remarks>
     public class Notification : INotification
     {

From 3575525c2eb4596a1e249339b2a0dccfb034e33d Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:02:53 +0100
Subject: [PATCH 58/70] Update
 src/Avalonia.Controls/Notifications/Notification.cs

improved xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 src/Avalonia.Controls/Notifications/Notification.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 19280f2137..828e4df899 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -6,7 +6,7 @@ using System;
 namespace Avalonia.Controls.Notifications
 {
     /// <summary>
-    /// Implements the INotification interfaces.
+    /// A notification that can be shown in a window or by the host operating system.
     /// Can be displayed by both <see cref="INotificationManager"/> and <see cref="IManagedNotificationManager"/>
     /// </summary>
     /// <remarks>

From 4ea7a6643a5911d36ea7b279302607d252a917d2 Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:03:26 +0100
Subject: [PATCH 59/70] Update
 src/Avalonia.Controls/Notifications/Notification.cs

improve xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 src/Avalonia.Controls/Notifications/Notification.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 828e4df899..1e5a5a7955 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Controls.Notifications
         /// <param name="type">The <see cref="NotificationType"/> of the notification.</param>
         /// <param name="expiration">The expiry time at which the notification will close. 
         /// Use <see cref="TimeSpan.Zero"/> for notifications that will remain open.</param>
-        /// <param name="onClick">The Action to call when the notification is clicked.</param>
+        /// <param name="onClick">An Action to call when the notification is clicked.</param>
         /// <param name="onClose">The Action to call when the notification is closed.</param>
         public Notification(string title,
             string message,

From 384fb4e3e4a1325c436213751a61b141c6e604b9 Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:03:44 +0100
Subject: [PATCH 60/70] Update
 src/Avalonia.Controls/Notifications/Notification.cs

improve xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 src/Avalonia.Controls/Notifications/Notification.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 1e5a5a7955..9aea607874 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Controls.Notifications
         /// <param name="expiration">The expiry time at which the notification will close. 
         /// Use <see cref="TimeSpan.Zero"/> for notifications that will remain open.</param>
         /// <param name="onClick">An Action to call when the notification is clicked.</param>
-        /// <param name="onClose">The Action to call when the notification is closed.</param>
+        /// <param name="onClose">An Action to call when the notification is closed.</param>
         public Notification(string title,
             string message,
             NotificationType type = NotificationType.Information,

From 36c042982924d8c1bae9b98f93ab36605c54519f Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:04:04 +0100
Subject: [PATCH 61/70] Update
 src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs

improve xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 .../Notifications/IManagedNotificationManager.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
index 330013317f..ba018b956e 100644
--- a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -4,7 +4,7 @@
 namespace Avalonia.Controls.Notifications
 {
     /// <summary>
-    /// Interface for a managed notification manager.
+    /// Represents a notification manager that can show arbitrary content.
     /// Managed notification managers can show any content.
     /// </summary>
     public interface IManagedNotificationManager : INotificationManager

From 89520e5e04c5c959fd8c25feb6196d919fc518ab Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:04:34 +0100
Subject: [PATCH 62/70] Update
 src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs

improve xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 .../Notifications/IManagedNotificationManager.cs             | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
index ba018b956e..03c2fe85b8 100644
--- a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -7,6 +7,11 @@ namespace Avalonia.Controls.Notifications
     /// Represents a notification manager that can show arbitrary content.
     /// Managed notification managers can show any content.
     /// </summary>
+    /// <remarks>
+    /// Because notification managers of this type are implemented purely in managed code, they
+    /// can display arbitrary content, as opposed to notification managers which display notifications
+    /// using the host operating system's notification mechanism.
+    /// </remarks>
     public interface IManagedNotificationManager : INotificationManager
     {
         /// <summary>

From a1b4e31241c086c893c0d3ca83f0f018b2f5d856 Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:05:01 +0100
Subject: [PATCH 63/70] Update
 src/Avalonia.Controls/Notifications/WindowNotificationManager.cs

improve xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 .../Notifications/WindowNotificationManager.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 4b0b4a5c50..00ee581f35 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -12,7 +12,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Controls.Notifications
 {
     /// <summary>
-    /// Defines a WindowNotificationManager control.
+    /// An <see cref="INotificationManager"/> that displays notifications in a <see cref="Window"/>.
     /// </summary>
     public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager
     {

From 042d6094cb7287dc2b6d1f6facb87e7e904433ed Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:05:35 +0100
Subject: [PATCH 64/70] Update
 src/Avalonia.Controls/Notifications/INotification.cs

improved xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 src/Avalonia.Controls/Notifications/INotification.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/INotification.cs b/src/Avalonia.Controls/Notifications/INotification.cs
index ae0ae8f4ea..2c6cb90133 100644
--- a/src/Avalonia.Controls/Notifications/INotification.cs
+++ b/src/Avalonia.Controls/Notifications/INotification.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Controls.Notifications
         string Title { get; }
 
         /// <summary>
-        /// Gets the Message of the notification.
+        /// Gets the notification message.
         /// </summary>
         string Message { get; }
 

From 917b790e8b3df74d593d6656755ce78470fde39d Mon Sep 17 00:00:00 2001
From: danwalmsley <dan@walms.co.uk>
Date: Sat, 11 May 2019 21:06:05 +0100
Subject: [PATCH 65/70] Update
 src/Avalonia.Controls/Notifications/NotificationPosition.cs

improve xml comments

Co-Authored-By: Steven Kirk <grokys@users.noreply.github.com>
---
 src/Avalonia.Controls/Notifications/NotificationPosition.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/NotificationPosition.cs b/src/Avalonia.Controls/Notifications/NotificationPosition.cs
index ce55aafdb9..ef1d5e53d6 100644
--- a/src/Avalonia.Controls/Notifications/NotificationPosition.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationPosition.cs
@@ -4,7 +4,8 @@
 namespace Avalonia.Controls.Notifications
 {
     /// <summary>
-    /// Enumeration of Notifications positions.
+    /// Describes the possible positions for <see cref="Notification"/>s that are displayed by a
+    /// <see cref="WindowNotificationManager"/>.
     /// </summary>
     public enum NotificationPosition
     {

From 823a3559c75d393d3933a37f15c004b9ed5f9481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Sat, 11 May 2019 23:16:45 +0100
Subject: [PATCH 66/70] Fixed stack panel children spacing.

---
 src/Avalonia.Controls/StackPanel.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Avalonia.Controls/StackPanel.cs b/src/Avalonia.Controls/StackPanel.cs
index d89df8556b..c29faa1b4d 100644
--- a/src/Avalonia.Controls/StackPanel.cs
+++ b/src/Avalonia.Controls/StackPanel.cs
@@ -233,6 +233,11 @@ namespace Avalonia.Controls
 
             foreach (Control child in Children)
             {
+                if (!child.IsVisible)
+                {
+                    continue;
+                }
+
                 double childWidth = child.DesiredSize.Width;
                 double childHeight = child.DesiredSize.Height;
 

From f4f2490c841f7ff80db12c38c0161b271a83f95e Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 12 May 2019 20:41:54 +0100
Subject: [PATCH 67/70] seealso comment after sumary.

---
 .../Notifications/WindowNotificationManager.cs                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 00ee581f35..93873cbf7d 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -25,8 +25,9 @@ namespace Avalonia.Controls.Notifications
           AvaloniaProperty.Register<WindowNotificationManager, NotificationPosition>(nameof(Position), NotificationPosition.TopRight);
 
         /// <summary>
-        /// Defines which corner of the screen notifications can be displayed in. <seealso cref="NotificationPosition"/>.
+        /// Defines which corner of the screen notifications can be displayed in.
         /// </summary>
+        /// <seealso cref="NotificationPosition"/>
         public NotificationPosition Position
         {
             get { return GetValue(PositionProperty); }

From 5a66dee1bbf6fd4c30d6089925679bac24c8fe42 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 12 May 2019 20:42:55 +0100
Subject: [PATCH 68/70] revert stackpanel changes

---
 src/Avalonia.Controls/StackPanel.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/StackPanel.cs b/src/Avalonia.Controls/StackPanel.cs
index b003531c9e..c29faa1b4d 100644
--- a/src/Avalonia.Controls/StackPanel.cs
+++ b/src/Avalonia.Controls/StackPanel.cs
@@ -231,9 +231,7 @@ namespace Avalonia.Controls
             var finalRect = new Rect(finalSize);
             var pos = 0.0;
 
-            var children = Children;
-
-            foreach (Control child in children)
+            foreach (Control child in Children)
             {
                 if (!child.IsVisible)
                 {

From d866ffd807c4aac85b4826d359279bdb572b39b9 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 12 May 2019 20:44:07 +0100
Subject: [PATCH 69/70] remove comment.

---
 src/Avalonia.Controls/Notifications/Notification.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 9aea607874..4204ad0aee 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -7,7 +7,6 @@ namespace Avalonia.Controls.Notifications
 {
     /// <summary>
     /// A notification that can be shown in a window or by the host operating system.
-    /// Can be displayed by both <see cref="INotificationManager"/> and <see cref="IManagedNotificationManager"/>
     /// </summary>
     /// <remarks>
     /// This class represents a notification that can be displayed either in a window using

From 4e1baec04b6411b15450bca76a6e77ce25697815 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 12 May 2019 20:50:53 +0100
Subject: [PATCH 70/70] remove unecesary event

---
 .../Notifications/NotificationCard.cs          | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/NotificationCard.cs b/src/Avalonia.Controls/Notifications/NotificationCard.cs
index db136492ad..7f69afaeeb 100644
--- a/src/Avalonia.Controls/Notifications/NotificationCard.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationCard.cs
@@ -25,7 +25,7 @@ namespace Avalonia.Controls.Notifications
             this.GetObservable(IsClosedProperty)
                 .Subscribe(x =>
                 {
-                    if (!IsClosing & !IsClosed)
+                    if (!IsClosing && !IsClosed)
                     {
                         return;
                     }
@@ -88,26 +88,12 @@ namespace Avalonia.Controls.Notifications
         public static readonly DirectProperty<NotificationCard, bool> IsClosedProperty =
             AvaloniaProperty.RegisterDirect<NotificationCard, bool>(nameof(IsClosed), o => o.IsClosed, (o, v) => o.IsClosed = v);
 
-        /// <summary>
-        /// Defines the <see cref="NotificationCloseInvoked"/> event.
-        /// </summary>
-        public static readonly RoutedEvent<RoutedEventArgs> NotificationCloseInvokedEvent =
-            RoutedEvent.Register<NotificationCard, RoutedEventArgs>(nameof(NotificationCloseInvoked), RoutingStrategies.Bubble);
-
         /// <summary>
         /// Defines the <see cref="NotificationClosed"/> event.
         /// </summary>
         public static readonly RoutedEvent<RoutedEventArgs> NotificationClosedEvent =
             RoutedEvent.Register<NotificationCard, RoutedEventArgs>(nameof(NotificationClosed), RoutingStrategies.Bubble);
 
-        /// <summary>
-        /// Raised when notification close event is invoked.
-        /// </summary>
-        public event EventHandler<RoutedEventArgs> NotificationCloseInvoked
-        {
-            add { AddHandler(NotificationCloseInvokedEvent, value); }
-            remove { RemoveHandler(NotificationCloseInvokedEvent, value); }
-        }
 
         /// <summary>
         /// Raised when the <see cref="NotificationCard"/> has closed.
@@ -169,8 +155,6 @@ namespace Avalonia.Controls.Notifications
             }
 
             IsClosing = true;
-
-            RaiseEvent(new RoutedEventArgs(NotificationCloseInvokedEvent));
         }
     }
 }