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

fixed merging errors

Browse Source
This commit is contained in:
michael starke
2016-02-29 19:34:29 +01:00
parent 82a80d8e57
commit fc792d2d74
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MacPass/MPOutlineViewController.m
View File

@@ -184,16 +184,16 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
} }
- (void)clearSelection { - (void)clearSelection {
[_outlineView deselectAll:nil]; [self.outlineView deselectAll:nil];
NSNotification *notification = [NSNotification notificationWithName:NSOutlineViewSelectionDidChangeNotification object:_outlineView]; NSNotification *notification = [NSNotification notificationWithName:NSOutlineViewSelectionDidChangeNotification object:self.outlineView];
[self outlineViewSelectionDidChange:notification]; [self outlineViewSelectionDidChange:notification];
} }
- (void)_didBecomeFirstResponder:(NSNotification *)notification { - (void)_didBecomeFirstResponder:(NSNotification *)notification {
if( [notification object] != _outlineView ) { if( [notification object] != self.outlineView ) {
return; // Nothing we need to worry about return; // Nothing we need to worry about
} }
MPDocument *document = [[self windowController] document]; MPDocument *document = self.windowController.document;
document.selectedGroups = [self currentTargetGroups]; document.selectedGroups = [self currentTargetGroups];
} }
@@ -209,8 +209,8 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
if([item isKindOfClass:[KPKGroup class]]) { if([item isKindOfClass:[KPKGroup class]]) {
KPKGroup *group = item; KPKGroup *group = item;
NSLog(@"%@", group.title); NSLog(@"%@", group.title);
KPKTree *tree = [self.treeController.content firstObject]; MPDocument *document = self.windowController.document;
tree.metaData.lastTopVisibleGroup = group.uuid; document.tree.metaData.lastTopVisibleGroup = group.uuid;
} }
} }
@@ -275,10 +275,10 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
} }
- (void)outlineViewSelectionDidChange:(NSNotification *)notification { - (void)outlineViewSelectionDidChange:(NSNotification *)notification {
NSTreeNode *treeNode = [_outlineView itemAtRow:[_outlineView selectedRow]];
KPKGroup *selectedGroup = [treeNode representedObject];
MPDocument *document = self.windowController.document; MPDocument *document = self.windowController.document;
document.selectedGroups = [self currentTargetGroups]; NSArray<KPKGroup *> *groups = [self currentTargetGroups];
document.tree.metaData.lastSelectedGroup = (groups.count == 1 ? groups.firstObject.uuid : [NSUUID nullUUID]);
document.selectedGroups = groups;
} }
- (BOOL)outlineView:(NSOutlineView *)outlineView shouldShowOutlineCellForItem:(id)item { - (BOOL)outlineView:(NSOutlineView *)outlineView shouldShowOutlineCellForItem:(id)item {