Ecere Software
/
sdk
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ecere/gfx/fontManagement: Fixed non-fixed pitch listing
[sdk]
/
ecere
/
src
/
gfx
/
fontManagement.ec
diff --git
a/ecere/src/gfx/fontManagement.ec
b/ecere/src/gfx/fontManagement.ec
index
d811a60
..
2b3f714
100644
(file)
--- a/
ecere/src/gfx/fontManagement.ec
+++ b/
ecere/src/gfx/fontManagement.ec
@@
-458,24
+458,23
@@
public Map<String, FontInfo> ListAvailableFonts()
for(i = 0; i < fontSet->nfont; i++)
{
FcPattern * font = fontSet->fonts[i];
for(i = 0; i < fontSet->nfont; i++)
{
FcPattern * font = fontSet->fonts[i];
- String family;
- int spacing;
- FcCharSet * charSet;
+ String family = null;
+ int spacing = 0;
+ FcCharSet * charSet = null;
+
+ FcPatternGetString(font, FC_FAMILY, 0, (byte **)&family);
+ FcPatternGetInteger(font, FC_SPACING, 0, &spacing);
+ FcPatternGetCharSet(font, FC_CHARSET, 0, &charSet);
- if(FcPatternGetString(font, FC_FAMILY, 0, (byte **)&family) == FcResultMatch &&
- FcPatternGetInteger(font, FC_SPACING, 0, &spacing) == FcResultMatch &&
- FcPatternGetCharSet(font, FC_CHARSET, 0, &charSet) == FcResultMatch)
+ if(family && !it.Index(family, true))
{
{
- i
f(!it.Index(family, true))
+ i
t.data =
{
{
- it.data =
- {
- fixedPitch = spacing == FC_MONO,
- defaultOrAnsiCharSet =
- FcCharSetHasChar(charSet, '[') && FcCharSetHasChar(charSet, '{') &&
- FcCharSetHasChar(charSet, 'a') && FcCharSetHasChar(charSet, 'Z');
- };
- }
+ fixedPitch = spacing == FC_MONO,
+ defaultOrAnsiCharSet =
+ FcCharSetHasChar(charSet, '[') && FcCharSetHasChar(charSet, '{') &&
+ FcCharSetHasChar(charSet, 'a') && FcCharSetHasChar(charSet, 'Z');
+ };
}
}
}
}
}
}