【综合】toolbar属性面板菜单补充

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

@@ -606,7 +606,8 @@ private let KMToolbarItemSpace = 8.0
         var count = allItems.count
         var idx = count-1
         for item in allItems.reversed() {
-            if (CGRectGetMaxX(item.frame) <= self.frame.size.width-moreButtonWidth-leftButtonWidth) {
+            let tempFrame = item.superview?.convert(item.frame, to: item.superview!.superview) ?? .zero
+            if (CGRectGetMaxX(tempFrame) <= self.frame.size.width) {
                 count = idx
                 break
             }
@@ -646,7 +647,7 @@ private let KMToolbarItemSpace = 8.0
         self._invisibleItems.removeAll()
         for item in  allItems.reversed() {
             let tempFrame = item.superview?.convert(item.frame, to: item.superview!.superview) ?? .zero
-            if (CGRectGetMaxX(tempFrame) <= self.frame.size.width-moreButtonWidth-leftButtonWidth+20+20) {
+            if (CGRectGetMaxX(tempFrame) <= self.frame.size.width) {
                 item.isHidden = false
             } else {
                 item.isHidden = true

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

@@ -1220,8 +1220,8 @@ extension KMToolbarViewController {
             item?.boxImagePosition = .imageAbove
             item?.selectBackgroundType = .imageBox
             item?.btnAction = #selector(_itemAction)
-            let menuItem = NSMenuItem.init(title: NSLocalizedString("Properties", comment: ""), action: #selector(_itemAction), target: self)
-            menuItem.tag = item!.btnTag
+            let menuItem = NSMenuItem.init(title: NSLocalizedString("Properties", comment: ""), action: #selector(_menuItemAction), target: self)
+            menuItem.representedObject = identifier
             item?.menuFormRepresentation = menuItem
         } else if identifier == KMToolbarToolRedactItemIdentifier {
             item?.image = NSImage(named: "KMImageNameMainToolsRedact")

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

@@ -4138,7 +4138,6 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 } else if itemID == KMDocumentScanOCRToolbarItemIdentifier {
                     showOCRWindow()
                 } else if itemID == KMDocumentDigitalSignToolbarItemIdentifier {
-                    Swift.debugPrint("KMDocumentDigitalSignToolbarItemIdentifier ...")
                     self.showDigitalSignWindow(withFilePathURL: self.listView.document.documentURL)
                 }
             } else {
@@ -4253,6 +4252,9 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
             self.clickChildTool(type: .secure, index: index)
         } else if toolbarItem.itemIdentifier == KMDocumentSearchToolbarItemIdentifier {
             KMPrint("KMDocumentSearchToolbarItemIdentifier ...")
+        } else if toolbarItem.itemIdentifier == KMRightControlToolbarItemIdentifier {
+            toolbarItem.isSelected = !toolbarItem.isSelected
+            self.toggleRightPane()
         }
     }
     

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -78,8 +78,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Toolbar/KMToolbarView.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "689"
-            endingLineNumber = "689"
+            startingLineNumber = "690"
+            endingLineNumber = "690"
             landmarkName = "toolbarCustomChangeNotification()"
             landmarkType = "7">
          </BreakpointContent>