clear search results if empty string is passed to FindForward/Backward

This commit is contained in:
Andrzej Rybczak
2013-04-07 14:10:41 +02:00
parent 1d4e006986
commit d451731562
6 changed files with 41 additions and 0 deletions

View File

@@ -271,6 +271,11 @@ bool Browser::allowsSearching()
bool Browser::search(const std::string &constraint)
{
if (constraint.empty())
{
w.clearSearchResults();
return false;
}
try
{
auto fun = std::bind(BrowserEntryMatcher, _1, _2, false);

View File

@@ -596,6 +596,16 @@ bool MediaLibrary::allowsSearching()
bool MediaLibrary::search(const std::string &constraint)
{
if (constraint.empty())
{
if (isActiveWindow(Tags))
Tags.clearSearchResults();
else if (isActiveWindow(Albums))
Albums.clearSearchResults();
else if (isActiveWindow(Songs))
Songs.clearSearchResults();
return false;
}
try
{
bool result = false;

View File

@@ -161,6 +161,11 @@ bool Playlist::allowsSearching()
bool Playlist::search(const std::string &constraint)
{
if (constraint.empty())
{
w.clearSearchResults();
return false;
}
try
{
auto rx = RegexFilter<MPD::Song>(

View File

@@ -364,6 +364,14 @@ bool PlaylistEditor::allowsSearching()
bool PlaylistEditor::search(const std::string &constraint)
{
if (constraint.empty())
{
if (isActiveWindow(Playlists))
Playlists.clearSearchResults();
else if (isActiveWindow(Content))
Content.clearSearchResults();
return false;
}
try
{
bool result = false;

View File

@@ -284,6 +284,11 @@ bool SearchEngine::allowsSearching()
bool SearchEngine::search(const std::string &constraint)
{
if (constraint.empty())
{
w.clearSearchResults();
return false;
}
try
{
auto fun = std::bind(SEItemEntryMatcher, _1, _2, false);

View File

@@ -770,6 +770,14 @@ bool TagEditor::allowsSearching()
bool TagEditor::search(const std::string &constraint)
{
if (constraint.empty())
{
if (w == Dirs)
Dirs->clearSearchResults();
else if (w == Tags)
Tags->clearSearchResults();
return false;
}
try
{
bool result = false;