Skip to content

TextFilter: improve behavior for multiple filters #5567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phisko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

TextFilter: improve behavior for multiple filters #5567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions imgui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2301,7 +2301,6 @@ void ImGuiStorage::SetAllInt(int v)
ImGuiTextFilter::ImGuiTextFilter(const char* default_filter) //-V1077
{
InputBuf[0] = 0;
CountGrep = 0;
if (default_filter)
{
ImStrncpy(InputBuf, default_filter, IM_ARRAYSIZE(InputBuf));
Expand Down Expand Up @@ -2343,7 +2342,6 @@ void ImGuiTextFilter::Build()
ImGuiTextRange input_range(InputBuf, InputBuf + strlen(InputBuf));
input_range.split(',', &Filters);

CountGrep = 0;
for (int i = 0; i != Filters.Size; i++)
{
ImGuiTextRange& f = Filters[i];
Expand All @@ -2353,8 +2351,6 @@ void ImGuiTextFilter::Build()
f.e--;
if (f.empty())
continue;
if (Filters[i].b[0] != '-')
CountGrep += 1;
}
}

Expand All @@ -2380,16 +2376,12 @@ bool ImGuiTextFilter::PassFilter(const char* text, const char* text_end) const
else
{
// Grep
if (ImStristr(text, text_end, f.b, f.e) != NULL)
return true;
if (ImStristr(text, text_end, f.b, f.e) == NULL)
return false;
}
}

// Implicit * grep
if (CountGrep == 0)
return true;

return false;
return true;
}

//-----------------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion imgui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2186,7 +2186,6 @@ struct ImGuiTextFilter
};
char InputBuf[256];
ImVector<ImGuiTextRange>Filters;
int CountGrep;
};

// Helper: Growable text buffer for logging/accumulating text
Expand Down