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

Add hint-display property to UITextInput.

Browse Source 
Minor refactor in ProjectDirectoryTree.
This commit is contained in:
Martín Lucas Golini
2024-03-10 23:27:59 -03:00
parent 7d12ceeabb
commit 59c5e72f4d
12 changed files with 78 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/tools/ecode/projectdirectorytree.cpp
View File

@@ -1,5 +1,4 @@
#include "projectdirectorytree.hpp"
#include "ecode.hpp"
#include <algorithm>
#include <eepp/system/filesystem.hpp>
#include <limits>
@@ -8,8 +7,9 @@ namespace ecode {
#define PRJ_ALLOWED_PATH ".ecode/.prjallowed"
ProjectDirectoryTree::ProjectDirectoryTree( const std::string& path,
std::shared_ptr<ThreadPool> threadPool, App* app ) :
ProjectDirectoryTree::ProjectDirectoryTree(
const std::string& path, std::shared_ptr<ThreadPool> threadPool, PluginManager* pluginManager,
std::function<void( const std::string& )> loadFileFromPathOrFocusFn ) :
mPath( path ),
mPool( threadPool ),
mRunning( false ),
@@ -17,14 +17,15 @@ ProjectDirectoryTree::ProjectDirectoryTree( const std::string& path,
mIgnoreHidden( true ),
mClosing( false ),
mIgnoreMatcher( path ),
mApp( app ) {
mPluginManager( pluginManager ),
mLoadFileFromPathOrFocusFn( std::move( loadFileFromPathOrFocusFn ) ) {
FileSystem::dirAddSlashAtEnd( mPath );
}
ProjectDirectoryTree::~ProjectDirectoryTree() {
mClosing = true;
if ( mApp->getPluginManager() )
mApp->getPluginManager()->unsubscribeMessages( "ProjectDirectoryTree" );
if ( mPluginManager )
mPluginManager->unsubscribeMessages( "ProjectDirectoryTree" );
Lock rl( mMatchingMutex );
if ( mRunning ) {
mRunning = false;
@@ -79,10 +80,13 @@ void ProjectDirectoryTree::scan( const ProjectDirectoryTree::ScanCompleteEvent&
mAllowedMatcher.get() );
}
mIsReady = true;
mApp->getPluginManager()->subscribeMessages(
"ProjectDirectoryTree", [this]( const PluginMessage& msg ) -> PluginRequestHandle {
return processMessage( msg );
} );
if ( mPluginManager ) {
mPluginManager->subscribeMessages(
"ProjectDirectoryTree",
[this]( const PluginMessage& msg ) -> PluginRequestHandle {
return processMessage( msg );
} );
}
#if EE_PLATFORM == EE_PLATFORM_EMSCRIPTEN && !defined( __EMSCRIPTEN_PTHREADS__ )
if ( scanComplete )
scanComplete( *this );
@@ -530,9 +534,11 @@ PluginRequestHandle ProjectDirectoryTree::processMessage( const PluginMessage& m
}
if ( !matchesMap.empty() ) {
std::string filePath( matchesMap.begin()->second );
mApp->getUISceneNode()->runOnMainThread(
[this, filePath]() { mApp->loadFileFromPathOrFocus( filePath ); } );
if ( mPluginManager && mLoadFileFromPathOrFocusFn ) {
std::string filePath( matchesMap.begin()->second );
mPluginManager->getUISceneNode()->runOnMainThread(
[this, filePath]() { mLoadFileFromPathOrFocusFn( filePath ); } );
}
}
return PluginRequestHandle::broadcast();