FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change to always copy between accounts. Fixes #2871

This commit is contained in:
Maurice Parker 2021-03-11 19:43:05 -06:00
parent b475aa2ca6
commit bf76cb810d
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift
View File

@ -250,11 +250,7 @@ private extension SidebarOutlineDataSource {
return .move return .move
} }
} else { } else {
if NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false { return .copy
return .move
} else {
return .copy
}
} }
} }
@ -453,11 +449,7 @@ private extension SidebarOutlineDataSource {
moveWebFeedInAccount(node: node, to: parentNode) moveWebFeedInAccount(node: node, to: parentNode)
} }
} else { } else {
if NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false { copyWebFeedBetweenAccounts(node: node, to: parentNode)
moveWebFeedBetweenAccounts(node: node, to: parentNode)
} else {
copyWebFeedBetweenAccounts(node: node, to: parentNode)
}
} }
} }
@ -579,11 +571,7 @@ private extension SidebarOutlineDataSource {
draggedNodes.forEach { node in draggedNodes.forEach { node in
if !sameAccount(node, parentNode) { if !sameAccount(node, parentNode) {
if NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false { copyFolderBetweenAccounts(node: node, to: parentNode)
moveFolderBetweenAccounts(node: node, to: parentNode)
} else {
copyFolderBetweenAccounts(node: node, to: parentNode)
}
} }
} }