Revision: 14598
          http://sourceforge.net/p/skim-app/code/14598
Author:   hofman
Date:     2024-10-28 15:49:21 +0000 (Mon, 28 Oct 2024)
Log Message:
-----------
use imageTypes instead of public.image

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

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2024-10-28 09:54:58 UTC (rev 14597)
+++ trunk/SKPDFView.m   2024-10-28 15:49:21 UTC (rev 14598)
@@ -2153,7 +2153,7 @@
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender {
     NSDragOperation dragOp = NSDragOperationNone;
     NSPasteboard *pboard = [sender draggingPasteboard];
-    if ([self hideNotes] == NO && ([pboard 
canReadItemWithDataConformingToTypes:@[NSPasteboardTypeColor, 
SKPasteboardTypeLineStyle]] || [pboard canReadObjectForClasses:@[[NSURL class]] 
options:@{NSPasteboardURLReadingFileURLsOnlyKey:@YES, 
NSPasteboardURLReadingContentsConformToTypesKey:@[(__bridge NSString 
*)kUTTypeImage]}])) {
+    if ([self hideNotes] == NO && ([pboard 
canReadItemWithDataConformingToTypes:@[NSPasteboardTypeColor, 
SKPasteboardTypeLineStyle]] || [pboard canReadObjectForClasses:@[[NSURL class]] 
options:@{NSPasteboardURLReadingFileURLsOnlyKey:@YES, 
NSPasteboardURLReadingContentsConformToTypesKey:[NSImage imageTypes]}])) {
         return [self draggingUpdated:sender];
     } else if ([[SKPDFView superclass] instancesRespondToSelector:_cmd]) {
         dragOp = [super draggingEntered:sender];
@@ -2184,7 +2184,7 @@
         }
         if (dragOp == NSDragOperationNone)
             [self setHighlightAnnotation:nil];
-    } else if ([self hideNotes] == NO && [pboard 
canReadObjectForClasses:@[[NSURL class]] 
options:@{NSPasteboardURLReadingFileURLsOnlyKey:@YES, 
NSPasteboardURLReadingContentsConformToTypesKey:@[(__bridge NSString 
*)kUTTypeImage]}]) {
+    } else if ([self hideNotes] == NO && [pboard 
canReadObjectForClasses:@[[NSURL class]] 
options:@{NSPasteboardURLReadingFileURLsOnlyKey:@YES, 
NSPasteboardURLReadingContentsConformToTypesKey:[NSImage imageTypes]}]) {
         NSPoint location = [self convertPoint:[sender draggingLocation] 
fromView:nil];
         if ([self pageForPoint:location nearest:NO])
             dragOp = NSDragOperationGeneric;
@@ -2196,7 +2196,7 @@
 
 - (void)draggingExited:(id <NSDraggingInfo>)sender {
     NSPasteboard *pboard = [sender draggingPasteboard];
-    if ([self hideNotes] == NO && ([pboard 
canReadItemWithDataConformingToTypes:@[NSPasteboardTypeColor, 
SKPasteboardTypeLineStyle]] || [pboard canReadObjectForClasses:@[[NSURL class]] 
options:@{NSPasteboardURLReadingFileURLsOnlyKey:@YES, 
NSPasteboardURLReadingContentsConformToTypesKey:@[(__bridge NSString 
*)kUTTypeImage]}])) {
+    if ([self hideNotes] == NO && ([pboard 
canReadItemWithDataConformingToTypes:@[NSPasteboardTypeColor, 
SKPasteboardTypeLineStyle]] || [pboard canReadObjectForClasses:@[[NSURL class]] 
options:@{NSPasteboardURLReadingFileURLsOnlyKey:@YES, 
NSPasteboardURLReadingContentsConformToTypesKey:[NSImage imageTypes]}])) {
         [self setHighlightAnnotation:nil];
     } else if ([[SKPDFView superclass] instancesRespondToSelector:_cmd]) {
         [super draggingExited:sender];
@@ -2232,12 +2232,12 @@
             }
             [self setHighlightAnnotation:nil];
         }
-    } else if ([self hideNotes] == NO && [pboard 
canReadObjectForClasses:@[[NSURL class]] 
options:@{NSPasteboardURLReadingFileURLsOnlyKey:@YES, 
NSPasteboardURLReadingContentsConformToTypesKey:@[(__bridge NSString 
*)kUTTypeImage]}]) {
+    } else if ([self hideNotes] == NO && [pboard 
canReadObjectForClasses:@[[NSURL class]] 
options:@{NSPasteboardURLReadingFileURLsOnlyKey:@YES, 
NSPasteboardURLReadingContentsConformToTypesKey:[NSImage imageTypes]}]) {
         NSPoint location = [self convertPoint:[sender draggingLocation] 
fromView:nil];
         PDFPage *page = [self pageForPoint:location nearest:NO];
         if (page) {
             location = [self convertPoint:location toPage:page];
-            NSURL *fileURL =  [[pboard readObjectsForClasses:@[[NSURL class]] 
options:@{NSPasteboardURLReadingFileURLsOnlyKey:@YES, 
NSPasteboardURLReadingContentsConformToTypesKey:@[(__bridge NSString 
*)kUTTypeImage]}] firstObject];
+            NSURL *fileURL =  [[pboard readObjectsForClasses:@[[NSURL class]] 
options:@{NSPasteboardURLReadingFileURLsOnlyKey:@YES, 
NSPasteboardURLReadingContentsConformToTypesKey:[NSImage imageTypes]}] 
firstObject];
             NSImage *image = fileURL ? [[NSImage alloc] 
initWithContentsOfURL:fileURL] : nil;
             if (image) {
                 NSRect bounds = SKRectFromCenterAndSize(location, [image 
size]);

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



_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to