From e481ec22219d17368eeb59b8fc753515c1bf94f8 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 17 Jun 2015 21:52:24 +0200 Subject: [PATCH] Always set inheritance parent in PopupRoot. Previously the ctor with an IDependencyResolver didn't set it. --- Perspex.Controls/PopupRoot.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Perspex.Controls/PopupRoot.cs b/Perspex.Controls/PopupRoot.cs index 5bb34f8522..aaf7cbe948 100644 --- a/Perspex.Controls/PopupRoot.cs +++ b/Perspex.Controls/PopupRoot.cs @@ -29,9 +29,8 @@ namespace Perspex.Controls /// Initializes a new instance of the class. /// public PopupRoot() - : base(Locator.Current.GetService()) + : this(null) { - this.GetObservable(ParentProperty).Subscribe(x => this.InheritanceParent = x); } /// @@ -43,6 +42,7 @@ namespace Perspex.Controls public PopupRoot(IDependencyResolver dependencyResolver) : base(Locator.Current.GetService(), dependencyResolver) { + this.GetObservable(ParentProperty).Subscribe(x => this.InheritanceParent = x); } ///