Merge pull request #4009 from Ginger-Automation/Enhancement/ExpandTre…

…eFolderOnSearchMatch Enhancement - Expand Tree Folder On Text Search
Ginger-Automation · Nov 29, 2024 · 9ab9464 · 9ab9464
2 parents 55fe78a + 04cb7aa
commit 9ab9464
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Ginger/Ginger/UserControlsLib/UCTreeView/UCTreeView.xaml.cs b/Ginger/Ginger/UserControlsLib/UCTreeView/UCTreeView.xaml.cs
@@ -782,11 +782,18 @@ private bool FilterItemsByTextNew(IEnumerable<ITreeViewItem> items, string text)
                     wasFound = true;
                 }
 
-                if (FilterItemsByTextNew(item.Childrens(), text))
+                bool foundMatchInChildren = FilterItemsByTextNew(item.Childrens(), text);
+                if (foundMatchInChildren)
                 {
                     wasFound = true;
                     itemBase.Visibility = Visibility.Visible;
                 }
+
+                bool canExpand = item.IsExpandable() && itemBase.TreeViewItem != null;
+                if (foundMatchInChildren && canExpand)
+                {
+                    itemBase.TreeViewItem!.IsExpanded = true;
+                }
             }
 
             return wasFound;