Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further optimize LLScrollListCtrl::setFilter for contracted filter cases

Browse Source
This commit is contained in:
Liru Færs
2019-08-18 01:14:18 -04:00
parent ba9e7d8056
commit ab4e0127c5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llui/llscrolllistctrl.cpp
View File

@@ -2004,10 +2004,13 @@ void LLScrollListCtrl::setFilter(const std::string& filter)
bool no_filter = filter.empty();
// If our filter string has been expanded, we can skip already filtered items
bool expanded = !no_filter && !mFilter.empty() && boost::icontains(filter, mFilter);
// If our filter string has been contracted, we can skip already unfiltered items
bool contracted = !no_filter && !mFilter.empty() && !expanded && boost::icontains(mFilter, filter);
bool unique = !expanded && !contracted;
mFilter = filter;
S32 unfiltered_count = no_filter ? mItemList.size() // No filter, doc size is all items
: expanded ? mScrollbar->getDocSize() // Expanded filter, start with the current doc size and remove
: !unique ? mScrollbar->getDocSize() // Expanded/contracted filter, start with the current doc size and remove/add respectively
: 0; // Different filter, count up from 0;
for (auto& item : mItemList)
{
@@ -2016,7 +2019,8 @@ void LLScrollListCtrl::setFilter(const std::string& filter)
{
if (filterItem(item)) --unfiltered_count; // We are now filtered, lower the count
}
else if (!expanded) // Filter isn't expanded, find out if we should be filtered
else if (unique || // Filter isn't expanded, find out if we should be filtered or
(contracted && item->getFiltered())) // Filter has contracted and we were filtered before, should we still be?
{
if (!filterItem(item)) ++unfiltered_count; // Wasn't filltered, bump count
}