colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-30 23:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: CPArrayController would throw out of bounds exceptions when its content array was shortened and items at the end were selected.

Browse Source 
Extended avoid empty selection support so that when the last item is selected and deleted, the (previously) second to last item is selected instead. Works as expected with multiple selections.
This commit is contained in:
Alexander Ljungberg
2010-05-26 19:40:55 -04:00
parent ec032cb739
commit 4ff89eab04
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPArrayController.j
+16 -4
View File
@@ -159,6 +159,8 @@
if ([self preservesSelection])
oldSelection = [self selectedObjects];
// Avoid out of bounds selections.
_selectionIndexes = [CPIndexSet indexSet];
//FIXME: copy?
[super setContent:value];
@@ -279,10 +281,20 @@
if ([_selectionIndexes isEqualToIndexSet:indexes])
return NO;
if(![indexes count] && _avoidsEmptySelection && [[self arrangedObjects] count])
indexes = [CPIndexSet indexSetWithIndex:0];
[indexes removeIndexesInRange:CPMakeRange([[self arrangedObjects] count]+1, CPNotFound)];
if (![indexes count])
{
if(_avoidsEmptySelection && [[self arrangedObjects] count])
indexes = [CPIndexSet indexSetWithIndex:0];
}
else
{
var objectsCount = [[self arrangedObjects] count];
// Remove out of bounds indexes.
[indexes removeIndexesInRange:CPMakeRange(objectsCount, [indexes lastIndex])];
// When avoiding empty selection and the deleted selection was at the bottom, select the last item.
if(![indexes count] && _avoidsEmptySelection && objectsCount)
indexes = [CPIndexSet indexSetWithIndex:objectsCount-1];
}
[self willChangeValueForKey:@"selectionIndexes"];
[self _selectionWillChange];