【标记密文】右键菜单功能调式

PDF Office/PDF Master/Class/PDFTools/Redact/View/KMRedactPDFView.swift

@@ -99,9 +99,9 @@ private let KMPDFViewRedactAnnotationAcross = "KMPDFViewRedactAnnotationAcross"
     
     override func menu(for event: NSEvent) -> NSMenu? {
         var menu = super.menu(for: event)
-        if (menu == nil) {
+//        if (menu == nil) {
             menu = NSMenu()
-        }
+//        }
         var pagePoint = NSZeroPoint
 //        CPDFPage *page = [self pageAndPoint:&pagePoint forEvent:event nearest:YES];
         let page = self.pageAndPoint(&pagePoint, for: event, nearest: true)

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift

@@ -260,6 +260,8 @@ class KMToolbarController: NSViewController {
                 self.mainToolBarView?.itemAction(item!)
             } else if (identifier == KMLeftControlToolbarItemIdentifier) {
                 self.mainToolBarView?.itemAction(item!)
+            } else if identifier == KMDocumentRedactToolbarItemIdentifier {
+                self.mainToolBarView?.itemAction(item!)
             }
             
             return

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -572,8 +572,7 @@ import Cocoa
             self?.view.window?.title = title
         }
         controller.callback = { [weak self] result, currentPageIndex, saveResult, saveUrl in
-//            [weak_self.toolbarController redactModeButtonAction:nil];
-            if result == false {
+            if result == false { // 退出
                 self?.exitRedact()
                 return
             }
@@ -602,6 +601,12 @@ import Cocoa
                 return
             }
         }
+        NSColorPanel.shared.showsAlpha = true
+        self.toolbarController.findItem(KMDocumentRedactToolbarItemIdentifier)?.isSelected = false
+        self.toolbarController.toolbarType = .Annatiton
+        self.listView.toolMode = .moveToolMode
+        controller?.redactPdfView.resignMonitor()
+        
         controller?.view.removeFromSuperview()
         controller?.removeFromParent()