Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-18 06:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix global search searching text in images.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-12-06 19:34:17 -03:00
parent f20017ff71
commit 88f38c313a
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/tools/ecode/globalsearchcontroller.cpp
View File

@@ -1,5 +1,5 @@
#include "globalsearchcontroller.hpp"
#include "ecode.hpp"
#include "globalsearchcontroller.hpp"
#include "uitreeviewglobalsearch.hpp"
namespace ecode {
@@ -664,6 +664,23 @@ void GlobalSearchController::doGlobalSearch( String text, String filter, bool ca
std::vector<std::shared_ptr<TextDocument>> openDocs;
mSplitter->forEachDocSharedPtr(
[&openDocs]( auto doc ) { openDocs.emplace_back( std::move( doc ) ); } );
auto filters = parseGlobMatches( filter );
auto imageExts = Image::getImageExtensionsSupported();
imageExts.erase( std::remove_if( imageExts.begin(), imageExts.end(),
[]( const std::string& ext ) { return ext == "svg"; } ),
imageExts.end() );
filters.reserve( filters.size() + imageExts.size() );
for ( const auto& ext : imageExts ) {
// If user explicitly requested to filter some extension, respect it and do not add the
// ignore for it.
std::string extGlob( "*." + ext );
if ( std::find_if( filters.begin(), filters.end(),
[&extGlob]( const std::pair<std::string, bool>& filter ) {
return filter.first == extGlob;
} ) != filters.end() )
continue;
filters.emplace_back( extGlob, true );
}
ProjectSearch::find(
mApp->getDirTree()->getFiles(), search,
@@ -685,8 +702,7 @@ void GlobalSearchController::doGlobalSearch( String text, String filter, bool ca
loader->close();
} );
},
caseSensitive, wholeWord, searchType, parseGlobMatches( filter ),
mApp->getCurrentProject(), openDocs );
caseSensitive, wholeWord, searchType, filters, mApp->getCurrentProject(), openDocs );
}
}