1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-18 23:45:47 +01:00

_ fixed bug in resizing a scrollview

- read both XLFDs and XFT style font names from config files (xft case only)
This commit is contained in:
dan
2003-06-12 21:21:57 +00:00
parent 64468fcf63
commit a4c986fa1b
3 changed files with 18 additions and 6 deletions

View File

@@ -320,7 +320,12 @@ WMCreateAntialiasedFont(WMScreen *scrPtr, char *fontName)
* use a default medium weight and a default roman slant if they
* are invalid.
*/
font->font.xft = XftFontOpenXlfd(display, scrPtr->screen, fname);
printf("%s\n", fname);
if (fname[0] == '-') {
font->font.xft = XftFontOpenXlfd(display, scrPtr->screen, fname);
} else {
font->font.xft = XftFontOpenName(display, scrPtr->screen, fname);
}
if (!font->font.xft) {
wfree(font);
wfree(fname);
@@ -394,7 +399,11 @@ WMCreateAntialiasedFontSet(WMScreen *scrPtr, char *fontName)
* use a default medium weight and a default roman slant if they
* are invalid.
*/
font->font.xft = XftFontOpenXlfd(display, scrPtr->screen, fname);
if (fname[0] == '-') {
font->font.xft = XftFontOpenXlfd(display, scrPtr->screen, fname);
} else {
font->font.xft = XftFontOpenName(display, scrPtr->screen, fname);
}
if (!font->font.xft) {
wfree(font);
wfree(fname);