Browse Source

【综合】页面显示 切换页面显示工具后,没有退出标记密文模式(已修复)

tangchao 1 year ago
parent
commit
fe80cf9e7a

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

@@ -4190,6 +4190,17 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     }
     
     func toolbarViewController(_ viewController: KMToolbarViewController, itemDidClick toolbarItem: KMToolbarItemView) {
+        if(toolbarItem.itemIdentifier != KMDocumentPageToolbarItemIdentifier) {
+            if (hasEnterPageEdit()) {
+                self.exitPageEdit()
+            }
+        }
+        if toolbarItem.itemIdentifier != KMDocumentRedactToolbarItemIdentifier {
+            if self.hasEnterRedact() {
+                self.exitRedact()
+            }
+        }
+        
         if let itemID = toolbarItem.itemIdentifier {
             if isMainToolItem(itemID) {
                 if toolbarItem.itemIdentifier == KMDocumentHomeToolbarItemIdentifier {

+ 1 - 17
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -116,22 +116,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "84D27735-6B5D-4AE2-B45A-0CE01A75C559"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "900"
-            endingLineNumber = "900"
-            landmarkName = "-doDragWithEvent:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -144,7 +128,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "3157"
             endingLineNumber = "3157"
-            landmarkName = "-doDragAnnotationWithEvent:forAnnotation:"
+            landmarkName = "-doDragMultipleAnnotationWithEvent:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>