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

PDF Office/PDF Master/Class/PDFTools/Redact/View/KMRedactPDFView.swift

@@ -323,7 +323,7 @@ class KMPDFWhiteOutRedactAnnotation: CPDFRedactAnnotation {
                     annotation?.setUserName(userName)
                     
 //                    annotation?.borderWidth = 10
-                    annotation?.borderWidth = 2
+                    annotation?.borderWidth = 1
                     if self.isWhiteOut {
                         annotation?.setBorderColor(.red)
                         annotation?.setInteriorColor(.white)
@@ -414,7 +414,7 @@ class KMPDFWhiteOutRedactAnnotation: CPDFRedactAnnotation {
 
 //                if ([annotation isKindOfClass:[CPDFRedactAnnotation class]]) {
 //                annotation?.borderWidth = 10
-                annotation?.borderWidth = 2
+                annotation?.borderWidth = 1
                 if self.isWhiteOut {
                     annotation?.setBorderColor(.red)
                     annotation?.setInteriorColor(.white)

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

@@ -352,8 +352,6 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
     
     if(CRedactToolMode == self.toolMode && ![newActiveAnnotation isKindOfClass:[CPDFRedactAnnotation class]])
         newActiveAnnotation = nil;
-    else if(CRedactToolMode != self.toolMode && [newActiveAnnotation isKindOfClass:[CPDFRedactAnnotation class]])
-        newActiveAnnotation = nil;
     
     [CPDFListView cancelPreviousPerformRequestsWithTarget:self selector:@selector(showHUDHint:) object:self.hoverAnnotation];
     if ((CNoteToolMode == self.toolMode || CTextToolMode == self.toolMode || CRedactErasureToolMode == self.toolMode) &&
@@ -683,6 +681,11 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
             
         }
     }
+    
+    if(CRedactToolMode != self.toolMode && [annotationSel isKindOfClass:[CPDFRedactAnnotation class]]) {
+        return nil;
+    }
+
     NSMenuItem * copyItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Copy", @"PDFListView") action:@selector(copy:) keyEquivalent:@"c"];
     
     NSMenuItem * pasteItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Paste", @"PDFListView") action:@selector(menuItemClick_Paste:) keyEquivalent:@"v"];