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

Fixed: CPArrayController could get out of bounds selections if a call to rearrangeObjects caused objects to disappear from the arranged set.

Browse Source
This commit is contained in:
Alexander Ljungberg
2010-05-26 19:41:34 -04:00
parent 4ff89eab04
commit 8a8af0e4a9
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPArrayController.j
+20
View File
@@ -209,7 +209,27 @@
- (void)rearrangeObjects
{
// Rearranging reapplies the selection criteria and may cause objects to disappear,
// so take care of the selection.
//
// Sometimes rearrangeObjects is called by setContent which may cause two rounds of
// selection preservation. This is okay because setContent temporarily clears the
// selection and so this code below ends up preserving nothing in that case.
var oldSelection = nil,
oldSelectionIndexes = [[self selectionIndexes] copy];
if ([self preservesSelection])
oldSelection = [self selectedObjects];
// Avoid out of bounds selections.
_selectionIndexes = [CPIndexSet indexSet];
[self _setArrangedObjects:[self arrangeObjects:[self contentArray]]];
if (oldSelection)
[self setSelectedObjects:oldSelection];
else
[self setSelectionIndexes:oldSelectionIndexes];
}
- (void)_setArrangedObjects:(id)value