Author: paullanders
Date: Tue Jul 14 23:27:06 2015
New Revision: 38796
URL: http://svn.gna.org/viewcvs/gnustep?rev=38796&view=rev
Log:
Look for xib font property IBIsSystemFont.
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSFont.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSFont.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSFont.m?rev=38796&r1=38795&r2=38796&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSFont.m (original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSFont.m Tue Jul 14
23:27:06 2015
@@ -1371,9 +1371,16 @@
{
NSString *name = [aDecoder decodeObjectForKey: @"NSName"];
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"])
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
