Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/Split/View/KMSecondaryPDFView.swift

@@ -620,18 +620,24 @@ class KMSecondaryPDFView: CPDFListView {
     }
     
     @objc func handleSynchronizedScaleChangedNotification(_ notification: Notification) {
-        if self.synchronizeZoom {
-            self.scaleFactor = self.synchronizedPDFView?.scaleFactor ?? 0.0
+        if !self.document.isLocked {
+            if self.synchronizeZoom {
+                self.scaleFactor = self.synchronizedPDFView?.scaleFactor ?? 0.0
+            }
         }
     }
     
     @objc func handleDocumentDidUnlockNotification(_ notification: Notification) {
-        self.reloadPagePopUpButton()
+        if !self.document.isLocked {
+            self.reloadPagePopUpButton()
+        }
     }
     
     @objc func handlePDFViewScaleChangedNotification(_ notification: Notification) {
-        if self.autoScales == false && self.synchronizeZoom == false {
-            self.setScaleFactor(fmax(self.scaleFactor, SKMinDefaultScaleMenuFactor), adjustPopup: true)
+        if !self.document.isLocked {
+            if self.autoScales == false && self.synchronizeZoom == false {
+                self.setScaleFactor(fmax(self.scaleFactor, SKMinDefaultScaleMenuFactor), adjustPopup: true)
+            }
         }
     }
     

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

@@ -3408,6 +3408,7 @@ extension KMMainViewController {
         if document != nil {
             self.secondaryPdfView?.document = nil
             self.secondaryPdfView?.document = document
+            self.rightSideViewController.annotationProperties.openPropertiesType = .pageDisplay
             return true
         } else {
             return false