[Skim-app-commit] SF.net SVN: skim-app:[15812] trunk/SKFontWell.m

[hofman--- via Skim-app-commit]

Revision: 15812
          http://sourceforge.net/p/skim-app/code/15812
Author:   hofman
Date:     2025-11-18 15:33:56 +0000 (Tue, 18 Nov 2025)
Log Message:
-----------
put only relvant method in try block

Modified Paths:
--------------
    trunk/SKFontWell.m

Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m  2025-11-18 15:20:33 UTC (rev 15811)
+++ trunk/SKFontWell.m  2025-11-18 15:33:56 UTC (rev 15812)
@@ -332,10 +332,16 @@
     NSFont *droppedFont = nil;
     NSColor *droppedColor = nil;
     
-    @try {
-        if ([type isEqualToString:SKNSFontPanelDescriptorsPboardType]) {
-            NSData *data = [pboard dataForType:type];
-            NSDictionary *dict = [data isKindOfClass:[NSData class]] ? 
[NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet 
setWithObjects:[NSDictionary class], [NSString class], [NSNumber class], 
[NSArray class], [NSFontDescriptor class], nil] fromData:data error:NULL] : nil;
+    if ([type isEqualToString:SKNSFontPanelDescriptorsPboardType]) {
+        NSData *data = [pboard dataForType:type];
+        if ([data isKindOfClass:[NSData class]]) {
+            NSDictionary *dict = nil;
+            @try {
+                dict = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet 
setWithObjects:[NSDictionary class], [NSString class], [NSNumber class], 
[NSArray class], [NSFontDescriptor class], nil] fromData:data error:NULL];
+            }
+            @catch (id exception) {
+                NSLog(@"Ignoring exception %@ when dropping on SKFontWell 
failed", exception);
+            }
             if ([dict isKindOfClass:[NSDictionary class]]) {
                 NSArray *fontDescriptors = [dict 
objectForKey:SKNSFontCollectionFontDescriptors];
                 NSFontDescriptor *fontDescriptor = [fontDescriptors 
isKindOfClass:[NSArray class]] ? [fontDescriptors firstObject] : nil;
@@ -345,19 +351,16 @@
                     droppedFont = [NSFont fontWithDescriptor:fontDescriptor 
size:fontSize];
                 }
             }
-        } else if ([type isEqualToString:SKNSFontPanelFamiliesPboardType]) {
-            NSArray *families = [pboard propertyListForType:type];
-            NSString *family = ([families isKindOfClass:[NSArray class]] && 
[families count]) ? [families objectAtIndex:0] : nil;
-            if ([family isKindOfClass:[NSString class]])
-                droppedFont = [[NSFontManager sharedFontManager] 
convertFont:[self font] toFamily:family];
-        } else if ([type isEqualToString:NSPasteboardTypeColor]) {
-            droppedColor = [NSColor colorFromPasteboard:pboard];
         }
+    } else if ([type isEqualToString:SKNSFontPanelFamiliesPboardType]) {
+        NSArray *families = [pboard propertyListForType:type];
+        NSString *family = ([families isKindOfClass:[NSArray class]] && 
[families count]) ? [families objectAtIndex:0] : nil;
+        if ([family isKindOfClass:[NSString class]])
+            droppedFont = [[NSFontManager sharedFontManager] convertFont:[self 
font] toFamily:family];
+    } else if ([type isEqualToString:NSPasteboardTypeColor]) {
+        droppedColor = [NSColor colorFromPasteboard:pboard];
     }
-    @catch (id exception) {
-        NSLog(@"Ignoring exception %@ when dropping on SKFontWell failed", 
exception);
-    }
-    
+
     if (droppedFont) {
         [self setFont:droppedFont];
         [self propagateValue:[droppedFont fontName] 
forBinding:NSFontNameBinding];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit