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

master
Andrzej Rybczak 13 years ago
parent 1d4e006986
commit d451731562
  1. 5
      src/browser.cpp
  2. 10
      src/media_library.cpp
  3. 5
      src/playlist.cpp
  4. 8
      src/playlist_editor.cpp
  5. 5
      src/search_engine.cpp
  6. 8
      src/tag_editor.cpp

@ -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);

@ -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;

@ -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>(

@ -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;

@ -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);

@ -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;

Loading…
Cancel
Save