livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19630 FIXED Adding a thumbnail to item in combination view does not update gallery view

meow-7.2.2
Maxim Nikolenko 2023-04-20 14:42:25 +03:00
parent 1b88a4e5f9
commit a03f3cd00d
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
indra/newview/llinventorygallery.cpp
View File

@ -594,18 +594,24 @@ void LLInventoryGallery::setFilterSubString(const std::string& string)
void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring)
{
if (!item) return;
if(item)
{
item->setHidden(!checkAgainstFilters(item, filter_substring));
}
}
bool LLInventoryGallery::checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring)
{
if (!item) return false;
if (item->isFolder() && (mFilter->getShowFolderState() == LLInventoryFilter::SHOW_ALL_FOLDERS))
{
item->setHidden(false);
return;
return true;
}
if(item->isLink() && ((mFilter->getSearchVisibilityTypes() & LLInventoryFilter::VISIBILITY_LINKS) == 0) && !filter_substring.empty())
{
item->setHidden(true);
return;
return false;
}
bool hidden = false;
@ -620,20 +626,17 @@ void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::st
}
if(hidden)
{
item->setHidden(true);
return;
return false;
}
if(!mFilter->checkAgainstFilterThumbnails(item->getUUID()))
{
item->setHidden(true);
return;
return false;
}
if(!checkAgainstFilterType(item->getUUID()))
{
item->setHidden(true);
return;
return false;
}
std::string desc;
@ -660,7 +663,7 @@ void LLInventoryGallery::applyFilter(LLInventoryGalleryItem* item, const std::st
LLStringUtil::toUpper(cur_filter);
hidden = (std::string::npos == desc.find(cur_filter));
item->setHidden(hidden);
return !hidden;
}
void LLInventoryGallery::setSearchType(LLInventoryFilter::ESearchType type)
@ -803,6 +806,13 @@ void LLInventoryGallery::updateItemThumbnail(LLUUID item_id)
if (mItemMap[item_id])
{
mItemMap[item_id]->setThumbnail(thumbnail_id);
bool passes_filter = checkAgainstFilters(mItemMap[item_id], mFilterSubString);
if((mItemMap[item_id]->isHidden() && passes_filter)
|| (!mItemMap[item_id]->isHidden() && !passes_filter))
{
reArrangeRows();
}
}
}

1
indra/newview/llinventorygallery.h
View File

@ -134,6 +134,7 @@ protected:
void showContextMenu(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& item_id);
void applyFilter(LLInventoryGalleryItem* item, const std::string& filter_substring);
bool checkAgainstFilters(LLInventoryGalleryItem* item, const std::string& filter_substring);
LLInventoryCategoriesObserver* mCategoriesObserver;
LLThumbnailsObserver* mThumbnailsObserver;