【综合】转档工具 一级工具，点击扩展按钮无反应(已修复)

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -923,8 +923,6 @@ extension KMBrowserWindowController {
         KMPrint("toggleCaseInsensitiveNoteSearch ...")
     }
     @IBAction func performFindPanelAction(_ sender: NSMenuItem) {
-        KMPrint("performFindPanelAction ...")
-        
         var forward = true
         var findString: String?
 

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

@@ -59,8 +59,8 @@ private let KMToolbarItemSpace = 8.0
         _moreButton.isHidden = true
         _moreButton.target = self
         _moreButton.action = #selector(_moreButtonAction)
-//        _moreButton.wantsLayer = true
-//        _moreButton.layer?.backgroundColor = NSColor(red: 223.0/255.0, green: 225.0/255.0, blue: 229.0/255.0, alpha: 1).cgColor
+        _moreButton.wantsLayer = true
+        _moreButton.layer?.backgroundColor = NSColor(red: 223.0/255.0, green: 225.0/255.0, blue: 229.0/255.0, alpha: 1).cgColor
         return _moreButton
     }()
     
@@ -692,7 +692,7 @@ private let KMToolbarItemSpace = 8.0
         if (self._contentView == nil) {
             return
         }
-        let moreButtonWidth = 30.0
+        let moreButtonWidth = 18.0
 //        let leftButtonWidth = 10.0
         
 //        let leftW = NSWidth(self.leftView.frame)

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

@@ -8,9 +8,9 @@
 import Foundation
 
 extension KMMainViewController {
-    func search(searchString: String, isCase: Bool) {
+    func search(searchString: String, isCase: Bool, display: Bool = true) {
         let document = self.listView.document
-        if ((document?.isFinding) != nil) {
+        if let data = document?.isFinding, data {
             document?.cancelFindString()
         }
         if searchString == "" {
@@ -53,14 +53,19 @@ extension KMMainViewController {
             }
             
             self.listView.setHighlightedSelections(_selections)
+            if _selections.isEmpty {
+                self.listView.setHighlightedSelection(nil, animated: false)
+            }
             self.listView.setNeedsDisplayAnnotationViewForVisiblePages()
             self.leftSideViewController.searchResults = self.searchResults
         }
         
-        if self.leftSideViewController.findPaneState == .singular {
-            self.leftSideViewController.displayFindViewAnimating(true)
-        } else {
-            self.leftSideViewController.displayGroupedFindViewAnimating(true)
+        if display {
+            if self.leftSideViewController.findPaneState == .singular {
+                self.leftSideViewController.displayFindViewAnimating(true)
+            } else {
+                self.leftSideViewController.displayGroupedFindViewAnimating(true)
+            }
         }
     }
     
@@ -4748,7 +4753,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
             self.clickChildTool(type: .secure, index: index)
             FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_Editor", withProperties: ["SubTbr_Btn": "Btn_SubTbr_Editor_Security"])
         } else if toolbarItem.itemIdentifier == KMDocumentSearchToolbarItemIdentifier {
-            KMPrint("KMDocumentSearchToolbarItemIdentifier ...")
+            self.toolbarController.showFindBar()
         } else if toolbarItem.itemIdentifier == KMRightControlToolbarItemIdentifier {
             toolbarItem.isSelected = !toolbarItem.isSelected
             self.toggleRightPane()
@@ -4766,6 +4771,8 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
             } else if index == 4 { 
                 self.loadAIConfigWindowWithType(.translate)
             }
+        } else if toolbarItem.itemIdentifier == KMDocumentScanOCRToolbarItemIdentifier {
+            self.showOCRWindow()
         }
     }
     
@@ -4794,7 +4801,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     
     func toolbarViewController(_ viewController: KMToolbarViewController, searchAction searchString: String, forward: Bool) {
         if self.searchResults.count == 0 {
-            self.search(searchString: searchString, isCase: true)
+            self.search(searchString: searchString, isCase: true, display: false)
         }
         
         var row = max(searchIndex - 1, 0)

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

@@ -596,5 +596,85 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6D675012-EFBB-41A9-B66D-332EBFAF7DFD"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "147"
+            endingLineNumber = "147"
+            landmarkName = "menuItemAction_find(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "969AAF58-7A7E-481B-82C8-928B3C7DEE5C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "43"
+            endingLineNumber = "43"
+            landmarkName = "-mouseDown:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "48E2A217-3384-41B8-938E-375090F01F48"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3582"
+            endingLineNumber = "3582"
+            landmarkName = "-doDragAnnotationWithEvent:forAnnotation:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "469F7857-5F45-428A-BA77-51FAECA2C0EF"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3637"
+            endingLineNumber = "3637"
+            landmarkName = "-doDragAnnotationWithEvent:forAnnotation:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "0C403282-AF77-4D9E-97A9-B82FFE6CE8B4"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3640"
+            endingLineNumber = "3640"
+            landmarkName = "-doDragAnnotationWithEvent:forAnnotation:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>