H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-01-03 14:06:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vgui_surfacelib(android): use fonts with chinese/japanese/korean support( fixes #104 )

Browse Source
This commit is contained in:
nillerusr 2022-08-05 22:40:06 +03:00
parent e852953d9d
commit c5607661f0
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vgui2/vgui_surfacelib/linuxfont.cpp
View File

@ -406,8 +406,21 @@ bool CLinuxFont::CreateFromMemory(const char *windowsFontName, void *data, int d
} }
#ifdef ANDROID #ifdef ANDROID
char *FindFontAndroid(bool bBold, int italic) char *FindFontAndroid(const char *winFontName, bool bBold, int italic)
{ {
static char fontFile[MAX_PATH];
const char *fontName;
if( strcmp( winFontName, "Courier New") == 0 )
fontName = "LiberationMono-Regular.ttf";
else
fontName = "DroidSansFallback.ttf"; // for chinese/japanese/korean
snprintf( fontFile, sizeof fontFile, "%s/files/%s", getenv("APP_DATA_PATH"), fontName);
return fontFile;
#if 0 // Old detect
const char *fontFileName, *fontFileNamePost = NULL; const char *fontFileName, *fontFileNamePost = NULL;
fontFileName = "Roboto"; fontFileName = "Roboto";
@ -448,6 +461,7 @@ char *FindFontAndroid(bool bBold, int italic)
} }
return dataFile; return dataFile;
#endif
} }
#endif #endif
@ -467,7 +481,7 @@ char *CLinuxFont::GetFontFileName( const char *windowsFontName, int flags )
const int italic = ( flags & vgui::ISurface::FONTFLAG_ITALIC ) ? FC_SLANT_ITALIC : FC_SLANT_ROMAN; const int italic = ( flags & vgui::ISurface::FONTFLAG_ITALIC ) ? FC_SLANT_ITALIC : FC_SLANT_ROMAN;
#ifdef ANDROID #ifdef ANDROID
char *filename = FindFontAndroid( bBold, italic ); char *filename = FindFontAndroid( windowsFontName, bBold, italic );
Msg("Android font: %s\n", filename); Msg("Android font: %s\n", filename);
if( !filename ) return NULL; if( !filename ) return NULL;
return strdup( filename ); return strdup( filename );
@ -497,7 +511,7 @@ char *CLinuxFont::GetFontFileName( const char *windowsFontName, int flags )
} }
FcPatternDestroy( match ); FcPatternDestroy( match );
Msg("Android font fc: %s", filenameret); Msg("font fc: %s - %s\n", windowsFontName, filenameret);
return filenameret; return filenameret;
} }