FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the On My Mac account node the drop target when the drop target is otherwise invalid — when dropping nonlocal feeds (URLs, etc. from outside). This way you don’t have to be too precise — you can drag anywhere into the sidebar to add a feed.

Browse Source
This commit is contained in:
Brent Simmons 2018-09-22 14:44:16 -07:00
parent 38b824afca
commit f7ae284b53
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NetNewsWire/MainWindow/Sidebar/SidebarOutlineDataSource.swift
View File

@ -195,10 +195,14 @@ private extension SidebarOutlineDataSource {
} }
func ancestorThatCanAcceptNonLocalFeed(_ node: Node) -> Node? { func ancestorThatCanAcceptNonLocalFeed(_ node: Node) -> Node? {
// Default to the On My Mac account, if needed, so we can always accept a nonlocal feed drop.
if nodeIsDropTarget(node) { if nodeIsDropTarget(node) {
return node return node
} }
guard let parentNode = node.parent else { guard let parentNode = node.parent else {
if let onMyMacAccountNode = treeController.nodeInTreeRepresentingObject(AccountManager.shared.localAccount) {
return onMyMacAccountNode
}
return nil return nil
} }
return ancestorThatCanAcceptNonLocalFeed(parentNode) return ancestorThatCanAcceptNonLocalFeed(parentNode)
@ -208,7 +212,7 @@ private extension SidebarOutlineDataSource {
guard nodeIsDropTarget(parentNode), index == NSOutlineViewDropOnItemIndex else { guard nodeIsDropTarget(parentNode), index == NSOutlineViewDropOnItemIndex else {
return false return false
} }
// Show the add-feed sheet. // Show the add-feed sheet.
let folder = parentNode.representedObject as? Folder let folder = parentNode.representedObject as? Folder
appDelegate.addFeed(draggedFeed.url, name: nil, folder: folder) appDelegate.addFeed(draggedFeed.url, name: nil, folder: folder)