Author: fredkiefer
Date: Fri Jul 24 16:15:22 2015
New Revision: 38837
URL: http://svn.gna.org/viewcvs/gnustep?rev=38837&view=rev
Log:
2015-07-24 Fred Kiefer <[email protected]>
* Source/NSFont.m: Look for xib font property IBIsSystemFont.
Patch by Paul Landers <[email protected]>.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/NSFont.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=38837&r1=38836&r2=38837&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Fri Jul 24 16:15:22 2015
@@ -1,3 +1,8 @@
+2015-07-24 Fred Kiefer <[email protected]>
+
+ * Source/NSFont.m: Look for xib font property IBIsSystemFont.
+ Patch by Paul Landers <[email protected]>.
+
2015-07-24 Fred Kiefer <[email protected]>
* Source/NSTextStorage.m: Fixed a bug with setting _editedRange for
Modified: libs/gui/trunk/Source/NSFont.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSFont.m?rev=38837&r1=38836&r2=38837&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSFont.m (original)
+++ libs/gui/trunk/Source/NSFont.m Fri Jul 24 16:15:22 2015
@@ -1351,7 +1351,14 @@
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
