Merge branch 'jk/hotfix-tooltip' into main

ControlzEx · Oct 20, 2022 · b69f7d5 · b69f7d5
2 parents 6e973cd + 898a2b6
commit b69f7d5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -9,14 +9,11 @@
   </packageRestore>
   <packageSources>
     <clear />
-    <add key="CI.XamlColorSchemeGenerator" value="https://ci.appveyor.com/nuget/xamlcolorschemegenerator" />
-    <!-- <add key="XamlColorSchemeGenerator" value="C:\DEV\OSS_Own\XamlColorSchemeGenerator\bin\Release" /> -->
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
-  <activePackageSource>
-    <clear />
-    <add key="CI.XamlColorSchemeGenerator" value="https://ci.appveyor.com/nuget/xamlcolorschemegenerator" />
-    <!-- <add key="XamlColorSchemeGenerator" value="C:\DEV\OSS_Own\XamlColorSchemeGenerator\bin\Release" /> -->
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </activePackageSource>
-</configuration>
+  <packageSourceMapping>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
+</configuration>
diff --git a/src/ControlzEx/ToolTipAssist.cs b/src/ControlzEx/ToolTipAssist.cs
@@ -136,7 +136,8 @@ private static void MoveToolTip(IInputElement? target, ToolTip? toolTip)
         {
             if (toolTip is null
                 || target is null
-                || toolTip.PlacementTarget is null)
+                || toolTip.PlacementTarget is null
+                || PresentationSource.FromVisual(toolTip.PlacementTarget) is null)
             {
                 return;
             }