haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Supported language filtering for fonts. 

If the language isn't supported by the system, no point showing the
user the fonts.
This commit is contained in:
Jeff Young 2022-01-08 22:02:17 +00:00
parent c5eb77d765
commit 6242b40cde
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/font/fontconfig.cpp
View File

@ -90,7 +90,8 @@ void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts )
if( m_fonts.empty() ) if( m_fonts.empty() )
{ {
FcPattern* pat = FcPatternCreate(); FcPattern* pat = FcPatternCreate();
FcObjectSet* os = FcObjectSetBuild( FC_FAMILY, FC_STYLE, FC_LANG, FC_FILE, nullptr ); FcObjectSet* os = FcObjectSetBuild( FC_FAMILY, FC_STYLE, FC_LANG, FC_FILE, FC_OUTLINE,
nullptr );
FcFontSet* fs = FcFontList( nullptr, pat, os ); FcFontSet* fs = FcFontList( nullptr, pat, os );
for( int i = 0; fs && i < fs->nfont; ++i ) for( int i = 0; fs && i < fs->nfont; ++i )
@ -99,11 +100,40 @@ void FONTCONFIG::ListFonts( std::vector<std::string>& aFonts )
FcChar8* file; FcChar8* file;
FcChar8* style; FcChar8* style;
FcChar8* family; FcChar8* family;
FcLangSet* langSet;
FcBool outline;
bool langSupported = false;
if( FcPatternGetString( font, FC_FILE, 0, &file ) == FcResultMatch if( FcPatternGetString( font, FC_FILE, 0, &file ) == FcResultMatch
&& FcPatternGetString( font, FC_FAMILY, 0, &family ) == FcResultMatch && FcPatternGetString( font, FC_FAMILY, 0, &family ) == FcResultMatch
&& FcPatternGetString( font, FC_STYLE, 0, &style ) == FcResultMatch ) && FcPatternGetString( font, FC_STYLE, 0, &style ) == FcResultMatch
&& FcPatternGetLangSet( font, FC_LANG, 0, &langSet ) == FcResultMatch
&& FcPatternGetBool( font, FC_OUTLINE, 0, &outline ) == FcResultMatch )
{ {
if( !outline )
continue;
FcStrSet* langStrSet = FcLangSetGetLangs( langSet );
FcStrList* langStrList = FcStrListCreate( langStrSet );
while( FcChar8* langStr = FcStrListNext( langStrList ) )
{
wxString langWxStr( reinterpret_cast<char *>( langStr ) );
const wxLanguageInfo* langInfo = wxLocale::FindLanguageInfo( langWxStr );
if( langInfo && wxLocale::IsAvailable( langInfo->Language ) )
{
langSupported = true;
break;
}
}
FcStrListDone( langStrList );
FcStrSetDestroy( langStrSet );
if( !langSupported )
continue;
std::ostringstream s; std::ostringstream s;
s << family; s << family;