Przeglądaj źródła

【fix】【注释】目前Mac和Windows隐藏注释的逻辑不一致,是否需要调整?

tangchao 6 miesięcy temu
rodzic
commit
08e412f0d7

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

@@ -1359,10 +1359,22 @@ extension KMMainViewController {
             return true
         }
         
-        if menuItem.action == #selector(menuItemAnnotationClick_addStype) || menuItem.action == #selector(menuItemAnnotationClick_add) {
+        let act = menuItem.action
+        if act == #selector(menuItemAnnotationClick_addStype) ||
+            act == #selector(menuItemAnnotationClick_add) ||
+            act == #selector(menuItemAnnotationClick_toolModel) ||
+            act == #selector(changeAnnotationMode_itemAction) {
             return !(self.listView?.hideNotes ?? false)
         }
         
+        if let data = act, KMSystemMenu.isAnnotationSelector(sel: data) {
+            if KMSystemMenu.Annotation.hiddenAllSelector == act {
+//                return true
+            } else {
+                return !(self.listView?.hideNotes ?? false)
+            }
+        }
+        
         if (menuItem.action == #selector(menuItemAction_thumai) ||
             menuItem.action == #selector(menuItemAction_outline) ||
             menuItem.action == #selector(menuItemAction_bookmark) ||

+ 3 - 2
PDF Office/PDF Master/Class/SystemMenu/KMSystemAnnotationMenu.swift

@@ -68,6 +68,8 @@ extension KMSystemMenu.Annotation {
     public static let highlightSelector     = NSSelectorFromString("menuItemAction_highlight:")
     public static let underlineSelector     = NSSelectorFromString("menuItemAction_underline:")
     public static let strikeOutSelector     = NSSelectorFromString("menuItemAction_deleteLine:")
+    public static let wavyLineSelector     = NSSelectorFromString("menuItemAction_wavyLine:")
+    
     public static let freehandSelector      = NSSelectorFromString("menuItemAction_freehand:")
     public static let textSelector          = NSSelectorFromString("menuItemAction_text:")
     public static let noteSelector          = NSSelectorFromString("menuItemAction_note:")
@@ -99,8 +101,7 @@ extension KMSystemMenu.Annotation {
     public static let clearAllSelector      = NSSelectorFromString("menuItemAction_clearAllAnnotation:")
     
     public static func actions() -> [Selector] {
-        return [self.highlightSelector, self.underlineSelector, self.strikeOutSelector, self.freehandSelector,
-                self.textSelector, self.noteSelector, self.squreSelector, self.circleSelector,
+        return [self.highlightSelector, self.underlineSelector, self.strikeOutSelector, self.wavyLineSelector, self.freehandSelector, self.textSelector, self.noteSelector, self.squreSelector, self.circleSelector,
                 self.arrowSelector, self.lineSelector,
                 // link
                 self.linkSelector, self.linkPageSelector, self.linkHttpsSelector, self.linkEmailSelector, self.notesLinkSelector,