【图片转PDF】cell响应范围优化

PDF Office/PDF Master/Class/PDFTools/ImageToPDF/View/KMBatchProcessingView/Tableview/Views/Tableview/Views/KMBatchProcessingTableRowView.swift

@@ -13,6 +13,7 @@ typealias KMBatchProcessingTableRowViewRightMouseCallback = (_ view: KMBatchProc
 class KMBatchProcessingTableRowView: NSTableRowView {
     var model: KMBatchProcessingTableViewModel!
     var box: KMBox?
+    var contentBox: KMBox?
     var mouseDownCallback: KMBatchProcessingTableRowViewMouseDownCallback?
     var hoverCallback: KMBatchProcessingTableRowViewHoverCallback?
     var rightMouseCallback: KMBatchProcessingTableRowViewRightMouseCallback?
@@ -42,22 +43,29 @@ class KMBatchProcessingTableRowView: NSTableRowView {
             self.box?.boxType = .custom
             self.addSubview(self.box!, positioned: NSWindow.OrderingMode.below, relativeTo: self)
             self.box?.moveCallback = { [unowned self] (mouseEntered, mouseBox) in
-//                if mouseEntered {
-//                    self.hover = true
-//                } else {
-//                    self.hover = false
-//                }
-//                self.needsDisplay = true
                 if self.hoverCallback != nil {
                     self.hoverCallback!(mouseEntered, self.box!)
                 }
             }
+
+            self.contentBox = KMBox(frame: rect)
+            self.contentBox?.boxType = .custom
+            self.contentBox?.borderWidth = 0
+            self.contentBox?.borderColor = NSColor(hex: "#CED0D4")
+            self.contentBox?.layer?.cornerRadius = 0
+            self.addSubview(self.contentBox!, positioned: NSWindow.OrderingMode.above, relativeTo: self)
+            
+            self.contentBox?.downCallback = { [unowned self] (downEntered, mouseBox, event) in
+                if self.mouseDownCallback != nil {
+                    self.mouseDownCallback!(downEntered, self.box!)
+                }
+            }
             
-//            self.box?.downCallback = { [unowned self] (downEntered, mouseBox, event) in
-//                if self.mouseDownCallback != nil {
-//                    self.mouseDownCallback!(downEntered, self.box!)
-//                }
-//            }
+            self.contentBox?.rightDownCallback = { [unowned self] (downEntered, mouseBox, event) in
+                if self.rightMouseCallback != nil {
+                    self.rightMouseCallback!(self, event)
+                }
+            }
         }
     }
     
@@ -80,19 +88,6 @@ class KMBatchProcessingTableRowView: NSTableRowView {
     }
     
     func drawView(_ color: NSColor = NSColor(hex: "#CED0D4", alpha: 0.6)) {
-//        if hover || itemSelect {
-//            color.setFill()
-//
-//            var rect = self.bounds
-//            rect.origin.x = self.bounds.origin.x + 16.0
-//            rect.origin.y = self.bounds.origin.y + 2
-//            rect.size.height = self.bounds.size.height - 4
-//            rect.size.width = self.bounds.size.width - 32.0
-//
-//            let path = NSBezierPath(roundedRect: rect, xRadius: 4, yRadius: 4)
-//            path.fill()
-//        }
-        
         if model.select {
             self.box?.backgroundColor(NSColor(hex: "#CED0D4", alpha: 0.6))
             self.box?.borderWidth = 1
@@ -106,19 +101,6 @@ class KMBatchProcessingTableRowView: NSTableRowView {
             self.box?.borderWidth = 0
         }
     }
-    
-    override func rightMouseUp(with event: NSEvent) {
-        if self.rightMouseCallback != nil {
-            self.rightMouseCallback!(self, event)
-        }
-    }
-    
-    override func mouseDown(with event: NSEvent) {
-        super.mouseDown(with: event)
-        if self.mouseDownCallback != nil {
-            self.mouseDownCallback!(true, self.box!)
-        }
-    }
 }
 
 extension KMBatchProcessingTableRowView {