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

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

@ -249,14 +249,10 @@ private extension SidebarOutlineDataSource {
} else { } else {
return .move return .move
} }
} else {
if NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false {
return .move
} else { } else {
return .copy return .copy
} }
} }
}
func accountForNode(_ node: Node) -> Account? { func accountForNode(_ node: Node) -> Account? {
if let account = node.representedObject as? Account { if let account = node.representedObject as? Account {
@ -452,14 +448,10 @@ private extension SidebarOutlineDataSource {
} else { } else {
moveWebFeedInAccount(node: node, to: parentNode) moveWebFeedInAccount(node: node, to: parentNode)
} }
} else {
if NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false {
moveWebFeedBetweenAccounts(node: node, to: parentNode)
} else { } else {
copyWebFeedBetweenAccounts(node: node, to: parentNode) copyWebFeedBetweenAccounts(node: node, to: parentNode)
} }
} }
}
return true return true
} }
@ -579,13 +571,9 @@ 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 {
moveFolderBetweenAccounts(node: node, to: parentNode)
} else {
copyFolderBetweenAccounts(node: node, to: parentNode) copyFolderBetweenAccounts(node: node, to: parentNode)
} }
} }
}
return true return true
} }