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

restoring of last visibleTopGroup and lastSelectedGroup is working

Browse Source
This commit is contained in:
michael starke
2016-02-29 19:20:55 +01:00
parent 80d4b0e99e
commit d3380c830e
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
MacPass/MPOutlineViewController.m
View File

@@ -110,13 +110,20 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
_bindingEstablished = YES; _bindingEstablished = YES;
} }
NSTreeNode *node = [_outlineView itemAtRow:0]; NSTreeNode *node = [_outlineView itemAtRow:0];
[self _expandItems:node]; NSInteger topRow;
[self _expandItems:node topRow:&topRow];
if(topRow > 0) {
NSRect rowRect = [self.outlineView rectOfRow:topRow];
[self.outlineView scrollPoint:rowRect.origin];
}
} }
- (void)_expandItems:(NSTreeNode *)node { - (void)_expandItems:(NSTreeNode *)node topRow:(NSInteger *)topRow {
NSAssert(NULL != topRow, @"Invalid paramter!");
id nodeItem = node.representedObject; id nodeItem = node.representedObject;
if([nodeItem isKindOfClass:[KPKTree class]]) { if([nodeItem isKindOfClass:[KPKTree class]]) {
[self.outlineView expandItem:node expandChildren:NO]; [self.outlineView expandItem:node expandChildren:NO];
*topRow = -1;
} }
else if([nodeItem respondsToSelector:@selector(isExpanded)]) { else if([nodeItem respondsToSelector:@selector(isExpanded)]) {
if([nodeItem isExpanded]) { if([nodeItem isExpanded]) {
@@ -127,7 +134,20 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
} }
} }
for(NSTreeNode *child in node.childNodes) { for(NSTreeNode *child in node.childNodes) {
[self _expandItems:child]; [self _expandItems:child topRow:topRow];
}
if([nodeItem respondsToSelector:@selector(uuid)]) {
MPDocument *document = self.windowController.document;
NSUUID *uuid = [nodeItem uuid];
if(*topRow != 1 && [document.tree.metaData.lastTopVisibleGroup isEqual:uuid]) {
*topRow = [self.outlineView rowForItem:node];
}
if([uuid isEqual:document.tree.metaData.lastSelectedGroup]) {
NSInteger selectedRow = [self.outlineView rowForItem:node];
if(selectedRow >= 0) {
[self.outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow] byExtendingSelection:NO];
}
}
} }
} }
@@ -180,10 +200,13 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
if(nil == clipView || self.outlineView.enclosingScrollView.contentView != clipView) { if(nil == clipView || self.outlineView.enclosingScrollView.contentView != clipView) {
return; // Wrong view return; // Wrong view
} }
NSInteger topRow = [self.outlineView rowAtPoint:clipView.bounds.origin]; /* padding to compensate for clipped items */
CGPoint point = CGPointMake(clipView.bounds.origin.x, clipView.bounds.origin.y + 11);
NSInteger topRow = [self.outlineView rowAtPoint:point];
id item = [[self.outlineView itemAtRow:topRow] representedObject]; id item = [[self.outlineView itemAtRow:topRow] representedObject];
if([item isKindOfClass:[KPKGroup class]]) { if([item isKindOfClass:[KPKGroup class]]) {
KPKGroup *group = item; KPKGroup *group = item;
NSLog(@"%@", group.title);
KPKTree *tree = [self.treeController.content firstObject]; KPKTree *tree = [self.treeController.content firstObject];
tree.metaData.lastTopVisibleGroup = group.uuid; tree.metaData.lastTopVisibleGroup = group.uuid;
} }
@@ -253,6 +276,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
NSTreeNode *treeNode = [_outlineView itemAtRow:[_outlineView selectedRow]]; NSTreeNode *treeNode = [_outlineView itemAtRow:[_outlineView selectedRow]];
KPKGroup *selectedGroup = [treeNode representedObject]; KPKGroup *selectedGroup = [treeNode representedObject];
MPDocument *document = [[self windowController] document]; MPDocument *document = [[self windowController] document];
document.tree.metaData.lastSelectedGroup = selectedGroup ? selectedGroup.uuid : [NSUUID nullUUID];
document.selectedGroup = selectedGroup; document.selectedGroup = selectedGroup;
} }