Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-29 17:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

ecode: Fixed load callback when loading a file from the GlobalSearchController.

Browse Source
This commit is contained in:
Martín Lucas Golini
2022-04-02 01:05:03 -03:00
parent cf83d8fbf3
commit 0ef95ec3d4
7 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tools/ecode/ecode.cpp
View File

@@ -1295,7 +1295,9 @@ void App::createDocAlert( UICodeEditor* editor ) {
} );
}
void App::loadFileFromPath( const std::string& path, bool inNewTab, UICodeEditor* codeEditor ) {
void App::loadFileFromPath(
const std::string& path, bool inNewTab, UICodeEditor* codeEditor,
std::function<void( UICodeEditor* codeEditor, const std::string& path )> onLoaded ) {
if ( Image::isImageExtension( path ) && Image::isImage( path ) ) {
UIImage* imageView = mImageLayout->findByType<UIImage>( UI_TYPE_IMAGE );
UILoader* loaderView = mImageLayout->findByType<UILoader>( UI_TYPE_LOADER );
@@ -1324,19 +1326,11 @@ void App::loadFileFromPath( const std::string& path, bool inNewTab, UICodeEditor
#endif
}
} else {
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN || defined( __EMSCRIPTEN_PTHREADS__ )
if ( inNewTab ) {
mEditorSplitter->loadAsyncFileFromPathInNewTab( path, mThreadPool );
mEditorSplitter->loadAsyncFileFromPathInNewTab( path, mThreadPool, onLoaded );
} else {
mEditorSplitter->loadAsyncFileFromPath( path, mThreadPool, codeEditor );
mEditorSplitter->loadAsyncFileFromPath( path, mThreadPool, codeEditor, onLoaded );
}
#else
if ( inNewTab ) {
mEditorSplitter->loadFileFromPathInNewTab( path );
} else {
mEditorSplitter->loadFileFromPath( path, codeEditor );
}
#endif
}
}