Преглед на файлове

【OCToSwift】NSShadow+PDFListView

tangchao преди 1 година
родител
ревизия
86aa3e9751

+ 8 - 20
PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2589,6 +2589,9 @@
 		BB7648EC29ECEEF400931039 /* KMAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7648EB29ECEEF400931039 /* KMAppearance.swift */; };
 		BB7648ED29ECEEF400931039 /* KMAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7648EB29ECEEF400931039 /* KMAppearance.swift */; };
 		BB7648EE29ECEEF400931039 /* KMAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7648EB29ECEEF400931039 /* KMAppearance.swift */; };
+		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 */; };
 		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 */; };
@@ -3258,15 +3261,9 @@
 		BBFE6E87293210AB00142C01 /* KMCompressCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBFE6E86293210AB00142C01 /* KMCompressCellView.swift */; };
 		BBFE6E88293210AB00142C01 /* KMCompressCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBFE6E86293210AB00142C01 /* KMCompressCellView.swift */; };
 		BBFE6E89293210AB00142C01 /* KMCompressCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBFE6E86293210AB00142C01 /* KMCompressCellView.swift */; };
-		F34BF92129530320002C25A2 /* NSString+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF92029530320002C25A2 /* NSString+PDFListView.m */; };
-		F34BF92229530320002C25A2 /* NSString+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF92029530320002C25A2 /* NSString+PDFListView.m */; };
-		F34BF92329530320002C25A2 /* NSString+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF92029530320002C25A2 /* NSString+PDFListView.m */; };
 		F34BF926295303E8002C25A2 /* NSCursor+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF925295303E8002C25A2 /* NSCursor+PDFListView.m */; };
 		F34BF927295303E8002C25A2 /* NSCursor+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF925295303E8002C25A2 /* NSCursor+PDFListView.m */; };
 		F34BF928295303E8002C25A2 /* NSCursor+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF925295303E8002C25A2 /* NSCursor+PDFListView.m */; };
-		F34BF92B295304AB002C25A2 /* NSShadow+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF92A295304AB002C25A2 /* NSShadow+PDFListView.m */; };
-		F34BF92C295304AB002C25A2 /* NSShadow+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF92A295304AB002C25A2 /* NSShadow+PDFListView.m */; };
-		F34BF92D295304AB002C25A2 /* NSShadow+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF92A295304AB002C25A2 /* NSShadow+PDFListView.m */; };
 		F34BF93029530559002C25A2 /* NSBitmapImageRep+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF92F29530559002C25A2 /* NSBitmapImageRep+PDFListView.m */; };
 		F34BF93129530559002C25A2 /* NSBitmapImageRep+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF92F29530559002C25A2 /* NSBitmapImageRep+PDFListView.m */; };
 		F34BF93229530559002C25A2 /* NSBitmapImageRep+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F34BF92F29530559002C25A2 /* NSBitmapImageRep+PDFListView.m */; };
@@ -4541,6 +4538,7 @@
 		BB7507E829861C37002DBDB1 /* PasswordWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PasswordWindowController.h; sourceTree = "<group>"; };
 		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>"; };
 		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>"; };
 		BB7F7BF429AA469F00A3E4E7 /* KMSigntureViewItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMSigntureViewItem.h; sourceTree = "<group>"; };
@@ -4813,12 +4811,8 @@
 		BBFE6E7D2930EBD400142C01 /* KMCompressWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCompressWindowController.swift; sourceTree = "<group>"; };
 		BBFE6E7E2930EBD400142C01 /* KMCompressWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMCompressWindowController.xib; sourceTree = "<group>"; };
 		BBFE6E86293210AB00142C01 /* KMCompressCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCompressCellView.swift; sourceTree = "<group>"; };
-		F34BF91F29530320002C25A2 /* NSString+PDFListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+PDFListView.h"; sourceTree = "<group>"; };
-		F34BF92029530320002C25A2 /* NSString+PDFListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+PDFListView.m"; sourceTree = "<group>"; };
 		F34BF924295303E8002C25A2 /* NSCursor+PDFListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSCursor+PDFListView.h"; sourceTree = "<group>"; };
 		F34BF925295303E8002C25A2 /* NSCursor+PDFListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSCursor+PDFListView.m"; sourceTree = "<group>"; };
-		F34BF929295304AB002C25A2 /* NSShadow+PDFListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSShadow+PDFListView.h"; sourceTree = "<group>"; };
-		F34BF92A295304AB002C25A2 /* NSShadow+PDFListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSShadow+PDFListView.m"; sourceTree = "<group>"; };
 		F34BF92E29530559002C25A2 /* NSBitmapImageRep+PDFListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSBitmapImageRep+PDFListView.h"; sourceTree = "<group>"; };
 		F34BF92F29530559002C25A2 /* NSBitmapImageRep+PDFListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSBitmapImageRep+PDFListView.m"; sourceTree = "<group>"; };
 		F34BF93329530708002C25A2 /* NSImage+PDFListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSImage+PDFListView.h"; sourceTree = "<group>"; };
@@ -9078,12 +9072,9 @@
 				F35B484929A4903300756255 /* NSPointerArray+PDFListView.m */,
 				BB1A34A6295EA30100B80B3E /* NSBitmapImageRep_SKExtensions.h */,
 				BB1A34A7295EA30100B80B3E /* NSBitmapImageRep_SKExtensions.m */,
-				F34BF91F29530320002C25A2 /* NSString+PDFListView.h */,
-				F34BF92029530320002C25A2 /* NSString+PDFListView.m */,
+				BB7BC4D72AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift */,
 				F34BF924295303E8002C25A2 /* NSCursor+PDFListView.h */,
 				F34BF925295303E8002C25A2 /* NSCursor+PDFListView.m */,
-				F34BF929295304AB002C25A2 /* NSShadow+PDFListView.h */,
-				F34BF92A295304AB002C25A2 /* NSShadow+PDFListView.m */,
 				F34BF92E29530559002C25A2 /* NSBitmapImageRep+PDFListView.h */,
 				F34BF92F29530559002C25A2 /* NSBitmapImageRep+PDFListView.m */,
 				F34BF93329530708002C25A2 /* NSImage+PDFListView.h */,
@@ -10470,7 +10461,6 @@
 				ADB1FEB729754F9D00ED072D /* KMBatchSettingItemView.swift in Sources */,
 				ADCB990B292B6ADC00B51A03 /* KMImageToPDFChoosePresenter.swift in Sources */,
 				F34BF926295303E8002C25A2 /* NSCursor+PDFListView.m in Sources */,
-				F34BF92B295304AB002C25A2 /* NSShadow+PDFListView.m in Sources */,
 				9F705F8D291E579F005199AD /* KMHistoryFileTableView.swift in Sources */,
 				BB003035298D356E002DD1A0 /* KMPreferenceMarkupColorView.swift in Sources */,
 				ADE614AC29779C5200F62ED7 /* KMImageTitleButton.swift in Sources */,
@@ -10492,6 +10482,7 @@
 				BB14700B299DC0D100784A6A /* OIDAuthorizationRequest.m in Sources */,
 				ADE3C1DE29A5AA0B00793B13 /* KMRequestServer.swift in Sources */,
 				BBC3484A2958222C008D2CD1 /* KMBackgroundOutsideView.swift in Sources */,
+				BB7BC4D82AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift in Sources */,
 				ADBC2CFA299CA6B9006280C8 /* KMPrintDuplexPrintingSetView.swift in Sources */,
 				BBA19F4329ADE6A3001A285A /* KMBookMarkRowView.swift in Sources */,
 				9F1FE51129407B4000E952CA /* KMFileSearchView.swift in Sources */,
@@ -10746,7 +10737,6 @@
 				BB00301D298CB799002DD1A0 /* KMPreferenceManager.swift in Sources */,
 				89E93EFA299CB4C200F10F66 /* KMOCRBox.m in Sources */,
 				BBAFC85B29851AF200D0648E /* KMTableRowView.m in Sources */,
-				F34BF92129530320002C25A2 /* NSString+PDFListView.m in Sources */,
 				ADBC2D28299DCA76006280C8 /* NSTextField+Layer.swift in Sources */,
 				89E4E7222963FB23002DBA6F /* KMGeneralButton.m in Sources */,
 				ADF6B8762A48155E0090CB78 /* KMComparativeViewCollectionItem.swift in Sources */,
@@ -11447,7 +11437,6 @@
 				BBC745F3295F0DD00072C2ED /* KMCropSettingPageSizeView.swift in Sources */,
 				BB98080629CA945F00BEEB81 /* WaitingView.m in Sources */,
 				9F8DDF2E2924B855006CDC73 /* KMPDFToolsViewController.swift in Sources */,
-				F34BF92229530320002C25A2 /* NSString+PDFListView.m in Sources */,
 				9F0CB4C5298625F400007028 /* NSColor+KMExtensions.swift in Sources */,
 				AD4B454E294072B90076FA14 /* KMOCRWindowController.swift in Sources */,
 				BBD1F790296FE6A500343885 /* KMPageEditSplitWindowController.swift in Sources */,
@@ -11709,6 +11698,7 @@
 				ADDEEA632AD3A6E700EF675D /* KMPDFSignatureTextView.swift in Sources */,
 				BB9807FE29CA93D400BEEB81 /* WelcomeWindowController.m in Sources */,
 				9FCFEC892AD0EF9900EAD2CB /* KMPopMenuButton.swift in Sources */,
+				BB7BC4D92AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift in Sources */,
 				BB6DD81929348A00001F0544 /* KMSecureEncryptComboBoxCellView.swift in Sources */,
 				BBC2BCC7295DA8F30036B983 /* KMCropPreviewController.swift in Sources */,
 				ADE3C1FE29A5C44700793B13 /* KMLightMemberManager.swift in Sources */,
@@ -11833,7 +11823,6 @@
 				ADD1B6B829420B2300C3FFF7 /* KMPrintChooseView.swift in Sources */,
 				9FCFEC9D2AD152FA00EAD2CB /* CustomAlertView.swift in Sources */,
 				BB147000299DC0D100784A6A /* OIDRedirectHTTPHandler.m in Sources */,
-				F34BF92C295304AB002C25A2 /* NSShadow+PDFListView.m in Sources */,
 				BB147003299DC0D100784A6A /* OIDScopeUtilities.m in Sources */,
 				AD867FA729DFB77500F00440 /* KMAnnotationOutlineView.swift in Sources */,
 				BBB9B32C299A5D6D004F3235 /* GTMOAuth2KeychainCompatibility.m in Sources */,
@@ -12225,7 +12214,6 @@
 				BBD7FE062A1323F000F96075 /* KMCustomTableRowView.swift in Sources */,
 				9F0CB4C6298625F400007028 /* NSColor+KMExtensions.swift in Sources */,
 				BBC745F4295F0DD00072C2ED /* KMCropSettingPageSizeView.swift in Sources */,
-				F34BF92329530320002C25A2 /* NSString+PDFListView.m in Sources */,
 				AD4B454F294072B90076FA14 /* KMOCRWindowController.swift in Sources */,
 				9F1FE50729406E4700E952CA /* CTTabStripDragController.m in Sources */,
 				BB146FEC299DC0D100784A6A /* GTLRDuration.m in Sources */,
@@ -12622,8 +12610,8 @@
 				BB897267294C724D0045787C /* KMWatermarkAdjectiveOutsideView.swift in Sources */,
 				AD9527EC2955520C0039D2BC /* KMBaseTextFieldModel.swift in Sources */,
 				BBF38A5C294F2B760086D025 /* KMWatermarkPositionView.swift in Sources */,
-				F34BF92D295304AB002C25A2 /* NSShadow+PDFListView.m in Sources */,
 				89E4E77029657953002DBA6F /* KMStampManager.m in Sources */,
+				BB7BC4DA2AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift in Sources */,
 				BB14702E299DC0D100784A6A /* OIDEndSessionRequest.m in Sources */,
 				BBA4C8AD29D59CA500AD825B /* TCPageIndicator.m in Sources */,
 				BB146FE3299DC0D100784A6A /* GTLRDriveQuery.m in Sources */,

+ 16 - 0
PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -212,5 +212,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A38ACD73-D2BA-4F24-8956-23A8C3963D80"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/PDFListView+KMExtensions.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "14"
+            endingLineNumber = "14"
+            landmarkName = "getMaxString(bounds:attributes:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSImage+PDFListView.m

@@ -12,7 +12,7 @@
 
 #import "NSImage+PDFListView.h"
 #import "NSBitmapImageRep+PDFListView.h"
-#import "NSShadow+PDFListView.h"
+#import <PDF_Master-Swift.h>
 
 NSString *CPDFListViewImageNameResizeDiagonal45Cursor = @"ResizeDiagonal45Cursor";
 NSString *CPDFListViewImageNameResizeDiagonal135Cursor = @"ResizeDiagonal135Cursor";

+ 0 - 20
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSShadow+PDFListView.h

@@ -1,20 +0,0 @@
-//
-//  NSShadow+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>
-
-@interface NSShadow (PDFListView)
-
-+ (void)setPDFListViewShadowWithColor:(NSColor *)color blurRadius:(CGFloat)blurRadius offset:(NSSize)offset;
-
-+ (void)setPDFListViewShadowWithColor:(NSColor *)color blurRadius:(CGFloat)blurRadius yOffset:(CGFloat)yOffset;
-
-@end

+ 0 - 28
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSShadow+PDFListView.m

@@ -1,28 +0,0 @@
-//
-//  NSShadow+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 "NSShadow+PDFListView.h"
-
-@implementation NSShadow (PDFListView)
-
-+ (void)setPDFListViewShadowWithColor:(NSColor *)color blurRadius:(CGFloat)blurRadius offset:(NSSize)offset {
-    NSShadow *aShadow = [[self alloc] init];
-    [aShadow setShadowColor:color];
-    [aShadow setShadowBlurRadius:blurRadius];
-    [aShadow setShadowOffset:offset];
-    [aShadow set];
-}
-
-+ (void)setPDFListViewShadowWithColor:(NSColor *)color blurRadius:(CGFloat)blurRadius yOffset:(CGFloat)yOffset {
-    [self setPDFListViewShadowWithColor:color blurRadius:blurRadius offset:NSMakeSize(0.0, yOffset)];
-}
-@end

+ 0 - 23
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSString+PDFListView.h

@@ -1,23 +0,0 @@
-//
-//  NSString+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 <Foundation/Foundation.h>
-
-
-@interface NSString (PDFListView)
-
-- (NSSize)sizeOfFontSize:(CGFloat)fontSize;
-
-- (NSString *)getMaxStringWithBounds:(CGRect)bounds attributes:attributes;
-
-@end
-

+ 0 - 56
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSString+PDFListView.m

@@ -1,56 +0,0 @@
-//
-//  NSString+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 "NSString+PDFListView.h"
-
-#import "NSImage+PDFListView.h"
-#import "NSGeometry+PDFListView.h"
-#import <CoreFoundation/CoreFoundation.h>
-
-@implementation NSString (PDFListView)
-
-- (NSSize)sizeOfFontSize:(CGFloat)fontSize {
-    NSFont* font = [NSFont fontWithName:@"Helvetica" size:fontSize];
-    NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-    [dictionary setObject:font forKey:NSFontAttributeName];
-    NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
-    [style setAlignment:NSTextAlignmentCenter];
-    [dictionary setObject:style forKey:NSParagraphStyleAttributeName];
-    
-    CGSize size = [self boundingRectWithSize:CGSizeMake(MAXFLOAT, MAXFLOAT)
-                                     options:NSStringDrawingUsesLineFragmentOrigin
-                                  attributes:dictionary].size;
-    
-    return size;
-}
-
-- (NSString *)getMaxStringWithBounds:(CGRect)bounds attributes:attributes {
-    if (self.length < 1) {
-        return @"";
-    }
-    NSString *tString = self;
-    CGRect rect = [tString boundingRectWithSize:CGSizeMake(MAXFLOAT, MAXFLOAT) options:NSStringDrawingTruncatesLastVisibleLine|NSStringDrawingUsesFontLeading|NSStringDrawingUsesLineFragmentOrigin attributes:attributes context:nil];
-    if (rect.size.width > bounds.size.width) {
-        do {
-            if(tString.length < 1) {
-                tString = @"";
-            } {
-                tString = [tString substringToIndex:(tString.length-1)];
-            }
-            rect = [tString boundingRectWithSize:CGSizeMake(MAXFLOAT, MAXFLOAT) options:NSStringDrawingTruncatesLastVisibleLine|NSStringDrawingUsesFontLeading|NSStringDrawingUsesLineFragmentOrigin attributes:attributes context:nil];
-        } while (rect.size.width > bounds.size.width);
-    }
-    
-    return tString;
-}
-
-@end

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

@@ -0,0 +1,63 @@
+//
+//  PDFListView+KMExtensions.swift
+//  PDF Master
+//
+//  Created by tangchao on 2023/10/9.
+//
+
+import Foundation
+
+// MARK: - NSString
+
+@objc extension NSString {
+    func getMaxString(bounds: CGRect, attributes: [NSAttributedString.Key : Any]?) -> NSString {
+        if (self.length < 1) {
+            return ""
+        }
+        var tString = self
+        var rect = tString.boundingRect(with: CGSizeMake(MAXFLOAT.cgFloat, MAXFLOAT.cgFloat), options: [.truncatesLastVisibleLine,.usesFontLeading,.usesLineFragmentOrigin], attributes: attributes, context: nil)
+        if (rect.size.width > bounds.size.width) {
+            repeat {
+                if (tString.length < 1) {
+                    tString = ""
+                } else {
+                    tString = tString.substring(to: tString.length-1) as NSString
+                }
+                rect = tString.boundingRect(with: CGSizeMake(MAXFLOAT.cgFloat, MAXFLOAT.cgFloat), options: [.truncatesLastVisibleLine,.usesFontLeading,.usesLineFragmentOrigin], attributes: attributes, context: nil)
+            } while rect.size.width > bounds.size.width
+        }
+        return tString
+    }
+    /*
+     - (NSSize)sizeOfFontSize:(CGFloat)fontSize {
+         NSFont* font = [NSFont fontWithName:@"Helvetica" size:fontSize];
+         NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+         [dictionary setObject:font forKey:NSFontAttributeName];
+         NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
+         [style setAlignment:NSTextAlignmentCenter];
+         [dictionary setObject:style forKey:NSParagraphStyleAttributeName];
+         
+         CGSize size = [self boundingRectWithSize:CGSizeMake(MAXFLOAT, MAXFLOAT)
+                                          options:NSStringDrawingUsesLineFragmentOrigin
+                                       attributes:dictionary].size;
+         
+         return size;
+     }
+     */
+}
+
+// MARK: - NSShadow
+
+@objc extension NSShadow {
+    class func setPDFListViewShadow(color: NSColor, blurRadius: CGFloat, offset: NSSize) {
+        let aShadow = NSShadow()
+        aShadow.shadowColor = color
+        aShadow.shadowBlurRadius = blurRadius
+        aShadow.shadowOffset = offset
+        aShadow.set()
+    }
+    
+    class func setPDFListViewShadow(color: NSColor, blurRadius: CGFloat, yOffset: CGFloat) {
+        self.setPDFListViewShadow(color: color, blurRadius: blurRadius, offset: NSMakeSize(0, yOffset))
+    }
+}

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFPageExtensions/CPDFPage+PDFListView.swift

@@ -145,7 +145,7 @@ extension CPDFPage {
         NSGraphicsContext.saveGraphicsState()
         NSColor.white.setFill()
         if (shadowBlurRadius > 0.0) {
-            NSShadow.setPDFListViewShadowWith(NSColor.init(calibratedWhite: 0.0, alpha: 0.5), blurRadius: shadowBlurRadius, yOffset: shadowOffset)
+            NSShadow.setPDFListViewShadow(color: NSColor.init(calibratedWhite: 0.0, alpha: 0.5), blurRadius: shadowBlurRadius, yOffset: shadowOffset)
         }
         pageRect.fill()
         NSGraphicsContext.restoreGraphicsState()

+ 0 - 1
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.m

@@ -24,7 +24,6 @@
 #import "CPDFListView+Tool.h"
 #import "CPDFListView+Extension.h"
 #import "CPDFListView+UndoManager.h"
-#import "NSString+PDFListView.h"
 #import "NSImage+PDFListView.h"
 #import "NSCursor+PDFListView.h"
 

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

@@ -17,7 +17,6 @@
 
 #import "NSEvent+PDFListView.h"
 #import "NSImage+PDFListView.h"
-#import "NSShadow+PDFListView.h"
 #import "NSCursor+PDFListView.h"
 #import "NSBezierPath+PDFListView.h"
 #import "CPDFListHoverAnnotationViewController.h"

+ 0 - 1
PDF Office/PDF Master/PDF_Master-Bridging-Header.h

@@ -63,7 +63,6 @@
 #import "KMRecommondManager.h"
 #import "CPDFListView+Extension.h"
 
-#import "NSShadow+PDFListView.h"
 #import "NSGeometry+PDFListView.h"
 #import "CPDFAnnotationHeader.h"
 #import "KMTableRowView.h"