summaryrefslogtreecommitdiff
path: root/indra/newview/lloutfitslist.cpp
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-06-24 01:52:26 +0300
committerAndrew Dyukov <adyukov@productengine.com>2010-06-24 01:52:26 +0300
commit9aad53a4370b7647e4f907be7c3dc908906491b9 (patch)
treec84cd35c01a96555de9b9df7887826bc293aeb53 /indra/newview/lloutfitslist.cpp
parent2583a4d6ea60aeefa1d21f578d6fbf1f2f68c72a (diff)
EXT-7158 FIXED Implemented showing of full outfit content if its name or any item(s) inside it match current filter.
- Added availability to force showing unmatched items to LLFlatListViewEx - Applied it to wearable items lists in LLOutfitsList - Changed condition for outfit accordion tab showing (because now all items are visible, so checking their number doesn't help). Used here check for a flag added in this fix, which tells whether last applied filter found any matches in the list. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/648/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lloutfitslist.cpp')
-rw-r--r--indra/newview/lloutfitslist.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index b8489d450b..67442dd573 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -439,6 +439,9 @@ void LLOutfitsList::refreshList(const LLUUID& category_id)
// Setting callback to reset items selection inside outfit on accordion collapsing and expanding (EXT-7875)
tab->setDropDownStateChangedCallback(boost::bind(&LLOutfitsList::resetItemSelection, this, list, cat_id));
+ // force showing list items that don't match current filter(EXT-7158)
+ list->setForceShowingUnmatchedItems(true);
+
// Setting list commit callback to monitor currently selected wearable item.
list->setCommitCallback(boost::bind(&LLOutfitsList::onSelectionChange, this, _1));
@@ -850,6 +853,8 @@ void LLOutfitsList::applyFilter(const std::string& new_filter_substring)
restoreOutfitSelection(tab, iter->first);
}
}
+
+ mAccordion->arrange();
}
void LLOutfitsList::applyFilterToTab(
@@ -873,7 +878,7 @@ void LLOutfitsList::applyFilterToTab(
{
// hide tab if its title doesn't pass filter
// and it has no visible items
- tab->setVisible(list->size() > 0);
+ tab->setVisible(list->wasLasFilterSuccessfull());
// remove title highlighting because it might
// have been previously highlighted by less restrictive filter