gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 05:32:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

2015-07-24 Fred Kiefer <FredKiefer@gmx.de>

Browse source 
* Source/NSFont.m: Look for xib font property IBIsSystemFont.
        Patch by Paul Landers <paul.landers@testplant.com>.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38837 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2015-07-24 14:15:22 +00:00
parent e67303d25d
commit 19fe8aeda4
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-07-24 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSFont.m: Look for xib font property IBIsSystemFont.
Patch by Paul Landers <paul.landers@testplant.com>.
2015-07-24 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTextStorage.m: Fixed a bug with setting _editedRange for

9
Source/NSFont.m
View file

@ -1351,7 +1351,14 @@ static BOOL flip_hack;
float size = [aDecoder decodeFloatForKey: @"NSSize"];
DESTROY(self);
self = RETAIN([NSFont fontWithName: name size: size]);
if ([aDecoder containsValueForKey: @"IBIsSystemFont"])
{
self = RETAIN([NSFont systemFontOfSize: size]);
}
else
{
self = RETAIN([NSFont fontWithName: name size: size]);
}
if (self == nil)
{
if ([aDecoder containsValueForKey: @"NSfFlags"])