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

Make drop code work for special case of where the destination row is 0.

This commit is contained in:
Maurice Parker 2019-04-20 08:46:58 -05:00
parent 057fcc3a60
commit d020e93807
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
iOS/Master/MasterViewController.swift
View File

@ -324,20 +324,27 @@ class MasterViewController: UITableViewController, UndoableCommandRunner {
override func tableView(_ tableView: UITableView, moveRowAt sourceIndexPath: IndexPath, to destinationIndexPath: IndexPath) { override func tableView(_ tableView: UITableView, moveRowAt sourceIndexPath: IndexPath, to destinationIndexPath: IndexPath) {
let movementAdjustment = sourceIndexPath > destinationIndexPath ? 1 : 0 guard let sourceNode = nodeFor(sourceIndexPath), let feed = sourceNode.representedObject as? Feed else {
let adjustedDestIndexPath = IndexPath(row: destinationIndexPath.row - movementAdjustment, section: destinationIndexPath.section) return
guard let sourceNode = nodeFor(sourceIndexPath),
let destNode = nodeFor(adjustedDestIndexPath),
let feed = sourceNode.representedObject as? Feed else {
return
} }
// Based on the drop we have to determine a node to start looking for a parent container.
let destNode: Node = {
if destinationIndexPath.row == 0 {
return treeController.rootNode.childAtIndex(destinationIndexPath.section)!
} else {
let movementAdjustment = sourceIndexPath > destinationIndexPath ? 1 : 0
let adjustedDestIndexPath = IndexPath(row: destinationIndexPath.row - movementAdjustment, section: destinationIndexPath.section)
return nodeFor(adjustedDestIndexPath)!
}
}()
// Now we start looking for the parent container
let destParentNode: Node? = { let destParentNode: Node? = {
if destNode.representedObject is Folder { if destNode.representedObject is Container {
return destNode return destNode
} else { } else {
if destNode.parent?.representedObject is Folder { if destNode.parent?.representedObject is Container {
return destNode.parent! return destNode.parent!
} else { } else {
return nil return nil
@ -345,6 +352,7 @@ class MasterViewController: UITableViewController, UndoableCommandRunner {
} }
}() }()
// Move the Feed
let account = accountForNode(destNode) let account = accountForNode(destNode)
let sourceContainer = sourceNode.parent?.representedObject as? Container let sourceContainer = sourceNode.parent?.representedObject as? Container
let destinationFolder = destParentNode?.representedObject as? Folder let destinationFolder = destParentNode?.representedObject as? Folder