Kaynağa Gözat

【综合】系统菜单栏选择区域缩放菜单入口补充

tangchao 1 yıl önce
ebeveyn
işleme
c66b5ec545

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

@@ -318,8 +318,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1106"
-            endingLineNumber = "1106"
+            startingLineNumber = "1113"
+            endingLineNumber = "1113"
             landmarkName = "rotateAllRight(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -334,8 +334,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2288"
-            endingLineNumber = "2288"
+            startingLineNumber = "2294"
+            endingLineNumber = "2294"
             landmarkName = "autoSelectContent(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -350,8 +350,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2017"
-            endingLineNumber = "2017"
+            startingLineNumber = "2023"
+            endingLineNumber = "2023"
             landmarkName = "editWatermark(_:)"
             landmarkType = "7">
          </BreakpointContent>

+ 9 - 3
PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -749,9 +749,6 @@ extension KMBrowserWindowController {
     @IBAction func doZoomToSelection(_ sender: Any?) {
         KMPrint("doZoomToSelection ...")
     }
-    @IBAction func doMarqueeZoomTool(_ sender: Any?) {
-        KMPrint("doMarqueeZoomTool ...")
-    }
     @IBAction func doAutoScale(_ sender: Any?) {
         KMPrint("doAutoScale ...")
     }
@@ -1607,6 +1604,15 @@ extension KMBrowserWindowController: KMSystemPDFMenuProtocol {
             document.mainViewController?.doZoomOut(sender)
         }
     }
+    
+    @IBAction func doMarqueeZoomTool(_ sender: Any?) {
+        if (self.canResponseDocumentAction() == false) {
+            return
+        }
+        if let document = self.browser.activeTabContents() as? KMMainDocument, document.isHome == false {
+            document.mainViewController?.doMarqueeZoomTool(sender)
+        }
+    }
 }
 
 // MARK: - KMSystemGotoMenuProtocol

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

@@ -627,6 +627,13 @@ extension KMMainViewController: KMSystemPDFMenuProtocol {
             self.listView.zoomOut(nil)
         }
     }
+    
+    func doMarqueeZoomTool(_ sender: Any?) {
+        let isSelected = self.toolbarController.findItem(KMToolbarZoomToSelectionItemIdentifier)?.isSelected ?? false
+        if isSelected == false {
+            self.toolbarController.clickItem(KMToolbarZoomToSelectionItemIdentifier)
+        }
+    }
 }
 
 // MARK: goto Menu

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

@@ -19,7 +19,7 @@ import Cocoa
     @objc optional func doZoomToFit(_ sender: Any?)
     @objc optional func doZoomIn(_ sender: Any?)
     @objc optional func doZoomOut(_ sender: Any?)
-
+    @objc optional func doMarqueeZoomTool(_ sender: Any?)
 }
 
 extension KMSystemMenu.PDF {
@@ -34,9 +34,10 @@ extension KMSystemMenu.PDF {
     public static let doZoomToFitSelector    = NSSelectorFromString("doZoomToFit:")
     public static let doZoomInSelector    = NSSelectorFromString("doZoomIn:")
     public static let doZoomOutSelector    = NSSelectorFromString("doZoomOut:")
+    public static let doMarqueeZoomToolSelector    = NSSelectorFromString("doMarqueeZoomTool:")
     
     public static func actions() -> [Selector] {
         return [self.changeDisplayModeSelector, self.toggleDisplayAsBookSelector, self.toggleDisplayPageBreaksSelector, self.changeDisplayBoxSelector,
-                self.toggleAutoScaleSelector, self.doZoomToActualSizeSelector, self.doZoomToFitSelector, self.doZoomInSelector, self.doZoomOutSelector]
+                self.toggleAutoScaleSelector, self.doZoomToActualSizeSelector, self.doZoomToFitSelector, self.doZoomInSelector, self.doZoomOutSelector, self.doMarqueeZoomToolSelector]
     }
 }