gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-01 10:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

(getNSFont): Set the explicit-size bit in the role correctly.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17631 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
alexm 2003-09-06 20:54:34 +00:00
parent 460936bb5a
commit 46458d68fc
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-09-06 22:53 Alexander Malmberg <alexander@malmberg.org>
* Source/NSFont.m (getNSFont): Set the explicit-size bit in the
role correctly.
2003-09-06 Gregory John Casamento <greg_casamento@yahoo.com> 2003-09-06 Gregory John Casamento <greg_casamento@yahoo.com>
* Images/common_Printer.tiff * Images/common_Printer.tiff

6
Source/NSFont.m
View file

@ -280,8 +280,6 @@ static NSFont *getNSFont(float fontSize, int role)
defaultSize = (fontSize == 0.0); defaultSize = (fontSize == 0.0);
if (defaultSize) if (defaultSize)
{ {
font_role |= 1;
if (font_roles[role].cachedFont) if (font_roles[role].cachedFont)
return AUTORELEASE(RETAIN(font_roles[role].cachedFont)); return AUTORELEASE(RETAIN(font_roles[role].cachedFont));
@ -291,6 +289,10 @@ static NSFont *getNSFont(float fontSize, int role)
if (!fontSize) if (!fontSize)
fontSize = [NSFont systemFontSize]; fontSize = [NSFont systemFontSize];
} }
else
{
font_role |= 1;
}
fontName = fontNameForRole(role, &i); fontName = fontNameForRole(role, &i);
font = [NSFontClass _fontWithName: fontName font = [NSFontClass _fontWithName: fontName