colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-03 07:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Previoulsly, clearsFilterPredicateOnInsertion was applied (removes filter predicate) when setting content or on content binding. (#2860)

Browse Source 
With Tests: Foundation unit test.
Solves #2791
This commit is contained in:
cacaodev
2019-11-12 14:02:35 +01:00
committed by Martin Carlberg
parent ac68fec6b1
commit 623ad2b1dc
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPArrayController.j
+1 -10
View File
@@ -297,27 +297,18 @@
class.
*/
if (_clearsFilterPredicateOnInsertion)
[self willChangeValueForKey:@"filterPredicate"];
// Don't use [super setContent:] as that would fire the contentObject change.
// We need to be in control of when notifications fire.
// Note that if we have a contentArray binding, setting the content does /not/
// cause a reverse binding set.
_contentObject = value;
if (_clearsFilterPredicateOnInsertion && _filterPredicate != nil)
[self __setFilterPredicate:nil]; // Causes a _rearrangeObjects.
else
[self _rearrangeObjects];
[self _rearrangeObjects];
if ([self preservesSelection])
[self __setSelectedObjects:oldSelectedObjects];
else
[self __setSelectionIndexes:oldSelectionIndexes];
if (_clearsFilterPredicateOnInsertion)
[self didChangeValueForKey:@"filterPredicate"];
}
/*!