ImGuiTextFilter, TextRange: removed cruft from TextRange since it's not a publicly and generic helper at the moment + marked internal stuff + changed a reference to a pointer. (#1879)
diff --git a/imgui.cpp b/imgui.cpp
index b54b86b..a53a0ff 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -1833,37 +1833,41 @@
return value_changed;
}
-void ImGuiTextFilter::TextRange::split(char separator, ImVector<TextRange>& out)
+void ImGuiTextFilter::TextRange::split(char separator, ImVector<TextRange>* out) const
{
- out.resize(0);
+ out->resize(0);
const char* wb = b;
const char* we = wb;
while (we < e)
{
if (*we == separator)
{
- out.push_back(TextRange(wb, we));
+ out->push_back(TextRange(wb, we));
wb = we + 1;
}
we++;
}
if (wb != we)
- out.push_back(TextRange(wb, we));
+ out->push_back(TextRange(wb, we));
}
void ImGuiTextFilter::Build()
{
Filters.resize(0);
TextRange input_range(InputBuf, InputBuf+strlen(InputBuf));
- input_range.split(',', Filters);
+ input_range.split(',', &Filters);
CountGrep = 0;
for (int i = 0; i != Filters.Size; i++)
{
- Filters[i].trim_blanks();
- if (Filters[i].empty())
+ TextRange& f = Filters[i];
+ while (f.b < f.e && ImCharIsBlankA(f.b[0]))
+ f.b++;
+ while (f.e > f.b && ImCharIsBlankA(f.e[-1]))
+ f.e--;
+ if (f.empty())
continue;
- if (Filters[i].front() != '-')
+ if (Filters[i].b[0] != '-')
CountGrep += 1;
}
}
@@ -1881,7 +1885,7 @@
const TextRange& f = Filters[i];
if (f.empty())
continue;
- if (f.front() == '-')
+ if (f.b[0] == '-')
{
// Subtract
if (ImStristr(text, text_end, f.begin()+1, f.end()) != NULL)
diff --git a/imgui.h b/imgui.h
index f627c7d..59590f0 100644
--- a/imgui.h
+++ b/imgui.h
@@ -1309,6 +1309,14 @@
// Helper: Parse and apply text filters. In format "aaaaa[,bbbb][,ccccc]"
struct ImGuiTextFilter
{
+ IMGUI_API ImGuiTextFilter(const char* default_filter = "");
+ IMGUI_API bool Draw(const char* label = "Filter (inc,-exc)", float width = 0.0f); // Helper calling InputText+Build
+ IMGUI_API bool PassFilter(const char* text, const char* text_end = NULL) const;
+ IMGUI_API void Build();
+ void Clear() { InputBuf[0] = 0; Build(); }
+ bool IsActive() const { return !Filters.empty(); }
+
+ // [Internal]
struct TextRange
{
const char* b;
@@ -1316,25 +1324,14 @@
TextRange() { b = e = NULL; }
TextRange(const char* _b, const char* _e) { b = _b; e = _e; }
- const char* begin() const { return b; }
- const char* end() const { return e; }
- bool empty() const { return b == e; }
- char front() const { return *b; }
- static bool is_blank(char c) { return c == ' ' || c == '\t'; }
- void trim_blanks() { while (b < e && is_blank(*b)) b++; while (e > b && is_blank(*(e-1))) e--; }
- IMGUI_API void split(char separator, ImVector<TextRange>& out);
+ const char* begin() const { return b; }
+ const char* end () const { return e; }
+ bool empty() const { return b == e; }
+ IMGUI_API void split(char separator, ImVector<TextRange>* out) const;
};
-
char InputBuf[256];
ImVector<TextRange> Filters;
int CountGrep;
-
- IMGUI_API ImGuiTextFilter(const char* default_filter = "");
- IMGUI_API bool Draw(const char* label = "Filter (inc,-exc)", float width = 0.0f); // Helper calling InputText+Build
- IMGUI_API bool PassFilter(const char* text, const char* text_end = NULL) const;
- IMGUI_API void Build();
- void Clear() { InputBuf[0] = 0; Build(); }
- bool IsActive() const { return !Filters.empty(); }
};
// Helper: Text buffer for logging/accumulating text
