【OCToSwift】CPDFSquareAnnotation+PDFListView

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2499,6 +2499,9 @@
 		BB6719F92AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */; };
 		BB6719FA2AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */; };
 		BB6719FB2AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */; };
+		BB6719FD2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719FC2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift */; };
+		BB6719FE2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719FC2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift */; };
+		BB6719FF2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719FC2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift */; };
 		BB69C95C299116FD0001A9B1 /* five_line_score.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BB69C959299116FD0001A9B1 /* five_line_score.pdf */; };
 		BB69C95D299116FD0001A9B1 /* five_line_score.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BB69C959299116FD0001A9B1 /* five_line_score.pdf */; };
 		BB69C95E299116FD0001A9B1 /* five_line_score.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BB69C959299116FD0001A9B1 /* five_line_score.pdf */; };
@@ -3318,9 +3321,6 @@
 		F37322FC292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */; };
 		F37322FD292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */; };
 		F37322FE292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */; };
-		F3732305292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D4292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m */; };
-		F3732306292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D4292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m */; };
-		F3732307292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D4292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m */; };
 		F373230B292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D6292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m */; };
 		F373230C292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D6292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m */; };
 		F373230D292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D6292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m */; };
@@ -4515,6 +4515,7 @@
 		BB6719E82AD2A57C003D44D5 /* CPDFLinkAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFLinkAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BB6719F42AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFRedactAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFSignatureWidgetAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
+		BB6719FC2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFSquareAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BB69C959299116FD0001A9B1 /* five_line_score.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = five_line_score.pdf; sourceTree = "<group>"; };
 		BB69C95A299116FD0001A9B1 /* plaid.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = plaid.pdf; sourceTree = "<group>"; };
 		BB69C95B299116FD0001A9B1 /* horizontal_line.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = horizontal_line.pdf; sourceTree = "<group>"; };
@@ -4853,7 +4854,6 @@
 		F3732288292CB4030013862C /* CPDFListView+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFListView+Private.h"; sourceTree = "<group>"; };
 		F37322B5292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFWidgetAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322B8292DF9410013862C /* CPDFAnnotationModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPDFAnnotationModel.m; sourceTree = "<group>"; };
-		F37322B9292DF9410013862C /* CPDFSquareAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFSquareAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322BA292DF9410013862C /* CPDFStampAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFStampAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322BD292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFMarkupAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322BE292DF9410013862C /* CPDFTextAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFTextAnnotation+PDFListView.h"; sourceTree = "<group>"; };
@@ -4867,7 +4867,6 @@
 		F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFWidgetAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322D1292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFMarkupAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322D3292DF9410013862C /* CPDFStampAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFStampAnnotation+PDFListView.h"; sourceTree = "<group>"; };
-		F37322D4292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFSquareAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322D6292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFTextWidgetAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322DA292DF9410013862C /* CPDFTextAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFTextAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F3732321292DFFFE0013862C /* CPDFListView+Extension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CPDFListView+Extension.h"; sourceTree = "<group>"; };
@@ -9187,8 +9186,7 @@
 				F37322BD292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.m */,
 				BB6719F42AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift */,
 				BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */,
-				F37322B9292DF9410013862C /* CPDFSquareAnnotation+PDFListView.h */,
-				F37322D4292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m */,
+				BB6719FC2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift */,
 				F37322D3292DF9410013862C /* CPDFStampAnnotation+PDFListView.h */,
 				F37322BA292DF9410013862C /* CPDFStampAnnotation+PDFListView.m */,
 				F37322BE292DF9410013862C /* CPDFTextAnnotation+PDFListView.h */,
@@ -10911,6 +10909,7 @@
 				BB147026299DC0D100784A6A /* OIDTokenRequest.m in Sources */,
 				BB3EAEAD293E3D6000D92407 /* KMConvertBaseWindowController.swift in Sources */,
 				BB2F61582966B69D001CB369 /* KMWatermarkPropertyHomeController.swift in Sources */,
+				BB6719FD2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift in Sources */,
 				BB146FC3299DC0D100784A6A /* GTMReadMonitorInputStream.m in Sources */,
 				BB8115FB29924A5F0008F536 /* KMSecureEncryptCheckCellView.swift in Sources */,
 				AD867FAF29DFBB1200F00440 /* KMAnnotationOutlineCellView.swift in Sources */,
@@ -10928,7 +10927,6 @@
 				BB147005299DC0D100784A6A /* OIDFieldMapping.m in Sources */,
 				BB003015298CA446002DD1A0 /* KMPreferenceGeneralController.swift in Sources */,
 				BBB9B32E299A5D6D004F3235 /* GTMAppAuthFetcherAuthorization.m in Sources */,
-				F3732305292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m in Sources */,
 				BB3198162AC55E6D00107371 /* CPDFDocument+KMExtension.swift in Sources */,
 				894A00F22976314C0070ED83 /* KMPDFViewPanelSetViewController.swift in Sources */,
 				BB135C2A29B6CD9A00FD5965 /* KMTools.swift in Sources */,
@@ -11288,6 +11286,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BB6719FE2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift in Sources */,
 				BB147018299DC0D100784A6A /* OIDGrantTypes.m in Sources */,
 				BB8F4540295A98960037EA22 /* KMHeaderFooterPropertyController.swift in Sources */,
 				ADC075B729866962006C752F /* KMBatchConverPDFWordView.swift in Sources */,
@@ -11362,7 +11361,6 @@
 				BB8F4548295A9CDC0037EA22 /* KMHeaderFooterListController.swift in Sources */,
 				F3D547B529568CC300AA3953 /* ComPDFUIConfig.m in Sources */,
 				9F0CB5022986560D00007028 /* KMDesignToken+BorderTop.swift in Sources */,
-				F3732306292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m in Sources */,
 				ADCB98D22924771600B51A03 /* KMBatchProcessingNameTableCell.swift in Sources */,
 				F34BF9542953DA91002C25A2 /* NSGeometry+PDFListView.m in Sources */,
 				BBB14A582978E75D00936EDB /* KMRedactMutilPageFlagWindowController.swift in Sources */,
@@ -12100,7 +12098,6 @@
 				BB003028298CF7EC002DD1A0 /* KMPreferenceDisplayController.swift in Sources */,
 				9F0CB48929683DC400007028 /* KMPropertiesPanelPresetColorSubVC.swift in Sources */,
 				BB99ACC4292DE22E0048AFD9 /* KMMergeViewController.swift in Sources */,
-				F3732307292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m in Sources */,
 				9F78EFC828F7E965001E66F4 /* KMHomeViewController+UI.swift in Sources */,
 				9FBA0EFB2900188F001117AF /* KMFastToolCollectionView.swift in Sources */,
 				9F1F82DC292F84D60092C4B4 /* KMHomeInsertActionViewController.swift in Sources */,
@@ -12300,6 +12297,7 @@
 				BB5DF1EB2959C5CB0025CDA1 /* KMHeaderFooterPreviewController.swift in Sources */,
 				89316854296E45CA0073EA59 /* KMImageAccessoryController.m in Sources */,
 				AD8DD2A52A9C35B2007CC9D0 /* KMThumbnailManager.swift in Sources */,
+				BB6719FF2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift in Sources */,
 				BB146FBF299DC0D100784A6A /* GTMGatherInputStream.m in Sources */,
 				BB8116012992682F0008F536 /* KMSecureLimitAlertView.swift in Sources */,
 				AD3A3589294C11ED00D72802 /* KMPrintPreviewPresenter.swift in Sources */,

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -148,38 +148,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "CDA7D543-4E31-4A2F-BF61-B73E00EF5124"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/KMRightSideViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "173"
-            endingLineNumber = "173"
-            landmarkName = "isHidden"
-            landmarkType = "24">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "0F139A36-BEE9-475A-9160-D6413C1C6615"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/KMRightSideViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "175"
-            endingLineNumber = "175"
-            landmarkName = "isHidden"
-            landmarkType = "24">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -196,54 +164,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "6C82A7A6-B30F-4990-85DB-994D68D6473B"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "317"
-            endingLineNumber = "317"
-            landmarkName = "-setAnnotations:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "6C82A7A6-B30F-4990-85DB-994D68D6473B - 636e9881fdf2e251"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[KMAnnotationPropertiesViewController setAnnotations:]"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "317"
-                  endingLineNumber = "317"
-                  offsetFromSymbolStart = "10618">
-               </Location>
-               <Location
-                  uuid = "6C82A7A6-B30F-4990-85DB-994D68D6473B - 636e9881fdf2e251"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[KMAnnotationPropertiesViewController setAnnotations:]"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "317"
-                  endingLineNumber = "317"
-                  offsetFromSymbolStart = "10730">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m

@@ -12,7 +12,6 @@
 
 #import "CPDFAnnotationModel.h"
 
-#import "CPDFSquareAnnotation+PDFListView.h"
 #import "CPDFMarkupAnnotation+PDFListView.h"
 #import "CPDFStampAnnotation+PDFListView.h"
 #import "CPDFTextAnnotation+PDFListView.h"

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFSquareAnnotation+PDFListView.h

@@ -1,23 +0,0 @@
-//
-//  CPDFSquareAnnotation+PDFListView.h
-//  ComPDFKit
-//
-//  Copyright © 2014-2022 PDF Technologies, Inc. All Rights Reserved.
-//
-//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
-//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
-//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
-//  This notice may not be removed from this file.
-//
-
-#import <ComPDFKit/ComPDFKit.h>
-
-@class CPDFAnnotationModel;
-
-@interface CPDFSquareAnnotation (PDFListView)
-
-- (NSSet *)keysForValuesToObserveForUndo;
-
-+ (NSImage *)annotationImageWithAnnotationModel:(CPDFAnnotationModel *)annotationModel;
-
-@end

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFSquareAnnotation+PDFListView.m

@@ -1,87 +0,0 @@
-//
-//  CPDFSquareAnnotation+PDFListView.m
-//  ComPDFKit
-//
-//  Copyright © 2014-2022 PDF Technologies, Inc. All Rights Reserved.
-//
-//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
-//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
-//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
-//  This notice may not be removed from this file.
-//
-
-#import "CPDFSquareAnnotation+PDFListView.h"
-#import "CPDFAnnotationModel.h"
-#import <PDF_Master-Swift.h>
-
-@implementation CPDFSquareAnnotation (PDFListView)
-
-- (instancetype)initPDFListViewNoteWithDocument:(CPDFDocument *)document {
-    self = [self initWithDocument:document];
-    if (self) {
-        CPDFAnnotationModel *annotationModel = [[CPDFAnnotationModel alloc] initWithAnnotationType:  CAnnotationTypeSquare];
-        self.color = annotationModel.color;
-        self.opacity = annotationModel.opacity;
-        self.interiorColor = annotationModel.interiorColor;
-        self.interiorOpacity = annotationModel.interiorOpacity;
-        self.border = [[CPDFBorder alloc] initWithStyle:annotationModel.style lineWidth:annotationModel.lineWidth dashPattern:annotationModel.dashPattern];
-    }
-    return self;
-}
-
-- (BOOL)isResizable { return YES; }
-
-- (BOOL)isMovable { return YES; }
-
-- (NSSet *)keysForValuesToObserveForUndo {
-    static NSSet *circleKeys = nil;
-    if (circleKeys == nil) {
-        NSMutableSet *mutableKeys = [[super keysForValuesToObserveForUndo] mutableCopy];
-        [mutableKeys addObject:CPDFAnnotationInteriorColorKey];
-        [mutableKeys addObject:CPDFAnnotationInteriorOpacityKey];
-        circleKeys = [mutableKeys copy];
-    }
-    return circleKeys;
-}
-
-+ (NSImage *)annotationImageWithAnnotationModel:(CPDFAnnotationModel *)annotationModel {
-    CGRect bounds = annotationModel.annotationImageBounds;
-    NSImage *image = [[NSImage alloc] initWithSize:bounds.size];
-    [image lockFocus];
-    [[NSGraphicsContext currentContext] setImageInterpolation:NSImageInterpolationHigh];
-    CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-
-    NSColor *color = [annotationModel.color colorWithAlphaComponent:annotationModel.opacity];
-    if (color) {
-        CGFloat red, green, blue, alpha;
-        [[color colorUsingColorSpaceName:NSCalibratedRGBColorSpace] getRed:&red green:&green blue:&blue alpha:&alpha];
-        CGFloat tAlphaMin = MIN(alpha, annotationModel.opacity);
-        CGContextSetRGBStrokeColor(context, red, green, blue, tAlphaMin);
-    }
-    
-    if (annotationModel.style == CPDFBorderStyleDashed &&
-        annotationModel.dashPattern) {
-        size_t count = annotationModel.dashPattern.count;
-        CGFloat lengths[count];
-        for (int i=0; i<count; i++) {
-            lengths[i] = [annotationModel.dashPattern[i] floatValue];
-        }
-        CGContextSetLineDash(context, 0, lengths, count);
-    }
-
-    CGContextSetLineWidth(context, annotationModel.lineWidth);
-    CGContextAddRect(context, bounds);
-    CGContextStrokePath(context);
-
-    NSColor *interiorColor = [annotationModel.interiorColor colorWithAlphaComponent:annotationModel.interiorOpacity];
-    if (interiorColor && annotationModel.interiorOpacity > 0.01) {
-        bounds = CGRectInset(bounds, annotationModel.lineWidth/2.0, annotationModel.lineWidth/2.0);
-        CGContextSetFillColorWithColor(context, interiorColor.CGColor);
-        CGContextFillRect(context, bounds);
-    }
-    [image unlockFocus];
-
-    return image;
-}
-
-@end

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFSquareAnnotation+PDFListView.swift

@@ -0,0 +1,87 @@
+//
+//  CPDFSquareAnnotation+PDFListView.swift
+//  PDF Master
+//
+//  Created by tangchao on 2023/10/8.
+//
+
+import Foundation
+
+@objc extension CPDFSquareAnnotation {
+    convenience init(PDFListViewNoteWith document: CPDFDocument) {
+        self.init(document: document)
+        if let model = CPDFAnnotationModel(annotationType: .square) {
+            self.color = model.color()
+            self.opacity = model.opacity()
+            self.interiorColor = model.interiorColor()
+            self.interiorOpacity = model.interiorOpacity()
+            self.border = CPDFBorder(style: model.style(), lineWidth: model.lineWidth(), dashPattern: model.dashPattern())
+        }
+    }
+
+    override func isResizable() -> Bool {
+        return true
+    }
+    override func isMovable() -> Bool {
+        return true
+    }
+    
+    private static var _s2_keys: Set<AnyHashable>?
+    override func keysForValuesToObserveForUndo() -> Set<AnyHashable>! {
+        if (CPDFSquareAnnotation._s2_keys == nil) {
+            CPDFSquareAnnotation._s2_keys = super.keysForValuesToObserveForUndo()
+            _ = CPDFSquareAnnotation._s2_keys?.insert(CPDFAnnotationInteriorColorKey)
+            _ = CPDFSquareAnnotation._s2_keys?.insert(CPDFAnnotationInteriorOpacityKey)
+        }
+        return CPDFSquareAnnotation._s2_keys
+    }
+    
+    class func annotationImage(annotationModel: CPDFAnnotationModel) -> NSImage {
+        var bounds = annotationModel.annotationImageBounds()
+        let lineWidth = annotationModel.lineWidth()
+        
+        var image = NSImage(size: bounds.size)
+        image.lockFocus()
+        NSGraphicsContext.current?.imageInterpolation = .high
+        let context = NSGraphicsContext.current?.cgContext
+        
+        if let color = annotationModel.color() {
+            let _color = color.withAlphaComponent(annotationModel.opacity())
+            var red: CGFloat = 0.0
+            var green: CGFloat = 0.0
+            var blue: CGFloat = 0.0
+            var alpha: CGFloat = 0.0
+            _color.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
+            let tAlphaMin = min(alpha, annotationModel.opacity())
+            context?.setStrokeColor(red: red, green: green, blue: blue, alpha: tAlphaMin)
+        }
+        
+//        bounds = CGRectInset(bounds, lineWidth, lineWidth)
+        if (annotationModel.style() == .dashed &&
+            annotationModel.dashPattern != nil) {
+            let count = annotationModel.dashPattern().count
+            var lengths: [CGFloat] = []
+            for i in 0 ..< count {
+                if let data = annotationModel.dashPattern()[i] as? NSNumber {
+                    lengths.append(CGFloat(data.floatValue))
+                }
+            }
+            context?.setLineDash(phase: 0, lengths: lengths)
+        }
+        
+        context?.setLineWidth(lineWidth)
+        context?.addRect(bounds)
+        context?.strokePath()
+        
+        if let data = annotationModel.interiorColor(), annotationModel.interiorOpacity() > 0.01 {
+            let interiorColor = data.withAlphaComponent(annotationModel.interiorOpacity())
+            bounds = CGRectInset(bounds, lineWidth/2.0, lineWidth/2.0)
+            context?.setFillColor(interiorColor.cgColor)
+            context?.fill([bounds])
+        }
+        
+        image.unlockFocus()
+        
+        return image
+    }
+}

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/ComPDFUIKit.h

@@ -20,6 +20,5 @@
 #import "CPDFTextAnnotation+PDFListView.h"
 #import "CPDFStampAnnotation+PDFListView.h"
 #import "CPDFMarkupAnnotation+PDFListView.h"
-#import "CPDFSquareAnnotation+PDFListView.h"
 #import "CPDFWidgetAnnotation+PDFListView.h"
 #import "CPDFTextWidgetAnnotation+PDFListView.h"