Browse Source

【fix】【注释】多选注释(含便签),移动时,便签位置不会移动

tangchao 5 months ago
parent
commit
891f80c6b8

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

@@ -4652,7 +4652,8 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
     BOOL isIncludText = NO;
     for (CPDFAnnotation *an in self.activeAnnotations) {
         if([an.page isEqual:page]) {
-            if(!([an isKindOfClass:[CPDFMarkupAnnotation class]] || [an isKindOfClass:[CPDFTextAnnotation class]])) {
+            //  || [an isKindOfClass:[CPDFTextAnnotation class]]
+            if(!([an isKindOfClass:[CPDFMarkupAnnotation class]])) {
                 [currentActiveAnnotations addObject:an];
             }
             if([an isKindOfClass:[CPDFFreeTextAnnotation class]])
@@ -4700,7 +4701,8 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
                 NSPoint relPoint = CPDFListViewSubstractPoints(newBounds.origin, orgBounds.origin);
                 
                 for (CPDFAnnotation * annotation in currentActiveAnnotations) {
-                    if([annotation isKindOfClass:[CPDFMarkupAnnotation class]] || [annotation isKindOfClass:[CPDFTextAnnotation class]]) {
+                    //  || [annotation isKindOfClass:[CPDFTextAnnotation class]]
+                    if([annotation isKindOfClass:[CPDFMarkupAnnotation class]]) {
                         continue;
                     }
                     CGRect bound = annotation.bounds;
@@ -4719,7 +4721,8 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
                 }
             } else {
                 for (CPDFAnnotation *dragAnnotation in currentActiveAnnotations) {
-                    if([dragAnnotation isKindOfClass:[CPDFMarkupAnnotation class]] || [dragAnnotation isKindOfClass:[CPDFTextAnnotation class]]) {
+                    //  || [dragAnnotation isKindOfClass:[CPDFTextAnnotation class]]
+                    if([dragAnnotation isKindOfClass:[CPDFMarkupAnnotation class]]) {
                         continue;
                     }
                     if ([dragAnnotation isKindOfClass:[CPDFLineAnnotation class]]) {