Browse Source

【编辑工具】文档对比,将光标放置右侧文档滚动,同步滚动无效 修复

lizhe 1 year ago
parent
commit
d607fa2c5b

+ 6 - 3
PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/ContentComplete/View/KMCompareContentView.swift

@@ -638,7 +638,10 @@ class KMCompareContentView: KMBaseXibView, CPDFViewDelegate, KMCompareToolbarDel
                 offsetY = offsetY / self.oldToNewPDFScale
                 offsetY = offsetY / self.oldToNewPDFScale
             }
             }
 
 
-            self.pdfNewView.documentView().contentView.scroll(NSPoint(x: self.pdfnewViewSPoint.x, y: self.pdfnewViewSPoint.y + offsetY))
+            var x = max(self.pdfnewViewSPoint.x, 0)
+            var y = max(self.pdfnewViewSPoint.y + offsetY, 0)
+            
+            self.pdfNewView.documentView().contentView.scroll(NSPoint(x: x, y: y))
 
 
             NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(scrollFinishEvent), object: nil)
             NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(scrollFinishEvent), object: nil)
             self.perform(#selector(scrollFinishEvent), with: nil, afterDelay: 0.25)
             self.perform(#selector(scrollFinishEvent), with: nil, afterDelay: 0.25)
@@ -683,8 +686,8 @@ class KMCompareContentView: KMBaseXibView, CPDFViewDelegate, KMCompareToolbarDel
 
 
             var x = max(self.pdfoldViewSPoint.x, 0)
             var x = max(self.pdfoldViewSPoint.x, 0)
             var y = max(self.pdfoldViewSPoint.y + offsetY, 0)
             var y = max(self.pdfoldViewSPoint.y + offsetY, 0)
-//            self.pdfOldView.documentView().contentView.scroll(NSPoint(x: self.pdfoldViewSPoint.x, y: self.pdfoldViewSPoint.y + offsetY))
-            self.pdfOldView.documentView().contentView.scroll(KMSafePoint(x: x, y: y))
+            self.pdfOldView.documentView().contentView.scroll(NSPoint(x: x, y: y))
+//            self.pdfOldView.documentView().contentView.scroll(KMSafePoint(x: x, y: y))
 
 
             NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(scrollFinishEvent), object: nil)
             NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(scrollFinishEvent), object: nil)
             self.perform(#selector(scrollFinishEvent), with: nil, afterDelay: 0.25)
             self.perform(#selector(scrollFinishEvent), with: nil, afterDelay: 0.25)