birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1155 from aws-lumberyard-dev/LYN4281_ScriptCanvasNodePaletteSearchIgnoreWhitespace

Browse Source 
Graph Canvas Node Palette Search Ignore Whitespace
This commit is contained in:
Gene Walters
2021-06-08 07:44:29 -07:00
committed by GitHub
parent 9a148477e2 90fd676748
commit be0d0afc67
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/Model/NodePaletteSortFilterProxyModel.cpp
+19 -6
View File
@@ -147,16 +147,17 @@ namespace GraphCanvas
return true;
}
QString test = model->data(index).toString();
QString test = model->data(index).toString();
bool showRow = false;
int regexIndex = test.lastIndexOf(m_filterRegex);
int regexIndex = m_filterRegex.indexIn(test);
if (regexIndex >= 0)
{
showRow = true;
AZStd::pair<int, int> highlight(regexIndex, m_filter.size());
AZStd::pair<int, int> highlight(regexIndex, m_filterRegex.matchedLength());
currentItem->SetHighlight(highlight);
}
else
@@ -283,8 +284,20 @@ namespace GraphCanvas
void NodePaletteSortFilterProxyModel::SetFilter(const QString& filter)
{
m_filter = QRegExp::escape(filter);
m_filterRegex = QRegExp(m_filter, Qt::CaseInsensitive);
// Remove whitespace and escape() so every regexp special character is escaped with a backslash
// Then ignore all whitespace by adding \s* (regex optional whitespace match) in between every other character.
// We use \s* instead of simply removing all whitespace from the filter and node-names in order to preserve the node-name and accurately highlight the matching portion.
// Example: "OnGraphStart" or "On Graph Start"
m_filter = QRegExp::escape(filter.simplified().replace(" ", ""));
QString regExIgnoreWhitespace(m_filter[0]);
for (int i = 1; i < m_filter.size(); ++i)
{
regExIgnoreWhitespace.append("\\s*");
regExIgnoreWhitespace.append(m_filter[i]);
}
m_filterRegex = QRegExp(regExIgnoreWhitespace, Qt::CaseInsensitive);
}
void NodePaletteSortFilterProxyModel::ClearFilter()