Sfoglia il codice sorgente

【综合】系统菜单栏缩放菜单补充入口

tangchao 1 anno fa
parent
commit
40c46ffe17

+ 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 = "1094"
-            endingLineNumber = "1094"
+            startingLineNumber = "1106"
+            endingLineNumber = "1106"
             landmarkName = "rotateAllRight(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -334,8 +334,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2280"
-            endingLineNumber = "2280"
+            startingLineNumber = "2288"
+            endingLineNumber = "2288"
             landmarkName = "autoSelectContent(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -350,8 +350,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2009"
-            endingLineNumber = "2009"
+            startingLineNumber = "2017"
+            endingLineNumber = "2017"
             landmarkName = "editWatermark(_:)"
             landmarkType = "7">
          </BreakpointContent>

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

@@ -739,19 +739,10 @@ extension KMBrowserWindowController {
     @IBAction func doGoForward(_ sender: Any?) {
         KMPrint("doGoForward ...")
     }
-    @IBAction func doZoomIn(_ sender: Any?) {
-        KMPrint("doZoomIn ...")
-    }
-    @IBAction func doZoomOut(_ sender: Any?) {
-        KMPrint("doZoomOut ...")
-    }
 
     @IBAction func doZoomToPhysicalSize(_ sender: Any?) {
         KMPrint("doZoomToPhysicalSize ...")
     }
-    @IBAction func doZoomToFit(_ sender: Any?) {
-        KMPrint("doZoomToFit ...")
-    }
     @IBAction func alternateZoomToFit(_ sender: Any?) {
         KMPrint("alternateZoomToFit ...")
     }
@@ -1599,6 +1590,23 @@ extension KMBrowserWindowController: KMSystemPDFMenuProtocol {
             document.mainViewController?.doZoomToFit(sender)
         }
     }
+    
+    @IBAction func doZoomIn(_ sender: Any?) {
+        if (self.canResponseDocumentAction() == false) {
+            return
+        }
+        if let document = self.browser.activeTabContents() as? KMMainDocument, document.isHome == false {
+            document.mainViewController?.doZoomIn(sender)
+        }
+    }
+    @IBAction func doZoomOut(_ sender: Any?) {
+        if (self.canResponseDocumentAction() == false) {
+            return
+        }
+        if let document = self.browser.activeTabContents() as? KMMainDocument, document.isHome == false {
+            document.mainViewController?.doZoomOut(sender)
+        }
+    }
 }
 
 // MARK: - KMSystemGotoMenuProtocol

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

@@ -615,6 +615,18 @@ extension KMMainViewController: KMSystemPDFMenuProtocol {
     func doZoomToFit(_ sender: Any?) {
         self.selectZoom(.fit)
     }
+    
+    func doZoomIn(_ sender: Any?) {
+        if (self.listView.canZoomIn) {
+            self.listView.zoomIn(nil)
+        }
+    }
+    
+    func doZoomOut(_ sender: Any?) {
+        if (self.listView.canZoomOut) {
+            self.listView.zoomOut(nil)
+        }
+    }
 }
 
 // MARK: goto Menu

+ 6 - 1
PDF Office/PDF Master/Class/SystemMenu/KMSystemPDFMenu.swift

@@ -17,6 +17,9 @@ import Cocoa
     @objc optional func toggleAutoScale(_ sender: Any?)
     @objc optional func doZoomToActualSize(_ sender: Any?)
     @objc optional func doZoomToFit(_ sender: Any?)
+    @objc optional func doZoomIn(_ sender: Any?)
+    @objc optional func doZoomOut(_ sender: Any?)
+
 }
 
 extension KMSystemMenu.PDF {
@@ -29,9 +32,11 @@ extension KMSystemMenu.PDF {
     public static let toggleAutoScaleSelector    = NSSelectorFromString("toggleAutoScale:")
     public static let doZoomToActualSizeSelector    = NSSelectorFromString("doZoomToActualSize:")
     public static let doZoomToFitSelector    = NSSelectorFromString("doZoomToFit:")
+    public static let doZoomInSelector    = NSSelectorFromString("doZoomIn:")
+    public static let doZoomOutSelector    = NSSelectorFromString("doZoomOut:")
     
     public static func actions() -> [Selector] {
         return [self.changeDisplayModeSelector, self.toggleDisplayAsBookSelector, self.toggleDisplayPageBreaksSelector, self.changeDisplayBoxSelector,
-                self.toggleAutoScaleSelector, self.doZoomToActualSizeSelector, self.doZoomToFitSelector]
+                self.toggleAutoScaleSelector, self.doZoomToActualSizeSelector, self.doZoomToFitSelector, self.doZoomInSelector, self.doZoomOutSelector]
     }
 }