gg781
diff --git a/Diff for: ‎CodeWalker/ExploreForm.Designer.cs
+3-2 b/Diff for: ‎CodeWalker/ExploreForm.Designer.cs
+3-2
diff --git a/Diff for: ‎CodeWalker/ExploreForm.cs
+49-8 b/Diff for: ‎CodeWalker/ExploreForm.cs
+49-8
@@ -1339,6 +1339,10 @@ public void Search(string text)
             if (Searching) return;
             if (string.IsNullOrEmpty(text)) return;
 
+            var term = text.ToLowerInvariant();
+            var terms = term.Split(new[] { '*' }, StringSplitOptions.RemoveEmptyEntries);
+            if (terms.Length == 0) return;
+
             SearchTextBox.Text = text;
             SearchButton.Image = SearchGlobalButton.Image;
             SearchButton.Text = SearchGlobalButton.Text;
@@ -1362,15 +1366,13 @@ public void Search(string text)
 
             UpdateStatus("Searching...");
 
-            var term = text.ToLowerInvariant();
-
             //Task.Run(() =>
             //{
                 Searching = true;
 
             Cursor = Cursors.WaitCursor;
 
-                var resultcount = RootFolder.Search(term, this);
+                var resultcount = RootFolder.Search(terms, this);
 
                 if (Searching)
                 {
@@ -3782,6 +3784,45 @@ private void MainListView_RetrieveVirtualItem(object sender, RetrieveVirtualItem
             e.Item = lvi;
         }
 
+        private void MainListView_SearchForVirtualItem(object sender, SearchForVirtualItemEventArgs e)
+        {
+            if (CurrentFiles == null) return;
+            var term = e.Text;
+            if (string.IsNullOrEmpty(term)) return;
+            var terml = term.ToLowerInvariant();
+            var start = e.StartIndex;
+            var isprefix = true;// e.IsPrefixSearch;
+            var direction = e.Direction;
+            var up = (direction == SearchDirectionHint.Up) || (direction == SearchDirectionHint.Left);
+            var icnt = CurrentFiles.Count;
+            var incr = up ? -1 : 1;
+            var i = start;
+            while ((i >= 0) && (i < icnt))
+            {
+                var name = CurrentFiles[i]?.Name;
+                if (string.IsNullOrEmpty(name) == false)
+                {
+                    if (isprefix)
+                    {
+                        if (name.StartsWith(terml, StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            e.Index = i;
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        if (name.ToLowerInvariant().Contains(terml))//they fixed this in .net8
+                        {
+                            e.Index = i;
+                            return;
+                        }
+                    }
+                }
+                i += incr;
+            }
+        }
+
         private void MainListView_ColumnClick(object sender, ColumnClickEventArgs e)
         {
             var newdir = SortDirection;
@@ -4632,14 +4673,14 @@ public string GetToolText()
             return Path;
         }
 
-        public int Search(string term, ExploreForm form)
+        public int Search(string[] terms, ExploreForm form)
         {
             int resultcount = 0;
             //if (!form.Searching) return resultcount;
 
             form.UpdateStatus("Searching " + Path + "...");
 
-            if (Name.ToLowerInvariant().Contains(term))
+            if (SearchMatch(Name.ToLowerInvariant(), terms))
             {
                 form.AddSearchResult(new MainListItem(this));
                 resultcount++;
@@ -4653,7 +4694,7 @@ public int Search(string term, ExploreForm form)
                 {
                     //if (!form.Searching) return resultcount;
                     var fi = new FileInfo(file);
-                    if (fi.Name.ToLowerInvariant().Contains(term))
+                    if (SearchMatch(fi.Name.ToLowerInvariant(), terms))
                     {
                         form.AddSearchResult(new MainListItem(file, rootpath, this));
                         resultcount++;
@@ -4666,7 +4707,7 @@ public int Search(string term, ExploreForm form)
                 {
                     //if (!form.Searching) return resultcount;
                     if (file.NameLower.EndsWith(".rpf")) continue; //don't search rpf files..
-                    if (file.NameLower.Contains(term))
+                    if (SearchMatch(file.NameLower, terms))
                     {
                         form.AddSearchResult(new MainListItem(file, rootpath, this));
                         resultcount++;
@@ -4679,7 +4720,7 @@ public int Search(string term, ExploreForm form)
                 foreach (var child in Children)
                 {
                     //if (!form.Searching) return resultcount;
-                    resultcount += child.Search(term, form);
+                    resultcount += child.Search(terms, form);
                 }
             }