Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-11 01:01:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

More general improvements for UITerminal.

Browse Source
This commit is contained in:
Martín Lucas Golini
2022-07-07 00:08:17 -03:00
parent 12e3d71048
commit af6125c1bc
15 changed files with 173 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2005,7 +2005,8 @@ void App::createNewTerminal() {
return;
}
}
UITerminal* term = UITerminal::New( mFontMono, PixelDensity::dpToPx( 11 ), Sizef( 16, 16 ) );
UITerminal* term = UITerminal::New( mFontMonoNerdFont ? mFontMonoNerdFont : mFontMono,
PixelDensity::dpToPx( 11 ), Sizef( 16, 16 ) );
mEditorSplitter->createWidgetInTabWidget( tabWidget, term, "Shell", true );
term->addEventListener( Event::OnTitleChange, [&]( const Event* event ) {
if ( event->getNode() != mEditorSplitter->getCurWidget() )
@@ -2978,9 +2979,11 @@ FontTrueType* App::loadFont( const std::string& name, std::string fontPath,
fontPath = mResPath + fontPath;
if ( fontPath.empty() || !FileSystem::fileExists( fontPath ) ) {
fontPath = fallback;
if ( FileSystem::isRelativePath( fontPath ) )
if ( !fontPath.empty() && FileSystem::isRelativePath( fontPath ) )
fontPath = mResPath + fontPath;
}
if ( fontPath.empty() )
return nullptr;
return FontTrueType::New( name, fontPath );
}
@@ -3082,21 +3085,24 @@ void App::init( std::string file, const Float& pidelDensity, const std::string&
mFontMono = loadFont( "monospace", mConfig.ui.monospaceFont, "fonts/DejaVuSansMono.ttf" );
if ( mFontMono )
mFontMono->setBoldAdvanceSameAsRegular( true );
loadFont( "NotoEmoji-Regular", "fonts/NotoEmoji-Regular.ttf" );
#if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN
loadFont( "NotoColorEmoji", "fonts/NotoColorEmoji.ttf" );
#endif
FontTrueType* iconFont = FontTrueType::New( "icon", mResPath + "fonts/remixicon.ttf" );
FontTrueType* iconFont = loadFont( "icon", "fonts/remixicon.ttf" );
FontTrueType* mimeIconFont = loadFont( "nonicons", "fonts/nonicons.ttf" );
if ( !mFont || !mFontMono || !iconFont ) {
if ( !mFont || !mFontMono || !iconFont || !mimeIconFont ) {
printf( "Font not found!" );
Log::error( "Font not found!" );
return;
}
FontTrueType* mimeIconFont =
FontTrueType::New( "nonicons", mResPath + "fonts/nonicons.ttf" );
mFontMonoNerdFont =
loadFont( "monospace-nerdfont", "fonts/DejaVuSansMonoNerdFontComplete.ttf" );
SceneManager::instance()->add( mUISceneNode );