Browse Source

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

tangchao 10 months ago
parent
commit
e32798cb07

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

@@ -1316,22 +1316,23 @@ extension KMMainViewController {
                 default:
                 default:
                     break
                     break
                 }
                 }
+                self.rightSideViewController.isHidden = false
+                self.rightSideViewController.subViewType = .AnnotationProperts
                 if annotation != nil{
                 if annotation != nil{
                     self.listView.activeAnnotations.removeAllObjects()
                     self.listView.activeAnnotations.removeAllObjects()
 //                    self.listView.activeAnnotations.add(annotation as Any)
 //                    self.listView.activeAnnotations.add(annotation as Any)
                     var newAnnonations : [CPDFAnnotation] = []
                     var newAnnonations : [CPDFAnnotation] = []
                     newAnnonations.append(annotation!)
                     newAnnonations.append(annotation!)
                     self.listView.updateActiveAnnotations(newAnnonations)
                     self.listView.updateActiveAnnotations(newAnnonations)
-                    self.openRightPane()
+//                    self.openRightPane()
                 }
                 }
                 //        self.rightSideViewController.view.isHidden = false
                 //        self.rightSideViewController.view.isHidden = false
-                self.rightSideViewController.isHidden = false
-                self.rightSideViewController.subViewType = .AnnotationProperts
+              
             }
             }
             
             
-            if (annotation != nil) {
-                self.listView.updateIsRightActiveAnnotations([annotation!])
-            }
+//            if (annotation != nil) {
+//                self.listView.updateIsRightActiveAnnotations([annotation!])
+//            }
         }
         }
     }
     }