Bladeren bron

优化 - 测试文件列表加入右键菜单功能(ShowInFinder & Delete)

zhudongyong 2 jaren geleden
bovenliggende
commit
7a2e65c815

BIN
KdanAutoTest/KdanAuto.xcodeproj/project.xcworkspace/xcuserdata/zhudongyong.xcuserdatad/UserInterfaceState.xcuserstate


+ 8 - 3
KdanAutoTest/KdanAuto/Class/Norrmal/Cell/TestFileCellView.swift

@@ -65,9 +65,14 @@ class TestFileCellView : NSTableCellView, NSMenuDelegate {
         self.menu?.delegate = self;
         
         NSEvent.addLocalMonitorForEvents(matching: NSEvent.EventTypeMask.rightMouseUp) { event in
-            if (event.type == .rightMouseUp) {
-                NSMenu.popUpContextMenu(self.menu!, with: event, for: self)
-                return nil;
+            var point = event.locationInWindow;
+            if (nil != self.window?.contentView) {
+                point = self.window!.contentView!.convert(point, to: self)
+                
+                if (event.type == .rightMouseUp && CGRectContainsPoint(self.bounds, point)) {
+                    NSMenu.popUpContextMenu(self.menu!, with: event, for: self)
+                    return nil;
+                }
             }
             
             return event

+ 1 - 1
KdanAutoTest/KdanAuto/Class/Tools/FileConveter/FileConverter.swift

@@ -128,7 +128,7 @@ class FileConverter : NSObject, CPDFConverterDelegate, CPDFConverterFPDelegate {
                     }
                     if (params != nil) {
                         if let dipValue = params!["imageDpi"] as? NSNumber {
-                            if (CPDFConvertKit.sharedInstance().buildNumber >= 150) {
+                            if (CPDFConvertKit.sharedInstance().buildNumber > 150) {
                                 try? (self.options as! CPDFConvertImgOptions).imageDpi = Int32(dipValue.intValue)
                             }
                         }