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

Back down on overzealous list filter checking and explicitly default filter

Browse Source 
For clarity to others in the future: getFiltered() checks are meant for
functions where the user is interacting the scroll list in some way
or we're displaying the scroll list.
This commit is contained in:
Lirusaito
2019-07-22 23:38:45 -04:00
parent 61730f3ee1
commit d66c730c30
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/llui/llscrolllistctrl.cpp
View File

@@ -159,6 +159,7 @@ LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
mFgUnselectedColor(LLUI::sColorsGroup->getColor("ScrollUnselectedColor")), mFgUnselectedColor(LLUI::sColorsGroup->getColor("ScrollUnselectedColor")),
mFgDisabledColor(LLUI::sColorsGroup->getColor("ScrollDisabledColor")), mFgDisabledColor(LLUI::sColorsGroup->getColor("ScrollDisabledColor")),
mHighlightedColor(LLUI::sColorsGroup->getColor("ScrollHighlightedColor")), mHighlightedColor(LLUI::sColorsGroup->getColor("ScrollHighlightedColor")),
mFilter(),
mSearchColumn(0), mSearchColumn(0),
mColumnPadding(5) mColumnPadding(5)
{ {
@@ -829,22 +830,19 @@ BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
continue ; continue ;
} }
if (itemp->getFiltered()) if (index >= first_index && index <= last_index)
{ {
if (index >= first_index && index <= last_index) if (itemp->getEnabled())
{ {
if (itemp->getEnabled()) selectItem(itemp, FALSE);
{ success = TRUE;
selectItem(itemp, FALSE);
success = TRUE;
}
} }
else
{
deselectItem(itemp);
}
index++;
} }
else
{
deselectItem(itemp);
}
index++;
iter++ ; iter++ ;
} }
@@ -1203,7 +1201,6 @@ LLScrollListItem* LLScrollListCtrl::getItemByLabel(const std::string& label, BOO
for (iter = mItemList.begin(); iter != mItemList.end(); iter++) for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
{ {
LLScrollListItem* item = *iter; LLScrollListItem* item = *iter;
if (item->getFiltered()) continue;
std::string item_text = item->getColumn(column)->getValue().asString(); // Only select enabled items with matching names std::string item_text = item->getColumn(column)->getValue().asString(); // Only select enabled items with matching names
if (!case_sensitive) if (!case_sensitive)