From 8bcd07730a4fe557e9c308937a732a21c5042660 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 14 Dec 2017 22:06:56 -0600
Subject: [PATCH] Change StylingParent for Popup to be PopupRoot so local
 styles flow to it.

---
 src/Avalonia.Controls/Primitives/PopupRoot.cs                 | 4 ++--
 tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs   | 2 +-
 .../Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
index b0b0659f63..927a54a838 100644
--- a/src/Avalonia.Controls/Primitives/PopupRoot.cs
+++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Controls.Primitives
     /// <summary>
     /// The root window of a <see cref="Popup"/>.
     /// </summary>
-    public class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IResourceNode
+    public class PopupRoot : WindowBase, IInteractive, IHostedVisualTreeRoot, IDisposable, IStyleHost
     {
         private IDisposable _presenterSubscription;
 
@@ -70,7 +70,7 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Gets the styling parent of the popup root.
         /// </summary>
-        IResourceNode IResourceNode.ResourceParent => Parent;
+        IStyleRoot IStyleHost.StylingParent => Parent;
 
         /// <inheritdoc/>
         public void Dispose() => PlatformImpl?.Dispose();
diff --git a/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs b/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
index 6acd224fe2..9ee6e3e456 100644
--- a/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
+++ b/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
@@ -168,7 +168,7 @@ namespace Avalonia.Controls.UnitTests
             target.Resources.Add("foo", "bar");
 
             Assert.True(raisedOnTarget);
-            Assert.False(raisedOnPresenter);
+            Assert.True(raisedOnPresenter);
             Assert.True(raisedOnChild);
         }
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
index 68a1f1d90f..d4b5d01a6b 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
@@ -39,7 +39,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
         }
 
         [Fact]
-        public void PopupRoot_ResourceParent_Is_Popup()
+        public void PopupRoot_StylingParent_Is_Popup()
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
@@ -53,7 +53,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 target.ApplyTemplate();
                 target.Popup.Open();
 
-                Assert.Equal(target.Popup, ((IResourceNode)target.Popup.PopupRoot).ResourceParent);
+                Assert.Equal(target.Popup, ((IStyleHost)target.Popup.PopupRoot).StylingParent);
             }
         }