Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resurrect filtering of lists (playlist only for now)

Browse Source
This commit is contained in:
Andrzej Rybczak
2016-11-13 00:21:25 +01:00
parent 60e66b47b6
commit 29b1813c6d
14 changed files with 360 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/statusbar.cpp
View File

@@ -220,19 +220,34 @@ bool Statusbar::Helpers::ImmediatelyReturnOneOf::operator()(const char *s) const
return !isOneOf(s);
}
bool Statusbar::Helpers::ApplyFilterImmediately::operator()(const char *s)
{
using Global::myScreen;
Status::trace();
try {
if (m_w->allowsSearching() && m_w->currentFilter() != s)
{
m_w->applyFilter(s);
if (myScreen == myPlaylist)
myPlaylist->enableHighlighting();
myScreen->refreshWindow();
}
} catch (boost::bad_expression &) { }
return true;
}
bool Statusbar::Helpers::FindImmediately::operator()(const char *s)
{
using Global::myScreen;
Status::trace();
try {
if (m_w->allowsSearching() && m_s != s)
if (m_w->allowsSearching() && m_w->searchConstraint() != s)
{
m_w->setSearchConstraint(s);
m_found = m_w->search(m_direction, Config.wrapped_search, false);
m_w->search(m_direction, Config.wrapped_search, false);
if (myScreen == myPlaylist)
myPlaylist->enableHighlighting();
myScreen->refreshWindow();
m_s = s;
}
} catch (boost::bad_expression &) { }
return true;