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

Fix suggestion for upward dragging drop zones. Issue #1360

This commit is contained in:
Maurice Parker 2019-11-26 13:42:25 -06:00
parent 19336dd07e
commit 3d1f68a877
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iOS/MasterFeed/MasterFeedViewController.swift
View File

@ -349,18 +349,20 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
var sortedNodes = nodes.sortedAlphabeticallyWithFoldersAtEnd() var sortedNodes = nodes.sortedAlphabeticallyWithFoldersAtEnd()
let index = sortedNodes.firstIndex(of: draggedNode)! let index = sortedNodes.firstIndex(of: draggedNode)!
sortedNodes.remove(at: index)
if index == 0 { if index == 0 {
if parentNode.representedObject is Account { if parentNode.representedObject is Account {
return IndexPath(row: 0, section: destIndexPath.section) return IndexPath(row: 0, section: destIndexPath.section)
} else { } else {
return dataSource.indexPath(for: parentNode)! let candidateIndexPath = dataSource.indexPath(for: sortedNodes[index])!
let movementAdjustment = sourceIndexPath < destIndexPath ? 1 : 0
return IndexPath(row: candidateIndexPath.row - movementAdjustment, section: candidateIndexPath.section)
} }
} else { } else {
sortedNodes.remove(at: index)
if index >= sortedNodes.count { if index >= sortedNodes.count {
let lastSortedIndexPath = dataSource.indexPath(for: sortedNodes[sortedNodes.count - 1])! let lastSortedIndexPath = dataSource.indexPath(for: sortedNodes[sortedNodes.count - 1])!
let movementAdjustment = sourceIndexPath > destIndexPath ? 1 : 0 let movementAdjustment = sourceIndexPath > destIndexPath ? 1 : 0