From bf76cb810de74a1b34428f5302ddaddeb222fb1d Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 11 Mar 2021 19:43:05 -0600 Subject: [PATCH] Change to always copy between accounts. Fixes #2871 --- .../Sidebar/SidebarOutlineDataSource.swift | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift b/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift index 052f9bfca..4438ffd90 100644 --- a/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift +++ b/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift @@ -250,11 +250,7 @@ private extension SidebarOutlineDataSource { return .move } } else { - if NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false { - return .move - } else { - return .copy - } + return .copy } } @@ -453,11 +449,7 @@ private extension SidebarOutlineDataSource { moveWebFeedInAccount(node: node, to: parentNode) } } else { - if NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false { - moveWebFeedBetweenAccounts(node: node, to: parentNode) - } else { - copyWebFeedBetweenAccounts(node: node, to: parentNode) - } + copyWebFeedBetweenAccounts(node: node, to: parentNode) } } @@ -579,11 +571,7 @@ private extension SidebarOutlineDataSource { draggedNodes.forEach { node in if !sameAccount(node, parentNode) { - if NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false { - moveFolderBetweenAccounts(node: node, to: parentNode) - } else { - copyFolderBetweenAccounts(node: node, to: parentNode) - } + copyFolderBetweenAccounts(node: node, to: parentNode) } }