menu: remove search related methods

1 files changed, 35 insertions, 0 deletions

diff --git a/src/helpers.h b/src/helpers.h
index 51a35308..7dc3b500 100644
--- a/src/helpers.h
+++ b/src/helpers.h
@@ -29,6 +29,41 @@
 #include "utility/string.h"
 #include "utility/wide_string.h"
 
+template <typename Iterator, typename PredicateT>
+Iterator wrappedSearch(Iterator begin, Iterator current, Iterator end,
+                       const PredicateT &pred, bool wrap)
+{
+	++current;
+	auto it = std::find_if(current, end, pred);
+	if (it == end && wrap)
+	{
+		it = std::find_if(begin, current, pred);
+		if (it == current)
+			it = end;
+	}
+	return it;
+}
+
+template <typename ItemT, typename PredicateT>
+void searchForward(NC::Menu<ItemT> &m, const PredicateT &pred, bool wrap)
+{
+if (!pred.defined())
+		return;
+	auto it = wrappedSearch(m.begin(), m.currentI(), m.end(), pred, wrap);
+	if (it != m.end())
+		m.highlight(it-m.begin());
+}
+
+template <typename ItemT, typename PredicateT>
+void searchBackward(NC::Menu<ItemT> &m, const PredicateT &pred, bool wrap)
+{
+	if (!pred.defined())
+			return;
+	auto it = wrappedSearch(m.rbegin(), m.currentRI(), m.rend(), pred, wrap);
+	if (it != m.rend())
+		m.highlight(m.size()-1-(it-m.rbegin()));
+}
+
 inline HasColumns *hasColumns(BaseScreen *screen)
 {
 	return dynamic_cast<HasColumns *>(screen);