DMG】菜单栏，注释，点击图形注释无反应

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -484,5 +484,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "582C1953-1AB9-4F9E-9580-64406EB3B3E9"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowser.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "34"
+            endingLineNumber = "34"
+            landmarkName = "closeTabViewItem()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -159,6 +159,10 @@ class KMToolbarController: NSViewController {
         self.findChildItem(identifier)?.isSelected = false
     }
     
+    public func clickItem(_ identifier: String) {
+        self.selectItem(identifier)
+    }
+    
     public func selectItem(_ identifier: String) {
         if (isMainToolItem(identifier)) {
             self.selectMainItem(identifier)

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

@@ -373,37 +373,61 @@ extension KMMainViewController {
     
     @IBAction func menuItemAction_squre(_ sender: Any) {
         UserDefaults.standard.set(6, forKey: KMToolBarToolPDFShapeStyle)
-        self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
-        if self.listView.annotationType == .unkown {
-            UserDefaults.standard.set(6, forKey: KMToolBarToolPDFShapeStyle)
-            self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
+
+        if (self.listView.annotationType == .square) {
+            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+        } else {
+            if (self.listView.annotationType == .circle || self.listView.annotationType == .line || self.listView.annotationType == .arrow) {
+                self.listView.annotationType = .square
+                self.rightSideViewController.annotationProperties.annotationMode = .square
+            } else {
+                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+            }
         }
     }
 
     @IBAction func menuItemAction_circle(_ sender: Any) {
         UserDefaults.standard.set(7, forKey: KMToolBarToolPDFShapeStyle)
-        self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
-        if self.listView.annotationType == .unkown {
-            UserDefaults.standard.set(7, forKey: KMToolBarToolPDFShapeStyle)
-            self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
+
+        if (self.listView.annotationType == .circle) { // 取消
+            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+        } else {
+            if (self.listView.annotationType == .square || self.listView.annotationType == .line || self.listView.annotationType == .arrow) { // 切换
+                self.listView.annotationType = .circle
+                self.rightSideViewController.annotationProperties.annotationMode = .circle
+            } else { // 选中
+                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+            }
         }
     }
     
     @IBAction func menuItemAction_arrow(_ sender: Any) {
         UserDefaults.standard.set(5, forKey: KMToolBarToolPDFShapeStyle)
-        self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
-        if self.listView.annotationType == .unkown {
-            UserDefaults.standard.set(5, forKey: KMToolBarToolPDFShapeStyle)
-            self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
+
+        if (self.listView.annotationType == .arrow) { // 取消
+            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+        } else { // 选中
+            if (self.listView.annotationType == .square || self.listView.annotationType == .circle || self.listView.annotationType == .line) { // 切换
+                self.listView.annotationType = .arrow
+                self.rightSideViewController.annotationProperties.annotationMode = .arrow
+            } else {
+                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+            }
         }
     }
     
     @IBAction func menuItemAction_line(_ sender: Any) {
         UserDefaults.standard.set(4, forKey: KMToolBarToolPDFShapeStyle)
-        self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
-        if self.listView.annotationType == .unkown {
-            UserDefaults.standard.set(4, forKey: KMToolBarToolPDFShapeStyle)
-            self.mainMenuUpdateAnnotationStyle(identifier: KMToolbarSquareAnnotationItemIdentifier)
+
+        if (self.listView.annotationType == .line) { // 取消
+            self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+        } else { // 选中
+            if (self.listView.annotationType == .square || self.listView.annotationType == .circle || self.listView.annotationType == .arrow) { // 切换
+                self.listView.annotationType = .line
+                self.rightSideViewController.annotationProperties.annotationMode = .line
+            } else {
+                self.toolbarController.clickItem(KMToolbarSquareAnnotationItemIdentifier)
+            }
         }
     }