kelson8/CheatMenuSA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issues with ImageList search

Browse Source
This commit is contained in:
Grinch_ 2022-09-22 02:08:10 +06:00
parent db011c8c9e
commit c4d7ec9318
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/utils/widget.cpp
View File

@ -285,13 +285,13 @@ void DrawClippedImages(ResourceStore& data, ImVec2 imgSz, size_t imagesInRow, bo
{ {
if (Widget::ListBox("##Categories", data.m_Categories, data.m_Selected)) if (Widget::ListBox("##Categories", data.m_Categories, data.m_Selected))
{ {
data.UpdateSearchList(favourites); data.UpdateSearchList(favourites, getNameFunc, verifyFunc);
} }
ImGui::SameLine(); ImGui::SameLine();
} }
if (Widget::Filter("##Filter", data.m_Filter, TEXT("Window.Search"))) if (Widget::Filter("##Filter", data.m_Filter, TEXT("Window.Search")))
{ {
data.UpdateSearchList(favourites); data.UpdateSearchList(favourites, getNameFunc, verifyFunc);
} }
ImGui::PopItemWidth(); ImGui::PopItemWidth();
@ -302,13 +302,21 @@ void DrawClippedImages(ResourceStore& data, ImVec2 imgSz, size_t imagesInRow, bo
Widget::TextCentered(TEXT("Menu.FavouritesNone")); Widget::TextCentered(TEXT("Menu.FavouritesNone"));
} }
float itemSz = imgSz.y/(imagesInRow+1);
int imageCount = 1; int imageCount = 1;
ImGuiListClipper clipper(data.m_nSearchList.size(), itemSz); size_t totalSz = data.m_nSearchList.size();
ImGuiListClipper clipper((totalSz > 3 ? totalSz/3 : totalSz), imgSz.y);
while (clipper.Step()) while (clipper.Step())
{ {
for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; ++i) // hack to get clipper working with rowed items
size_t start = clipper.DisplayStart * imagesInRow;
size_t end = clipper.DisplayEnd * imagesInRow + imagesInRow;
for (size_t i = start; i < end; ++i)
{ {
if (data.m_nSearchList.size() == i)
{
break;
}
std::string &text = std::get<ImageLookup>(data.m_nSearchList[i]).m_FileName; std::string &text = std::get<ImageLookup>(data.m_nSearchList[i]).m_FileName;
std::string &modelName = std::get<ImageLookup>(data.m_nSearchList[i]).m_ModelName; std::string &modelName = std::get<ImageLookup>(data.m_nSearchList[i]).m_ModelName;
bool custom = std::get<ImageLookup>(data.m_nSearchList[i]).m_bCustom; bool custom = std::get<ImageLookup>(data.m_nSearchList[i]).m_bCustom;