From 29d46d3cb4690930877ab2f21e714e014c070d43 Mon Sep 17 00:00:00 2001 From: haikusw Date: Wed, 8 Jun 2022 13:14:49 -0700 Subject: [PATCH] rename to shorter version since we no longer need to distinguish between this and other dragOperation type. --- Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift b/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift index 157ad2494..7e0478d5f 100644 --- a/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift +++ b/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift @@ -211,13 +211,13 @@ private extension SidebarOutlineDataSource { return SidebarOutlineDataSource.dragOperationNone } if parentNode == dropTargetNode && index == NSOutlineViewDropOnItemIndex { - return localDragFeedPasteboardOperation(parentNode: parentNode, Set([draggedFeed])) + return localDragOperation(parentNode: parentNode, Set([draggedFeed])) } let updatedIndex = indexWhereDraggedFeedWouldAppear(dropTargetNode, draggedFeed) if parentNode !== dropTargetNode || index != updatedIndex { outlineView.setDropItem(dropTargetNode, dropChildIndex: updatedIndex) } - return localDragFeedPasteboardOperation(parentNode: parentNode, Set([draggedFeed])) + return localDragOperation(parentNode: parentNode, Set([draggedFeed])) } func validateLocalFeedsDrop(_ outlineView: NSOutlineView, _ draggedFeeds: Set, _ parentNode: Node, _ index: Int) -> NSDragOperation { @@ -234,10 +234,10 @@ private extension SidebarOutlineDataSource { if parentNode !== dropTargetNode || index != NSOutlineViewDropOnItemIndex { outlineView.setDropItem(dropTargetNode, dropChildIndex: NSOutlineViewDropOnItemIndex) } - return localDragFeedPasteboardOperation(parentNode: parentNode, draggedFeeds) + return localDragOperation(parentNode: parentNode, draggedFeeds) } - func localDragFeedPasteboardOperation(parentNode: Node, _ draggedFeeds: Set)-> NSDragOperation { + func localDragOperation(parentNode: Node, _ draggedFeeds: Set)-> NSDragOperation { guard let firstDraggedFeed = draggedFeeds.first else { return .move } if sameAccount(firstDraggedFeed, parentNode) { if NSApplication.shared.currentEvent?.modifierFlags.contains(.option) ?? false {