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

Merge branch 'develop' into debugger

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-12-19 12:39:47 -03:00
parent 09d8067947 90ef341f00
commit 2c36c42c99
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1129,7 +1129,7 @@ String App::i18n( const std::string& key, const String& def ) {
}
std::string App::getCurrentWorkingDir() const {
if ( !mCurrentProject.empty() )
if ( !mCurrentProject.empty() && mCurrentProject != mPlaygroundPath )
return mCurrentProject;
if ( mSplitter && mSplitter->curEditorIsNotNull() && mSplitter->curEditorExists() &&
@@ -3313,7 +3313,7 @@ bool App::needsRedirectToRunningProcess( std::string file ) {
void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDensity,
const std::string& colorScheme, bool terminal, bool frameBuffer, bool benchmarkMode,
const std::string& css, bool health, const std::string& healthLang,
std::string css, bool health, const std::string& healthLang,
FeaturesHealth::OutputFormat healthFormat, const std::string& fileToOpen,
bool stdOutLogs, bool disableFileLogs, bool openClean, bool portable,
std::string language ) {
@@ -3608,7 +3608,10 @@ void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDe
setTheme( getThemePath() );
if ( !css.empty() && FileSystem::fileExists( css ) ) {
if ( css.empty() )
css = mConfigPath + "style.css";
if ( FileSystem::fileExists( css ) ) {
CSS::StyleSheetParser parser;
if ( parser.loadFromFile( css ) )
mUISceneNode->combineStyleSheet( parser.getStyleSheet(), false );

2
src/tools/ecode/ecode.hpp
View File

@@ -43,7 +43,7 @@ class App : public UICodeEditorSplitter::Client {
void init( const LogLevel& logLevel, std::string file, const Float& pidelDensity,
const std::string& colorScheme, bool terminal, bool frameBuffer, bool benchmarkMode,
const std::string& css, bool health, const std::string& healthLang,
std::string css, bool health, const std::string& healthLang,
ecode::FeaturesHealth::OutputFormat healthFormat, const std::string& fileToOpen,
bool stdOutLogs, bool disableFileLogs, bool openClean, bool portable,
std::string language );