Layout filters: match multiple search terms (Models, Groups, Controllers) (#6945)

* Layout filters: whitespace-tokenized AND matching (Models, Groups, Controllers)

The Layout Models/Groups filter (LayoutPanel::MatchesFilter) and the
Controllers filter (ControllerListPanel::ControllerMatchesFilter) treated
the whole search box as one string, so 'midwest pumpkin' never matched
'Midwest-Coro-Pumpkin'. Split the filter on whitespace and require every
term to appear in the name (any order), matching the vendor-catalog and
picker-dialog filters. A single term keeps the existing behaviour,
including the regex power-search.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* Drop explanatory comments per review; behavior is described in the commit message

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: heffneil

src-ui-wx/layout/ControllerListPanel.cpp

@@ -16,6 +16,7 @@
 #include <wx/dnd.h>
 #include <wx/menu.h>
 #include <wx/msgdlg.h>
+#include <wx/tokenzr.h>
 #include <wx/srchctrl.h>
 #include <wx/stopwatch.h>
 #include <wx/settings.h>
@@ -540,10 +541,19 @@ void ControllerListPanel::OnFullColumnsClick(wxCommandEvent& event) {
 bool ControllerListPanel::ControllerMatchesFilter(const Controller* controller) const {
     if (_controllerFilterCtrl == nullptr || _controllerFilterString.IsEmpty()) return true;
 
-    if (_controllerFilterRegexValid)
-        return _controllerFilterRegex.Matches(controller->GetName());
+    wxArrayString terms = wxStringTokenize(_controllerFilterString.Lower(), " \t");
+    if (terms.size() <= 1) {
+        if (_controllerFilterRegexValid)
+            return _controllerFilterRegex.Matches(controller->GetName());
+        return wxString(controller->GetName()).Lower().Contains(_controllerFilterString.Lower());
+    }
 
-    return wxString(controller->GetName()).Lower().Contains(_controllerFilterString.Lower());
+    const wxString name = wxString(controller->GetName()).Lower();
+    for (const auto& term : terms) {
+        if (!name.Contains(term))
+            return false;
+    }
+    return true;
 }
 
 void ControllerListPanel::OnSelectionChanged(wxTreeListEvent& event) {

src-ui-wx/layout/LayoutPanel.cpp

@@ -31,6 +31,7 @@
 #include <wx/propgrid/advprops.h>
 #include <wx/tglbtn.h>
 #include <wx/srchctrl.h>
+#include <wx/tokenzr.h>
 #include <wx/checklst.h>
 #include <pugixml.hpp>
 #include <cmath>
@@ -13185,10 +13186,19 @@ void LayoutPanel::OnGroupFilterTextChanged(wxCommandEvent& event) {
 bool LayoutPanel::MatchesFilter(Model* model, const wxString& filterString, const wxRegEx& filterRegex, bool filterRegexValid) {
     if (filterString.IsEmpty()) return true;
 
-    if (filterRegexValid)
-        return filterRegex.Matches(model->GetName());
+    wxArrayString terms = wxStringTokenize(filterString.Lower(), " \t");
+    if (terms.size() <= 1) {
+        if (filterRegexValid)
+            return filterRegex.Matches(model->GetName());
+        return wxString(model->GetName()).Lower().Contains(filterString.Lower());
+    }
 
-    return wxString(model->GetName()).Lower().Contains(filterString.Lower());
+    const wxString name = wxString(model->GetName()).Lower();
+    for (const auto& term : terms) {
+        if (!name.Contains(term))
+            return false;
+    }
+    return true;
 }
 
 bool LayoutPanel::ModelMatchesFilter(Model* model) const {