Adds check visibility guard to shouldHideArea

Refactors rcObject to check in passesTextFilter

Signed-off-by: Michael Stergianis <michael.stergianis@gmail.com>
This commit is contained in:
Michael Stergianis 2024-03-31 13:26:18 -04:00 committed by Michael Stergianis
parent 91d39797cb
commit ebee171d22
No known key found for this signature in database
GPG Key ID: 47026274F515D7B3
1 changed files with 6 additions and 4 deletions

View File

@ -1043,18 +1043,20 @@ bool shouldHideArea(ImGuiTextFilter& checkSearch, std::map<RandomizerCheckArea,
if (!shouldHideFilteredAreas) {
return false;
}
for (auto check : checksByArea[rcArea]) {
if (passesTextFilter(checkSearch, check)) {
if (IsVisibleInCheckTracker(check) && passesTextFilter(checkSearch, check)) {
return false;
}
}
return true;
}
bool passesTextFilter(ImGuiTextFilter& checkSearch, RandomizerCheckObject rcObject) {
bool passesTextFilter(ImGuiTextFilter& checkSearch, RandomizerCheckObject check) {
return (
checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(rcObject.rcArea).c_str()) ||
checkSearch.PassFilter(rcObject.rcShortName.c_str())
checkSearch.PassFilter(RandomizerCheckObjects::GetRCAreaName(check.rcArea).c_str()) ||
checkSearch.PassFilter(check.rcShortName.c_str())
);
}