【综合】整理代码

PDF Office/PDF Master/Class/PDFTools/EditPDF/Tools/KMEditPDfHanddler.swift

@@ -115,8 +115,11 @@ class KMEditPDfHanddler: NSObject {
     private var startPoint_: NSPoint = .zero
     
     func enterEditPDF() {
-        self.viewC?.search(searchString: "", isCase: false, display: true, needShowAll: false)
-        self.viewC?.leftSideViewController.showSearchMode("")
+        let cnt = self.viewC?.leftSideViewController.leftView.segmentedControl.selectedSegment ?? 0
+        if cnt == 5 {
+            self.viewC?.search(searchString: "", isCase: false, display: true, needShowAll: false)
+            self.viewC?.leftSideViewController.showSearchMode("")
+        }
         
         let toolMode = self.listView?.toolMode ?? .none
         if toolMode != .editPDFToolMode { // 退出

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m

@@ -2743,11 +2743,13 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
                         if (CAnnotationTypePolyLine == self.annotationType || CAnnotationTypePolyGon == self.annotationType || (CAnnotationTypeSquare == self.annotationType && CMeasureToolMode == self.toolMode)) {
                             
                         } else {
-                            if (((CPDFLineAnnotation *)self.activeAnnotation).isMeasure) {
-                                CPDFDistanceMeasureInfo *distanceMeasureInfo = [(CPDFLineAnnotation *)self.activeAnnotation measureInfo];
-                                [(CPDFLineAnnotation *)self.activeAnnotation setMeasureInfo:distanceMeasureInfo];
-                                if (self.pdfListViewDelegate && [self.pdfListViewDelegate respondsToSelector:@selector(PDFListViewAnnotationMeasureInfoChange:withAnnotation:)]) {
-                                    [self.pdfListViewDelegate PDFListViewAnnotationMeasureInfoChange:self withAnnotation:nil];
+                            if ([self.activeAnnotation isKindOfClass:[CPDFLineAnnotation class]]) {
+                                if (((CPDFLineAnnotation *)self.activeAnnotation).isMeasure) {
+                                    CPDFDistanceMeasureInfo *distanceMeasureInfo = [(CPDFLineAnnotation *)self.activeAnnotation measureInfo];
+                                    [(CPDFLineAnnotation *)self.activeAnnotation setMeasureInfo:distanceMeasureInfo];
+                                    if (self.pdfListViewDelegate && [self.pdfListViewDelegate respondsToSelector:@selector(PDFListViewAnnotationMeasureInfoChange:withAnnotation:)]) {
+                                        [self.pdfListViewDelegate PDFListViewAnnotationMeasureInfoChange:self withAnnotation:nil];
+                                    }
                                 }
                             }