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

Merge branch 'issue_drag_and_drop_uses_selection_not_cicked'

Browse Source
This commit is contained in:
michael starke
2016-10-19 11:44:58 +02:00
parent 0325ede0aa 0f9364e8b6
commit 984ef611f3
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MacPass/MPEntryTableDataSource.m
View File

@@ -32,7 +32,10 @@
@implementation MPEntryTableDataSource
- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard {
NSArray *entries = self.viewController.entryArrayController.selectedObjects;
NSMutableArray *entries = [[NSMutableArray alloc] initWithCapacity:rowIndexes.count];
[rowIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
[entries addObject:self.viewController.entryArrayController.arrangedObjects[idx]];
}];
for(KPKEntry *entry in entries) {
if(![entry isKindOfClass:[KPKEntry class]]) {
return NO;

7
MacPass/MPEntryViewController.m
View File

@@ -333,8 +333,8 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
}
else if(isHistoryColumn) {
NSString *historyCountKeyPath = [NSString stringWithFormat:@"%@.%@.@count",
NSStringFromSelector(@selector(objectValue)),
NSStringFromSelector(@selector(history))];
NSStringFromSelector(@selector(objectValue)),
NSStringFromSelector(@selector(history))];
[view.textField bind:NSValueBinding toObject:view withKeyPath:historyCountKeyPath options:nil];
}
}
@@ -359,11 +359,10 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
#pragma mark MPTargetItemResolving
- (NSArray<KPKEntry *> *)currentTargetEntries {
/*NSInteger activeRow = self.entryTable.clickedRow;
NSInteger activeRow = self.entryTable.clickedRow;
if(activeRow > -1) {
return @[ [self.entryArrayController arrangedObjects][activeRow] ];
}
*/
return self.entryArrayController.selectedObjects;
}

2
MacPass/MPOutlineDataSource.m
View File

@@ -39,7 +39,7 @@
if(items.count != 1) {
return NO;
}
self.localDraggedGroup = nil; id item = [[items lastObject] representedObject];
self.localDraggedGroup = nil; id item = [items.lastObject representedObject];
if(![item isKindOfClass:[KPKGroup class]]) {
return NO;
}