oxyplot · VisualMelon · Jan 13, 2022 · Nov 8, 2021 · Nov 8, 2021 · Nov 8, 2021
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 - WPF - OxyPlot doesn't render inside a Popup (#1796)
+- SkiaSharp.WPF - OxyPlot doesn't render inside an ElementHost (#1800)
 - NullReference in SkiaSharp WPF renderer if UIElement has no PresentationSource  (#1798)
 
 ## [2.1.0] - 2021-10-02

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -44,6 +44,7 @@ Don Syme <[email protected]>
 DotNetDoctor <[email protected]>
 efontana2
 elliatab
+Elia Herzog
 Elmar Strittmatter
 episage <[email protected]>
 eric

diff --git a/Source/OxyPlot.SkiaSharp.Wpf/OxySKElement.cs b/Source/OxyPlot.SkiaSharp.Wpf/OxySKElement.cs
@@ -211,18 +211,16 @@ static bool IsPositive(double value)
         /// <summary>
         /// Returns a reference to the visual object that hosts the dependency object in the visual tree.
         /// </summary>
-        /// <returns> The host window from the visual tree.</returns>
+        /// <returns> The host visual from the visual tree.</returns>
         private Visual GetAncestorVisualFromVisualTree(DependencyObject startElement)
         {
-
             DependencyObject child = startElement;
             DependencyObject parent = VisualTreeHelper.GetParent(child);
             while (parent != null)
             {
                 child = parent;
                 parent = VisualTreeHelper.GetParent(child);
             }
-
             return child is Visual visualChild ? visualChild : Window.GetWindow(this);
         }
 

diff --git a/Source/OxyPlot.Wpf.Shared/PlotViewBase.cs b/Source/OxyPlot.Wpf.Shared/PlotViewBase.cs
@@ -16,6 +16,7 @@ namespace OxyPlot.Wpf
     using System.Windows.Input;
     using System.Windows.Media;
     using System.Windows.Threading;
+    using System.Windows.Documents;
     using CursorType = OxyPlot.CursorType;
 
     /// <summary>
@@ -454,6 +455,12 @@ private bool IsInVisualTree()
                     return true;
                 }
 
+                //Check if the parent is an AdornerDecorator like in an ElementHost
+                if (dpObject is AdornerDecorator)
+                {
+                    return true;
+                }
+
                 //Check if the logical parent is a popup. If so, we found the popuproot
                 var logicalRoot = LogicalTreeHelper.GetParent(dpObject);
                 if (logicalRoot is Popup)