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

eepp:

Browse Source 
Added support to load documents asynchronously.
Added FileSystem::isRelativePath.
Added TextPosition::fromString and TextRange::fromString.
UICodeEditor: don't show currently loaded content until document load is complete.
Added UICodeEditorSplitter::loadAsyncFileFromPath and UICodeEditorSplitter::loadAsyncFileFromPathInNewTab.

ecode:
ecode now load documents async.
Fix: detect when an open document is open and has been moved in the file system, update the new location and name.
Remember document position and last focused document on project load.
This commit is contained in:
Martín Lucas Golini
2022-03-25 19:26:04 -03:00
parent 0ee4fa1bd7
commit 20b84171e9
18 changed files with 312 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/tools/codeeditor/codeeditor.cpp
View File

@@ -7,18 +7,6 @@
App* appInstance = nullptr;
static bool isRelativePath( const std::string& path ) {
if ( !path.empty() ) {
if ( path[0] == '/' )
return false;
#if EE_PLATFORM == EE_PLATFORM_WIN
if ( path.size() >= 2 && String::isLetter( path[0] ) && path[1] == ':' )
return false;
#endif
}
return true;
}
void appLoop() {
appInstance->mainLoop();
}
@@ -187,7 +175,7 @@ void App::openFolderDialog() {
void App::openFontDialog( std::string& fontPath ) {
std::string absoluteFontPath( fontPath );
if ( isRelativePath( absoluteFontPath ) )
if ( FileSystem::isRelativePath( absoluteFontPath ) )
absoluteFontPath = mResPath + fontPath;
UIFileDialog* dialog =
UIFileDialog::New( UIFileDialog::DefaultFlags, "*.ttf; *.otf; *.wolff; *.otb",
@@ -1302,11 +1290,19 @@ 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 );
} else {
mEditorSplitter->loadAsyncFileFromPath( path, mThreadPool, codeEditor );
}
#else
if ( inNewTab ) {
mEditorSplitter->loadFileFromPathInNewTab( path );
} else {
mEditorSplitter->loadFileFromPath( path, codeEditor );
}
#endif
}
}
@@ -1499,6 +1495,13 @@ void App::onCodeEditorCreated( UICodeEditor* editor, TextDocument& doc ) {
}
} );
editor->addEventListener( Event::OnDocumentMoved, [&]( const Event* event ) {
if ( !appInstance )
return;
UICodeEditor* editor = event->getNode()->asType<UICodeEditor>();
updateEditorTabTitle( editor );
} );
if ( config.autoComplete && !mAutoCompleteModule )
setAutoComplete( config.autoComplete );
@@ -2039,7 +2042,7 @@ void App::loadFolder( const std::string& path ) {
mCurrentProject = rpath;
loadDirTree( rpath );
mConfig.loadProject( rpath, mEditorSplitter, mConfigPath );
mConfig.loadProject( rpath, mEditorSplitter, mConfigPath, mThreadPool );
mFileSystemModel = FileSystemModel::New( rpath, FileSystemModel::Mode::FilesAndDirectories,
{ true, true, true } );
@@ -2064,7 +2067,7 @@ void App::loadFolder( const std::string& path ) {
FontTrueType* App::loadFont( const std::string& name, std::string fontPath,
const std::string& fallback ) {
if ( isRelativePath( fontPath ) )
if ( FileSystem::isRelativePath( fontPath ) )
fontPath = mResPath + fontPath;
if ( fontPath.empty() || !FileSystem::fileExists( fontPath ) )
fontPath = fallback;
@@ -2103,7 +2106,7 @@ void App::init( const std::string& file, const Float& pidelDensity,
winSettings.Height = mConfig.window.size.getHeight();
if ( winSettings.Icon.empty() ) {
winSettings.Icon = mConfig.window.winIcon;
if ( isRelativePath( winSettings.Icon ) )
if ( FileSystem::isRelativePath( winSettings.Icon ) )
winSettings.Icon = mResPath + winSettings.Icon;
}
ContextSettings contextSettings = engine->createContextSettings( &mConfig.ini, "window" );