nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 22:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only allow for reordering drag if the sorting is index based

Browse Source
This commit is contained in:
Michael Starke
2018-11-14 17:38:04 +01:00
parent ceb3dba6f1
commit ada4b51b62
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MacPass/MPEntryTableDataSource.m
View File

@@ -54,8 +54,16 @@
if(MPDisplayModeEntries != self.viewController.displayMode) { if(MPDisplayModeEntries != self.viewController.displayMode) {
return NSDragOperationNone; return NSDragOperationNone;
} }
BOOL isLocalDrag = info.draggingSource == tableView;
if(isLocalDrag) {
/* local drag is not usefull if the table is displaying sorted */
NSArray<NSSortDescriptor *> * sortDescriptors = tableView.sortDescriptors;
if(sortDescriptors.count != 0 && sortDescriptors.firstObject.key != NSStringFromSelector(@selector(index))) {
return NSDragOperationNone;
}
}
BOOL makeCopy = !isLocalDrag || (info.draggingSourceOperationMask == NSDragOperationCopy);
BOOL makeCopy = (info.draggingSourceOperationMask == NSDragOperationCopy);
if(dropOperation == NSTableViewDropOn) { if(dropOperation == NSTableViewDropOn) {
[tableView setDropRow:row+1 dropOperation:NSTableViewDropAbove]; [tableView setDropRow:row+1 dropOperation:NSTableViewDropAbove];
} }
@@ -88,6 +96,7 @@
[entry.undoManager setActionName:NSLocalizedString(@"MOVE_ENTRY", @"Action name when an entry was moved")]; [entry.undoManager setActionName:NSLocalizedString(@"MOVE_ENTRY", @"Action name when an entry was moved")];
} }
} }
[self.viewController.entryArrayController rearrangeObjects];
return YES; return YES;
} }
else { else {