Merge pull request #1081 from orrindeng/develop

Fix InvalidOperationException thrown when switching focus from editable ComboBox to Hyperlink
fluentribbon · Nov 30, 2022 · 9c88de4 · 9c88de4
2 parents 9f43a0e + cb32b36
commit 9c88de4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Fluent.Ribbon/Extensions/ItemContainerGeneratorExtensions.cs b/Fluent.Ribbon/Extensions/ItemContainerGeneratorExtensions.cs
@@ -2,7 +2,8 @@
 
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Media;
+using System.Windows.Media;
+using Fluent.Internal;
 
 /// <summary>
 /// Extension-Methods for <see cref="ItemContainerGenerator" />.
@@ -82,7 +83,7 @@ public static class ItemContainerGeneratorExtensions
             return item;
         }
 
-        var visualParent = VisualTreeHelper.GetParent(container);
+        var visualParent = UIHelper.GetVisualParent(container);
         if (visualParent is not null)
         {
             item = @this.ItemFromContainer(visualParent);