From b74ea57ae9f989264e351c52406a1027c330d4c2 Mon Sep 17 00:00:00 2001
From: nico <nico@72102866-910b-0410-8b05-ffd578937521>
Date: Tue, 26 Feb 2002 18:31:07 +0000
Subject: [PATCH] Fixed fontWithName:size: to work for 0.0 size

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12800 72102866-910b-0410-8b05-ffd578937521
---
 Source/NSFont.m | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Source/NSFont.m b/Source/NSFont.m
index 416560ec0..1a28c7dc0 100644
--- a/Source/NSFont.m
+++ b/Source/NSFont.m
@@ -360,6 +360,7 @@ setNSFont(NSString* key, NSFont* font)
 //
 + (float) labelFontSize
 {
+  /* FIXME - if the user has set a default, shouldn't this return that ? */ 
   return 12.0;
 }
 
@@ -384,7 +385,18 @@ setNSFont(NSString* key, NSFont* font)
 		    size: (float)fontSize
 {
   NSFont*font;
-  float fontMatrix[6] = { fontSize, 0, 0, fontSize, 0, 0 };
+  float fontMatrix[6] = { 0, 0, 0, 0, 0, 0 };
+
+  if (fontSize == 0)
+    {
+      fontSize = [defaults floatForKey: @"NSUserFontSize"];
+      if (fontSize == 0)
+	{
+	  fontSize = 12;
+	}
+    }
+  fontMatrix[0] = fontSize;
+  fontMatrix[3] = fontSize;
 
   font = [self fontWithName: name matrix: fontMatrix];
   font->matrixExplicitlySet = NO;