Add fallback for missing standard fonts (LucidaGrande).

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26054 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2008-02-11 23:12:37 +00:00
parent 3ac0da9c43
commit 785ae61495
2 changed files with 11 additions and 4 deletions

View file

@ -1,3 +1,8 @@
2008-02-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSFont.m (-initWithName:matrix:fix:screenFont:role:): Add
fallback for more missing standard fonts (LucidaGrande).
2008-02-11 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSView.m (-_viewWillMoveToWindow:,

View file

@ -809,16 +809,18 @@ static void setNSFont(NSString *key, NSFont *font)
and this font does not exist, try to replace it with the
corresponding font in the current setup.
*/
if ([fontName isEqualToString: @"Helvetica"] &&
![font_roles[RoleSystemFont].defaultFont isEqualToString: @"Helvetica"])
if (([fontName isEqualToString: @"Helvetica"] &&
![font_roles[RoleSystemFont].defaultFont isEqualToString: @"Helvetica"])
|| ([fontName isEqualToString: @"LucidaGrande"]))
{
fontInfo = RETAIN([GSFontInfo fontInfoForFontName:
font_roles[RoleSystemFont].defaultFont
matrix: fontMatrix
screenFont: screen]);
}
else if ([fontName isEqualToString: @"Helvetica-Bold"] &&
![font_roles[RoleBoldSystemFont].defaultFont isEqualToString: @"Helvetica-Bold"])
else if (([fontName isEqualToString: @"Helvetica-Bold"] &&
![font_roles[RoleBoldSystemFont].defaultFont isEqualToString: @"Helvetica-Bold"])
|| ([fontName isEqualToString: @"LucidaGrande-Bold"]))
{
fontInfo = RETAIN([GSFontInfo fontInfoForFontName:
font_roles[RoleBoldSystemFont].defaultFont