Revision: 3879
http://skim-app.svn.sourceforge.net/skim-app/?rev=3879&view=rev
Author: hofman
Date: 2008-05-14 10:54:19 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Check for non-nil font name before creating font.
Modified Paths:
--------------
trunk/SKNoteWindowController.m
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2008-05-14 17:37:29 UTC (rev 3878)
+++ trunk/SKNoteWindowController.m 2008-05-14 17:54:19 UTC (rev 3879)
@@ -131,8 +131,9 @@
[[self window] setHidesOnDeactivate:keepOnTop || forceOnTop];
if ([self isNoteType] && [[textView string] length] == 0) {
- NSFont *font = [NSFont fontWithName:[[NSUserDefaults
standardUserDefaults] stringForKey:SKAnchoredNoteFontNameKey]
- size:[[NSUserDefaults
standardUserDefaults] floatForKey:SKAnchoredNoteFontSizeKey]];
+ NSString *fontName = [[NSUserDefaults standardUserDefaults]
stringForKey:SKAnchoredNoteFontNameKey];
+ float fontSize = [[NSUserDefaults standardUserDefaults]
floatForKey:SKAnchoredNoteFontSizeKey];
+ NSFont *font = fontName ? [NSFont fontWithName:fontName size:fontSize]
: nil;
if (font)
[textView setFont:font];
}
@@ -297,8 +298,9 @@
return;
NSString *key = [keyPath substringFromIndex:7];
if (([key isEqualToString:SKAnchoredNoteFontNameKey] || [key
isEqualToString:SKAnchoredNoteFontSizeKey]) && [self isNoteType] && [[textView
string] length] == 0) {
- NSFont *font = [NSFont fontWithName:[[NSUserDefaults
standardUserDefaults] stringForKey:SKAnchoredNoteFontNameKey]
- size:[[NSUserDefaults
standardUserDefaults] floatForKey:SKAnchoredNoteFontSizeKey]];
+ NSString *fontName = [[NSUserDefaults standardUserDefaults]
stringForKey:SKAnchoredNoteFontNameKey];
+ float fontSize = [[NSUserDefaults standardUserDefaults]
floatForKey:SKAnchoredNoteFontSizeKey];
+ NSFont *font = fontName ? [NSFont fontWithName:fontName
size:fontSize] : nil;
if (font)
[textView setFont:font];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
