【OCToSwift】NSGraphics+PDFListView

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2595,6 +2595,9 @@
 		BB7BC4D82AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7BC4D72AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift */; };
 		BB7BC4D92AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7BC4D72AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift */; };
 		BB7BC4DA2AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7BC4D72AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift */; };
+		BB7BC4DC2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7BC4DB2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift */; };
+		BB7BC4DD2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7BC4DB2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift */; };
+		BB7BC4DE2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7BC4DB2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift */; };
 		BB7F4C8E29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BB7F4C8D29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m */; };
 		BB7F4C8F29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BB7F4C8D29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m */; };
 		BB7F4C9029A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BB7F4C8D29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m */; };
@@ -3270,9 +3273,6 @@
 		F34BF949295310AB002C25A2 /* NSUserDefaults+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF948295310AB002C25A2 /* NSUserDefaults+PDFListView.m */; };
 		F34BF94A295310AB002C25A2 /* NSUserDefaults+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF948295310AB002C25A2 /* NSUserDefaults+PDFListView.m */; };
 		F34BF94B295310AB002C25A2 /* NSUserDefaults+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF948295310AB002C25A2 /* NSUserDefaults+PDFListView.m */; };
-		F34BF94E29531213002C25A2 /* NSGraphics+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF94D29531213002C25A2 /* NSGraphics+PDFListView.m */; };
-		F34BF94F29531213002C25A2 /* NSGraphics+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF94D29531213002C25A2 /* NSGraphics+PDFListView.m */; };
-		F34BF95029531213002C25A2 /* NSGraphics+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF94D29531213002C25A2 /* NSGraphics+PDFListView.m */; };
 		F34BF9532953DA91002C25A2 /* NSGeometry+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF9522953DA91002C25A2 /* NSGeometry+PDFListView.m */; };
 		F34BF9542953DA91002C25A2 /* NSGeometry+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF9522953DA91002C25A2 /* NSGeometry+PDFListView.m */; };
 		F34BF9552953DA91002C25A2 /* NSGeometry+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF9522953DA91002C25A2 /* NSGeometry+PDFListView.m */; };
@@ -4527,6 +4527,7 @@
 		BB7648E729ECECBF00931039 /* Color.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Color.xcassets; sourceTree = "<group>"; };
 		BB7648EB29ECEEF400931039 /* KMAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMAppearance.swift; sourceTree = "<group>"; };
 		BB7BC4D72AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PDFListView+KMExtensions.swift"; sourceTree = "<group>"; };
+		BB7BC4DB2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSImage+ KMExtension.swift"; sourceTree = "<group>"; };
 		BB7F4C8C29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMPDFMergeFileNameTabelViewCell.h; sourceTree = "<group>"; };
 		BB7F4C8D29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMPDFMergeFileNameTabelViewCell.m; sourceTree = "<group>"; };
 		BB7F7BF629AA469F00A3E4E7 /* KMSigntureViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMSigntureViewItem.xib; sourceTree = "<group>"; };
@@ -4803,8 +4804,6 @@
 		F34BF93429530708002C25A2 /* NSImage+PDFListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSImage+PDFListView.m"; sourceTree = "<group>"; };
 		F34BF947295310AB002C25A2 /* NSUserDefaults+PDFListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSUserDefaults+PDFListView.h"; sourceTree = "<group>"; };
 		F34BF948295310AB002C25A2 /* NSUserDefaults+PDFListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSUserDefaults+PDFListView.m"; sourceTree = "<group>"; };
-		F34BF94C29531213002C25A2 /* NSGraphics+PDFListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSGraphics+PDFListView.h"; sourceTree = "<group>"; };
-		F34BF94D29531213002C25A2 /* NSGraphics+PDFListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSGraphics+PDFListView.m"; sourceTree = "<group>"; };
 		F34BF9512953DA91002C25A2 /* NSGeometry+PDFListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSGeometry+PDFListView.h"; sourceTree = "<group>"; };
 		F34BF9522953DA91002C25A2 /* NSGeometry+PDFListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSGeometry+PDFListView.m"; sourceTree = "<group>"; };
 		F356720229AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPDFListAnnotationNoteWindowController.h; sourceTree = "<group>"; };
@@ -7537,6 +7536,7 @@
 				BB74DA762AC41182006EDFE7 /* NSFont+KMExtension.swift */,
 				BB74DA7A2AC41DE9006EDFE7 /* NSString+KMExtension.swift */,
 				BB60138F2AD3AFF000A76FB2 /* NSPopover+KMExtension.swift */,
+				BB7BC4DB2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift */,
 			);
 			path = Category;
 			sourceTree = "<group>";
@@ -9054,8 +9054,6 @@
 				F34BF93429530708002C25A2 /* NSImage+PDFListView.m */,
 				F359921F292CA27A000D25DE /* CPDFListViewRuntime.h */,
 				F3599217292CA27A000D25DE /* CPDFListViewRuntime.m */,
-				F34BF94C29531213002C25A2 /* NSGraphics+PDFListView.h */,
-				F34BF94D29531213002C25A2 /* NSGraphics+PDFListView.m */,
 				F34BF947295310AB002C25A2 /* NSUserDefaults+PDFListView.h */,
 				F34BF948295310AB002C25A2 /* NSUserDefaults+PDFListView.m */,
 				F34BF9512953DA91002C25A2 /* NSGeometry+PDFListView.h */,
@@ -10691,7 +10689,6 @@
 				BB2EDF6D296ECE17003BCF58 /* KMPageEditInsertDirectionItemView.swift in Sources */,
 				BBD1F783296F9DB500343885 /* KMPageEditExtractWindowController.swift in Sources */,
 				BB146FB1299DC0D100784A6A /* GTLRErrorObject.m in Sources */,
-				F34BF94E29531213002C25A2 /* NSGraphics+PDFListView.m in Sources */,
 				BBB9B319299A5D6D004F3235 /* KMCloudServer.m in Sources */,
 				9F1FE4A829406E4700E952CA /* CTBrowserWindowController.m in Sources */,
 				ADBC374129CAB1C300D93208 /* KMComparativeOutlineCell.swift in Sources */,
@@ -10764,6 +10761,7 @@
 				ADB1FE31297008E800ED072D /* KMBatchCollectionView.swift in Sources */,
 				BBA4C8AB29D59CA500AD825B /* TCPageIndicator.m in Sources */,
 				ADBC2D11299CCD05006280C8 /* KMTextfieldButton.swift in Sources */,
+				BB7BC4DC2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift in Sources */,
 				9FCFEC982AD14EEF00EAD2CB /* KMMailHelper.swift in Sources */,
 				9FAAA325290A69920046FFCE /* KMToolSetScroller.swift in Sources */,
 				AD0FA51229A9FA8600EDEB50 /* KMResetPasswordView.swift in Sources */,
@@ -11433,7 +11431,6 @@
 				BB6B4C0D292F62B20071CA06 /* KMPDFThumbnialPageView.swift in Sources */,
 				9F8539D72943180000DF644E /* KMTabAppearance.swift in Sources */,
 				9FDD0F6C294AD12C000C4DAD /* KMMainViewController+UI.swift in Sources */,
-				F34BF94F29531213002C25A2 /* NSGraphics+PDFListView.m in Sources */,
 				BB3AD6FA29935483004FC1AE /* Reachability.m in Sources */,
 				BBEC00C0295C306400A26C98 /* KMBatesPropertyController.swift in Sources */,
 				BB0A55222A30968900B6E84B /* KMDesignBaseView.swift in Sources */,
@@ -11491,6 +11488,7 @@
 				9F1FE4B229406E4700E952CA /* CTTabWindowController.m in Sources */,
 				BB2EDF6E296ECE17003BCF58 /* KMPageEditInsertDirectionItemView.swift in Sources */,
 				BB6013912AD3AFF000A76FB2 /* NSPopover+KMExtension.swift in Sources */,
+				BB7BC4DD2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift in Sources */,
 				BBD1F784296F9DB500343885 /* KMPageEditExtractWindowController.swift in Sources */,
 				BB146FB2299DC0D100784A6A /* GTLRErrorObject.m in Sources */,
 				BBB9B31A299A5D6D004F3235 /* KMCloudServer.m in Sources */,
@@ -12061,6 +12059,7 @@
 				9FCFEC9E2AD152FA00EAD2CB /* CustomAlertView.swift in Sources */,
 				BB147007299DC0D100784A6A /* OIDFieldMapping.m in Sources */,
 				AD68783529A60FA7005B5210 /* KMLoginView.swift in Sources */,
+				BB7BC4DE2AD3FFC200D6BEE6 /* NSImage+ KMExtension.swift in Sources */,
 				ADCB98F429261BDF00B51A03 /* KMBatchProcessingTableCell.swift in Sources */,
 				9F1FE4C529406E4700E952CA /* CTPageTransition.c in Sources */,
 				BBFE6E5F2930809A00142C01 /* KMMergeCollectionPageViewItem.swift in Sources */,
@@ -12205,7 +12204,6 @@
 				BBBB6CD42AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift in Sources */,
 				9F8539D82943180000DF644E /* KMTabAppearance.swift in Sources */,
 				9FDD0F6D294AD12C000C4DAD /* KMMainViewController+UI.swift in Sources */,
-				F34BF95029531213002C25A2 /* NSGraphics+PDFListView.m in Sources */,
 				BBCE571A2A72723600508EFC /* NSResponder+KMExtension.swift in Sources */,
 				BB146FDA299DC0D100784A6A /* GTLRFramework.m in Sources */,
 				9FF94F0B29A62B5000B1EF69 /* KMDesignSelect.swift in Sources */,

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

@@ -228,21 +228,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "3EE91600-76B7-49C4-AD8B-D2E926F5E221"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/PDFListView+KMExtensions.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "124"
-            endingLineNumber = "124"
-            landmarkName = "PDFListViewCGPath()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

PDF Office/PDF Master/Class/Common/Category/NSImage+ KMExtension.swift

@@ -0,0 +1,41 @@
+//
+//  NSImage+ KMExtension.swift
+//  PDF Master
+//
+//  Created by tangchao on 2023/10/9.
+//
+
+import Foundation
+
+extension NSImage {
+    /*
+     + (NSImage*)imageCustomColor:(NSColor *)color
+     {
+         NSSize size = NSMakeSize(160, 80);
+         CGContextRef context = CGBitmapContextCreate(nil, size.width, size.height, 8, 0,
+                                                      CGColorSpaceCreateDeviceRGB(),
+                                                      kCGImageAlphaPremultipliedLast);
+         //画距形边框
+         CGRect rect = CGRectMake(28, 8, 92, 64);
+         CGContextSetRGBStrokeColor(context, 0.0, 0.0, 0.0, 1.0);
+         CGContextSetLineWidth(context, 8.0);
+         CGContextAddRect(context, rect);
+         CGContextStrokePath(context);
+         CGContextSetFillColorWithColor(context, color.CGColor);
+         CGContextAddRect(context, rect);
+         CGContextFillPath(context);
+         
+         //画下三角
+         CGContextSetFillColorWithColor(context, [NSColor blackColor].CGColor);
+         CGContextMoveToPoint(context, 136, 44);
+         CGContextAddLineToPoint(context, 145, 28);
+         CGContextAddLineToPoint(context, 154, 44);
+         CGContextFillPath(context);
+         
+         CGImageRef newImage = CGBitmapContextCreateImage(context);
+         NSImage *image = [[NSImage alloc] initWithCGImage:newImage size:NSMakeSize(size.width, size.height)];
+         CGContextRelease(context);
+         return image;
+     }
+     */
+}

PDF Office/PDF Master/Class/Common/Category/NSObject+KMExtension.swift

@@ -268,6 +268,15 @@ func KMContextSetFillColorWithColor(_ ctx: CGContext?, _ color: CGColor?) {
     }
 }
 
+func KMContextFillEllipseInRect(_ ctx: CGContext?, _ rect: CGRect) {
+    ctx?.fillEllipse(in: rect)
+}
+
+
+func KMContextStrokeEllipseInRect(_ ctx: CGContext?, _ rect: CGRect) {
+    ctx?.strokeEllipse(in: rect)
+}
+
 func KMContextSetStrokeColorWithColor(_ ctx: CGContext?, _ color: CGColor?) {
     if let data = color {
         ctx?.setStrokeColor(data)

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSGraphics+PDFListView.h

@@ -1,19 +0,0 @@
-//
-//  NSGraphics+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 <Cocoa/Cocoa.h>
-
-extern void CPDFListViewDrawResizeHandle(CGContextRef context, NSPoint point, CGFloat radius, BOOL active);
-
-extern void CPDFListViewDrawResizeHandles(CGContextRef context, NSRect rect, CGFloat radius, BOOL active);
-
-extern void CPDFListViewDrawFreeTextResizeHandle(CGContextRef context, NSRect rect, CGFloat radius, BOOL active);

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSGraphics+PDFListView.m

@@ -1,41 +0,0 @@
-//
-//  NSGraphics+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 "NSGraphics+PDFListView.h"
-#import "NSGeometry+PDFListView.h"
-
-void CPDFListViewDrawResizeHandle(CGContextRef context, NSPoint point, CGFloat radius, BOOL active) {
-    CGRect rect = CGRectMake(point.x - radius, point.y - radius, 2 * radius, 2 * radius);
-    NSColor *color = [[(active ? [NSColor colorWithRed:82.0/255.0 green:102.0/255.0 blue:204.0/255.0 alpha:1] : [NSColor secondarySelectedControlColor]) colorUsingColorSpaceName:NSCalibratedRGBColorSpace] colorWithAlphaComponent:1];
-    CGContextSetFillColorWithColor(context, [color CGColor]);
-    CGContextSetStrokeColorWithColor(context, [[NSColor whiteColor] CGColor]);
-    CGContextSetLineWidth(context, 0.25 * radius);
-    CGContextFillEllipseInRect(context, rect);
-    CGContextStrokeEllipseInRect(context, CGRectInset(rect, -0.25 *radius, -0.25 * radius));
-}
-
-void CPDFListViewDrawResizeHandles(CGContextRef context, NSRect rect, CGFloat radius, BOOL active) {
-    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMinX(rect), NSMidY(rect)), radius, active);
-    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMidX(rect), NSMaxY(rect)), radius, active);
-    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMidX(rect), NSMinY(rect)), radius, active);
-    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMaxX(rect), NSMidY(rect)), radius, active);
-    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMinX(rect), NSMaxY(rect)), radius, active);
-    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMinX(rect), NSMinY(rect)), radius, active);
-    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMaxX(rect), NSMaxY(rect)), radius, active);
-    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMaxX(rect), NSMinY(rect)), radius, active);
-}
-
-extern void CPDFListViewDrawFreeTextResizeHandle(CGContextRef context, NSRect rect, CGFloat radius, BOOL active) {
-    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMaxX(rect), NSMidY(rect)), radius, active);
-    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMinX(rect), NSMidY(rect)), radius, active);
-}
-

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/PDFListView+KMExtensions.swift

@@ -182,3 +182,51 @@ import Foundation
 
      */
 }
+
+// MARK: - NSGraphics
+
+@objc extension CPDFListView {
+    @objc(DrawResizeHandle:point:radius:active:)
+    class func DrawResizeHandle(_ context: CGContext, _ point: NSPoint, _ radius: CGFloat, _ active: Bool) {
+        CPDFListViewDrawResizeHandle(context, point, radius, active)
+    }
+
+    @objc(DrawResizeHandles:rect:radius:active:)
+    class func DrawResizeHandles(_ context: CGContext, _ rect: NSRect, _ radius: CGFloat, _ active: Bool) {
+        CPDFListViewDrawResizeHandles(context, rect, radius, active)
+    }
+
+    @objc(DrawFreeTextResizeHandle:rect:radius:active:)
+    class func DrawFreeTextResizeHandle(_ context: CGContext, _ rect: NSRect, _ radius: CGFloat, _ active: Bool) {
+        CPDFListViewDrawFreeTextResizeHandle(context, rect, radius, active)
+    }
+}
+
+func CPDFListViewDrawResizeHandle(_ context: CGContext, _ point: NSPoint, _ radius: CGFloat, _ active: Bool) {
+    let rect = CGRectMake(point.x - radius, point.y - radius, 2 * radius, 2 * radius)
+    let color = active ? NSColor(red: 82.0/255.0, green: 102.0/255.0, blue: 204.0/255.0, alpha: 1) : NSColor.secondarySelectedControlColor.usingColorSpaceName(.calibratedRGB)?.withAlphaComponent(1)
+    
+    KMContextSetFillColorWithColor(context, color?.cgColor)
+    KMContextSetStrokeColorWithColor(context, NSColor.white.cgColor)
+    KMContextSetLineWidth(context, 0.25 * radius)
+    KMContextFillEllipseInRect(context, rect)
+    KMContextStrokeEllipseInRect(context, CGRectInset(rect, -0.25*radius, -0.25*radius))
+}
+
+func CPDFListViewDrawResizeHandles(_ context: CGContext, _ rect: NSRect, _ radius: CGFloat, _ active: Bool) {
+    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMinX(rect), NSMidY(rect)), radius, active)
+    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMidX(rect), NSMaxY(rect)), radius, active)
+    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMidX(rect), NSMinY(rect)), radius, active)
+    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMaxX(rect), NSMidY(rect)), radius, active)
+    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMinX(rect), NSMaxY(rect)), radius, active)
+    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMinX(rect), NSMinY(rect)), radius, active)
+    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMaxX(rect), NSMaxY(rect)), radius, active)
+    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMaxX(rect), NSMinY(rect)), radius, active)
+}
+
+func CPDFListViewDrawFreeTextResizeHandle(_ context: CGContext, _ rect: NSRect, _ radius: CGFloat, _ active: Bool) {
+    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMaxX(rect), NSMidY(rect)), radius, active)
+    CPDFListViewDrawResizeHandle(context, NSMakePoint(NSMinX(rect), NSMidY(rect)), radius, active)
+}
+
+

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.m

@@ -907,9 +907,9 @@ NSNotificationName const CPDFListViewAnnotationsAttributeHasChangeNotification =
         CGContextRestoreGState(context);
         CGContextSaveGState(context);
         if(isIncludText) {
-            CPDFListViewDrawFreeTextResizeHandle(context, rect, 4.0 * lineWidth, YES);
+            [CPDFListView DrawFreeTextResizeHandle:context rect:rect radius: 4.0 * lineWidth active:true];
         } else {
-            CPDFListViewDrawResizeHandles(context, rect, 4.0 * lineWidth, YES);
+            [CPDFListView DrawResizeHandles:context rect:rect radius:4.0 * lineWidth active:true];
         }
         CGContextRestoreGState(context);
     }
@@ -1000,7 +1000,7 @@ NSNotificationName const CPDFListViewAnnotationsAttributeHasChangeNotification =
             CGColorRelease(color);
             CGContextFillRect(context, NSRectToCGRect(rect));
         }
-        CPDFListViewDrawResizeHandles(context, rect, radius, YES);
+        [CPDFListView DrawResizeHandles:context rect:rect radius:radius active:true];
     }
 }
 

PDF Office/PDF Master/PDF_Master-Bridging-Header.h

@@ -65,5 +65,4 @@
 #import "NSGeometry+PDFListView.h"
 #import "CPDFAnnotationHeader.h"
 #import "KMTableRowView.h"
-#import "NSGraphics+PDFListView.h"
 #import "KMPDFEditAppendCustomView.h"