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

Fallback loading the fallback font if the configured font has failed to load the font face.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-04-06 01:17:17 -03:00
parent 7fbf408f35
commit a2885f278d
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3374,6 +3374,7 @@ static std::string getShellEnv( const std::string& env, const std::string& defSh
FontTrueType* App::loadFont( const std::string& name, std::string fontPath,
const std::string& fallback ) {
bool wasFallback = false;
if ( FileSystem::isRelativePath( fontPath ) )
fontPath = mResPath + fontPath;
#if EE_PLATFORM == EE_PLATFORM_ANDROID
@@ -3383,12 +3384,26 @@ FontTrueType* App::loadFont( const std::string& name, std::string fontPath,
if ( fontPath.empty() || !FileSystem::fileExists( fontPath ) ) {
#endif
fontPath = fallback;
wasFallback = true;
if ( !fontPath.empty() && FileSystem::isRelativePath( fontPath ) )
fontPath = mResPath + fontPath;
}
if ( fontPath.empty() )
return nullptr;
return FontTrueType::New( name, fontPath );
FontTrueType* font = FontTrueType::New( name );
if ( font->loadFromFile( fontPath ) )
return font;
eeSAFE_DELETE( font );
// Failed to load original font? Try to fallback
if ( !fallback.empty() && !wasFallback ) {
if ( !fontPath.empty() && FileSystem::isRelativePath( fontPath ) )
fontPath = mResPath + fontPath;
font = FontTrueType::New( name );
if ( font->loadFromFile( fontPath ) )
return font;
eeSAFE_DELETE( font );
}
return nullptr;
}
void App::init( const LogLevel& logLevel, std::string file, const Float& pidelDensity,