浏览代码

【综合】 注释 添加图片至页面,选中页面上的文字后右键图片,崩溃(已修复)

tangchao 11 月之前
父节点
当前提交
0ea454f1c3

+ 6 - 2
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m

@@ -736,9 +736,13 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
                 //                [menu insertItem:[NSMenuItem separatorItem] atIndex:0];
             }
             if ([[NSPasteboard generalPasteboard] canReadObjectForClasses:[NSArray arrayWithObjects:[CPDFAnnotation class], [NSString class],[NSImage class], nil] options:[NSDictionary dictionary]]) {
-                [menu insertItem:pasteItem atIndex:0];
+                if (![menu.itemArray containsObject:pasteItem]) {
+                    [menu insertItem:pasteItem atIndex:0];
+                }
+            }
+            if (![menu.itemArray containsObject:copyItem]) {
+                [menu insertItem:copyItem atIndex:0];
             }
-            [menu insertItem:copyItem atIndex:0];
         }else{
             if (self.toolMode != CMoveToolMode && self.toolMode != CMagnifyToolMode){
                 if ([[NSPasteboard generalPasteboard] canReadObjectForClasses:[NSArray arrayWithObjects:[CPDFAnnotation class], [NSString class],[NSImage class], nil] options:[NSDictionary dictionary]]) {

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -320,7 +320,7 @@ extension KMMainViewController {
         let stypItem = NSMenuItem(title: NSLocalizedString("Share", comment: ""), action: nil, target: self)
         var string = ""
         if listView.activeAnnotation != nil {
-            string = listView.activeAnnotation.contents
+            string = self.listView?.activeAnnotation?.contents ?? ""
         }
         string = listView.currentSelection.string()