forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TTC file added to fontmanger 

- fontmanager
1. Truetype collection(*.ttc) added
2. font number double counting fixed
- compile error fixed
This commit is contained in:
Seo Youngjin 2020-07-16 13:08:59 +09:00
parent 1822edb88d
commit b5f42fb807
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dlangui/core/settings.d
View File

@ -498,7 +498,7 @@ final class Setting {
case UINTEGER: case UINTEGER:
return to!string(_store.uinteger); return to!string(_store.uinteger);
case FLOAT: case FLOAT:
return to!string(_store.floating); return to!string(cast(double)_store.floating);
case TRUE: case TRUE:
return "true"; return "true";
case FALSE: case FALSE:
@ -519,7 +519,7 @@ final class Setting {
case UINTEGER: case UINTEGER:
return to!string(_store.uinteger); return to!string(_store.uinteger);
case FLOAT: case FLOAT:
return to!string(_store.floating); return to!string(cast(double)_store.floating);
case TRUE: case TRUE:
return "true"; return "true";
case FALSE: case FALSE:

7
src/dlangui/graphics/ftfonts.d
View File

@ -771,7 +771,9 @@ bool registerFontConfigFonts(FreeTypeFontManager fontMan) {
} }
string fn = fromStringz(s).dup; string fn = fromStringz(s).dup;
string fn16 = toLower(fn); string fn16 = toLower(fn);
if (!fn16.endsWith(".ttf") && !fn16.endsWith(".odf") && !fn16.endsWith(".otf") && !fn16.endsWith(".pfb") && !fn16.endsWith(".pfa") ) { if (!fn16.endsWith(".ttf") && !fn16.endsWith(".odf") && !fn16.endsWith(".otf") &&
!fn16.endsWith(".ttc") && !fn16.endsWith(".pfb") && !fn16.endsWith(".pfa") )
{
continue; continue;
} }
int weight = FC_WEIGHT_MEDIUM; int weight = FC_WEIGHT_MEDIUM;
@ -912,9 +914,6 @@ bool registerFontConfigFonts(FreeTypeFontManager fontMan) {
} }
*/ */
facesFound++;
} }
FcFontSetDestroy(fontset); FcFontSetDestroy(fontset);