From 43a3841dcbdc224c528f95c9f25eb585b141c8fc Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 15 Apr 2022 18:02:43 +0200
Subject: [PATCH] Add/remove resource owner.

---
 src/Avalonia.Base/Styling/StyleChildren.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Styling/StyleChildren.cs b/src/Avalonia.Base/Styling/StyleChildren.cs
index 21ac3c4072..64d838e4ce 100644
--- a/src/Avalonia.Base/Styling/StyleChildren.cs
+++ b/src/Avalonia.Base/Styling/StyleChildren.cs
@@ -1,4 +1,5 @@
 using System.Collections.ObjectModel;
+using Avalonia.Controls;
 
 namespace Avalonia.Styling
 {
@@ -16,7 +17,10 @@ namespace Avalonia.Styling
 
         protected override void RemoveItem(int index)
         {
-            (Items[index] as Style)?.SetParent(null);
+            var item = Items[index];
+            if (_owner.Owner is IResourceHost host)
+                (item as IResourceProvider)?.RemoveOwner(host);
+            (item as Style)?.SetParent(null);
             base.RemoveItem(index);
         }
 
@@ -24,6 +28,8 @@ namespace Avalonia.Styling
         {
             base.SetItem(index, item);
             (item as Style)?.SetParent(_owner);
+            if (_owner.Owner is IResourceHost host)
+                (item as IResourceProvider)?.AddOwner(host);
         }
     }
 }