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

eepp:

Browse Source 
Fixed an issue in UINodeDrawable that was breaking the color tint of the drawables in some cases.
Fixed an issue when using clipping mask that prevented the batched geometry to be rendered.
Added border-smooth and background-smooth properties (I'm not sure if I'm gonna use them yet).
ecode:
Closes SpartanJ/ecode#59.
Fixed a minor issue when dropping SVG files into the editor, they weren't being opened in a new tab.
Added Solidity LSP support using solc.
This commit is contained in:
Martín Lucas Golini
2023-02-23 00:02:01 -03:00
parent b2f161a4a4
commit 353988f292
20 changed files with 315 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -564,8 +564,8 @@ void App::onFileDropped( String file ) {
if ( node && node->isType( UI_TYPE_CODEEDITOR ) ) {
codeEditor = node->asType<UICodeEditor>();
if ( ( codeEditor->getDocument().isLoading() || !codeEditor->getDocument().isEmpty() ) &&
!Image::isImageExtension( file ) &&
FileSystem::fileExtension( file.toUtf8() ) != "svg" ) {
( !Image::isImageExtension( file ) ||
FileSystem::fileExtension( file.toUtf8() ) == "svg" ) ) {
auto d = mSplitter->createCodeEditorInTabWidget(
mSplitter->tabWidgetFromEditor( codeEditor ) );
codeEditor = d.second;
@@ -573,7 +573,8 @@ void App::onFileDropped( String file ) {
}
} else if ( widget && widget->isType( UI_TYPE_TERMINAL ) ) {
if ( !Image::isImageExtension( file ) &&
FileSystem::fileExtension( file.toUtf8() ) != "svg" ) {
( !Image::isImageExtension( file ) ||
FileSystem::fileExtension( file.toUtf8() ) == "svg" ) ) {
auto d =
mSplitter->createCodeEditorInTabWidget( mSplitter->tabWidgetFromWidget( widget ) );
codeEditor = d.second;
@@ -1434,6 +1435,46 @@ void App::cleanUpRecentFiles() {
mRecentFiles = recentFiles;
}
void App::loadFileDelayed() {
if ( mFileToOpen.empty() )
return;
auto fileAndPos = getPathAndPosition( mFileToOpen );
auto tab = mSplitter->isDocumentOpen( fileAndPos.first, false, true );
if ( tab ) {
tab->getTabWidget()->setTabSelected( tab );
if ( tab->getOwnedWidget()->isType( UI_TYPE_CODEEDITOR ) ) {
UICodeEditor* editor = tab->getOwnedWidget()->asType<UICodeEditor>();
if ( editor->getDocument().isLoading() ) {
Uint32 cb =
editor->on( Event::OnDocumentLoaded, [fileAndPos]( const Event* event ) {
if ( event->getNode()->isType( UI_TYPE_CODEEDITOR ) ) {
UICodeEditor* editor = event->getNode()->asType<UICodeEditor>();
editor->runOnMainThread(
[editor, fileAndPos] { editor->goToLine( fileAndPos.second ); } );
}
event->getNode()->removeEventListener( event->getCallbackId() );
} );
// Don't listen forever if no event is received
editor->runOnMainThread( [editor, cb]() { editor->removeEventListener( cb ); },
Seconds( 4 ) );
} else {
editor->runOnMainThread(
[editor, fileAndPos] { editor->goToLine( fileAndPos.second ); } );
}
}
} else {
loadFileFromPath( fileAndPos.first, true, nullptr,
[fileAndPos]( UICodeEditor* editor, const std::string& ) {
editor->runOnMainThread(
[editor, fileAndPos] { editor->goToLine( fileAndPos.second ); } );
} );
}
mFileToOpen.clear();
}
void App::onRealDocumentLoaded( UICodeEditor* editor, const std::string& path ) {
updateEditorTitle( editor );
if ( mSplitter->curEditorExistsAndFocused() && editor == mSplitter->getCurEditor() )
@@ -3197,42 +3238,7 @@ void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDe
initProjectTreeView( file );
}
if ( !fileToOpen.empty() ) {
auto fileAndPos = getPathAndPosition( fileToOpen );
auto tab = mSplitter->isDocumentOpen( fileAndPos.first, false, true );
if ( tab ) {
tab->getTabWidget()->setTabSelected( tab );
if ( tab->getOwnedWidget()->isType( UI_TYPE_CODEEDITOR ) ) {
UICodeEditor* editor = tab->getOwnedWidget()->asType<UICodeEditor>();
if ( editor->getDocument().isLoading() ) {
Uint32 cb = editor->on(
Event::OnDocumentLoaded, [fileAndPos]( const Event* event ) {
if ( event->getNode()->isType( UI_TYPE_CODEEDITOR ) ) {
UICodeEditor* editor = event->getNode()->asType<UICodeEditor>();
editor->runOnMainThread( [editor, fileAndPos] {
editor->goToLine( fileAndPos.second );
} );
}
event->getNode()->removeEventListener( event->getCallbackId() );
} );
// Don't listen forever if no event is received
editor->runOnMainThread(
[editor, cb]() { editor->removeEventListener( cb ); }, Seconds( 4 ) );
} else {
editor->runOnMainThread(
[editor, fileAndPos] { editor->goToLine( fileAndPos.second ); } );
}
}
} else {
loadFileFromPath( fileAndPos.first, true, nullptr,
[fileAndPos]( UICodeEditor* editor, const std::string& ) {
editor->runOnMainThread( [editor, fileAndPos] {
editor->goToLine( fileAndPos.second );
} );
} );
}
}
mFileToOpen = fileToOpen;
Log::info( "Init ProjectTreeView took: %.2f ms",
globalClock.getElapsedTime().asMilliseconds() );
@@ -3348,7 +3354,14 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
{ "export-lang" }, "" );
try {
parser.ParseCLI( Sys::parseArguments( argc, argv ) );
auto args = Sys::parseArguments( argc, argv );
if ( !args.empty() ) {
std::string strargs( String::join( args ) );
Log::info( "ecode starting with these command line arguments: %s", strargs.c_str() );
}
parser.ParseCLI( args );
} catch ( const args::Help& ) {
Sys::windowAttachConsole();
std::cout << parser;