Browse Source

【综合】裁剪偶发crash修复

tangchao 11 months ago
parent
commit
429a119560

+ 3 - 6
PDF Office/PDF Master/Class/PDFTools/Crop/KMPDFCropWindowController.swift

@@ -121,6 +121,7 @@ class KMPDFCropWindowController: NSWindowController, CPDFViewDelegate, NSWindowD
         super.windowDidLoad()
         self.cropRect = self.defaultCropRect
         fileAttribute = KMFileAttribute()
+        fileAttribute.filePath = self.originalDocument?.documentURL.path ?? ""
         self.pdfView.wantsLayer = true
         self.pdfView.layer?.borderColor = NSColor.black.cgColor
         self.pdfView.layer?.borderWidth = 2
@@ -267,15 +268,10 @@ class KMPDFCropWindowController: NSWindowController, CPDFViewDelegate, NSWindowD
                 }
             }
         } else {
-//            let fileAttribute = KMFileAttribute()
-            fileAttribute.filePath = self.originalDocument?.documentURL.path ?? ""
             fileAttribute.bAllPage = false
+            fileAttribute.pagesType = .custom
             fileAttribute.pagesString = self.pageRangeComboBox.stringValue
             
-//            if !fileAttribute.selectPages {
-//                
-//            }
-            
             for num in fileAttribute.fetchSelectPages() {
                 pages.add(num - 1)
             }
@@ -987,6 +983,7 @@ class KMPDFCropWindowController: NSWindowController, CPDFViewDelegate, NSWindowD
             self.previewDocument?.insertPageObject(page, at: self.previewDocument?.pageCount ?? 0)
         }
         self.pdfView.document = self.previewDocument
+        self.pdfView.layoutDocumentView()
         self.pdfView.needsDisplay = true
         let tPage = self.previewDocument?.page(at: 0)!
         self.pdfView.go(to: tPage)

+ 20 - 4
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -231,16 +231,32 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "60F95251-F810-4916-A7A5-88F9C77DBC27"
+            uuid = "2F51C06E-D7F5-4C1B-9CD1-DF3B0E4EEFAA"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "PDF Master/Class/PDFTools/Crop/KMPDFCropWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "250"
-            endingLineNumber = "250"
-            landmarkName = "getDrawPages()"
+            startingLineNumber = "353"
+            endingLineNumber = "353"
+            landmarkName = "buttonClicked_Margin(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A00E08E0-6CC3-4B89-AFF8-4910748FBF92"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFTools/Crop/KMPDFCropWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "383"
+            endingLineNumber = "383"
+            landmarkName = "buttonClicked_Margin(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>