github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-22 21:27:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Skip group cells when selecting item after delete (file browser)

Browse Source 
Presently this is only relevant for the SCM Status view, as no other data source use group cells.
This commit is contained in:
Allan Odgaard
2013-02-11 14:21:22 +01:00
parent df8465e607
commit af37d2e30a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Frameworks/OakFileBrowser/src/OakFileBrowser.mm
View File

@@ -620,6 +620,11 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
}
}
- (BOOL)canSelectRow:(NSUInteger)row
{
return ![[_outlineView delegate] respondsToSelector:@selector(outlineView:isGroupItem:)] || ![[_outlineView delegate] outlineView:_outlineView isGroupItem:[_outlineView itemAtRow:row]];
}
- (void)delete:(id)anArgument
{
NSIndexSet* indexSet = [_outlineView selectedRowIndexes];
@@ -627,11 +632,11 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
return;
NSUInteger rowToSelect = [indexSet lastIndex];
while(rowToSelect < [_outlineView numberOfRows] && [indexSet containsIndex:rowToSelect])
while(rowToSelect < [_outlineView numberOfRows] && ([indexSet containsIndex:rowToSelect] || ![self canSelectRow:rowToSelect]))
++rowToSelect;
if(rowToSelect == [_outlineView numberOfRows])
do { --rowToSelect; } while(rowToSelect > 0 && [indexSet containsIndex:rowToSelect]);
do { --rowToSelect; } while(rowToSelect > 0 && [indexSet containsIndex:rowToSelect] && ![self canSelectRow:rowToSelect]);
FSItem* itemToSelect = [indexSet containsIndex:rowToSelect] ? nil : [_outlineView itemAtRow:rowToSelect];