change: hold command to avoid delete prompt

netdcy · Nov 22, 2024 · ef36e5f · ef36e5f
1 parent cc6ae14
commit ef36e5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/FlowVision/Sources/ViewController.swift b/FlowVision/Sources/ViewController.swift
@@ -488,12 +488,12 @@ class ViewController: NSViewController, NSSplitViewDelegate {
                 if specialKey == .delete || specialKey == .backspace || specialKey == .deleteForward {
                     //如果焦点在OutlineView
                     if publicVar.isOutlineViewFirstResponder{
-                        outlineView.actDelete(isByKeyboard: true)
+                        outlineView.actDelete(isByKeyboard: true, isShowPrompt: !isCommandPressed)
                         return nil
                     }
                     //如果焦点在CollectionView
                     if publicVar.isCollectionViewFirstResponder{
-                        handleDelete()
+                        handleDelete(isShowPrompt: !isCommandPressed)
                         return nil
                     }
                 }

diff --git a/FlowVision/Sources/Views/CustomOutlineView.swift b/FlowVision/Sources/Views/CustomOutlineView.swift
@@ -244,7 +244,7 @@ class CustomOutlineView: NSOutlineView, NSMenuDelegate {
         pasteboard.writeObjects(urls as [NSPasteboardWriting])
     }
 
-    @objc func actDelete(isByKeyboard: Bool = false) {
+    @objc func actDelete(isByKeyboard: Bool = false, isShowPrompt: Bool = true) {
         var url: URL?
         if isByKeyboard {
             url = getFirstSelectedUrl()
@@ -253,7 +253,7 @@ class CustomOutlineView: NSOutlineView, NSMenuDelegate {
         }
         guard let url = url else {return}
 
-        let result = getViewController(self)?.handleDelete(fileUrls: [url], isShowPrompt: isByKeyboard)
+        let result = getViewController(self)?.handleDelete(fileUrls: [url], isShowPrompt: isByKeyboard && isShowPrompt)
 
         if result == true && curRightClickedIndex != self.selectedRowIndexes.first {
             refreshTreeView()