github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clearing search results would still keep FFResultNode objects around

Browse Source 
Since the checkbox button shown in the search results had its values bound directly to an FFResultNode instance, it would retain this object for as long as the checkbox was around, which is basically forever, although it could be reused with another FFResultNode instance, in which case the previous instance would be released.

To avoid this, we have introduced an NSTableCellView that stores the FFResultNode instance as its object value, and the checkbox uses a key path that goes via the object value for the bound values. This still creates a retain cycle, but the NSOutlineView will set all object value properties to nil when its data is cleared, thereby at least releasing the FFResultNode objects.
This commit is contained in:
Allan Odgaard
2016-09-16 15:22:12 +02:00
parent e34a90b30b
commit d021ba0eb2
1 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Frameworks/Find/src/FFResultsViewController.mm
View File

@@ -19,6 +19,34 @@ static FFResultNode* PreviousNode (FFResultNode* node)
return index > 0 ? node.parent.children[index - 1] : nil;
}
// ================================
// = OakSearchResultsCheckboxView =
// ================================
@interface OakSearchResultsCheckboxView : NSTableCellView
@property (nonatomic) NSButton* button;
@end
@implementation OakSearchResultsCheckboxView
- (id)initWithFrame:(NSRect)aFrame
{
NSButton* button = OakCreateCheckBox(nil);
[[button cell] setControlSize:NSSmallControlSize];
[button sizeToFit];
[button setAutoresizingMask:NSViewMinXMargin|NSViewMaxXMargin|NSViewMinYMargin|NSViewMaxYMargin];
if((self = [super initWithFrame:button.frame]))
{
_button = button;
[self addSubview:_button];
[_button bind:NSEnabledBinding toObject:self withKeyPath:@"objectValue.readOnly" options:@{ NSValueTransformerNameBindingOption: NSNegateBooleanTransformerName }];
[_button bind:NSValueBinding toObject:self withKeyPath:@"objectValue.excluded" options:@{ NSValueTransformerNameBindingOption: NSNegateBooleanTransformerName }];
}
return self;
}
@end
// =================================
// = OakSearchResultsMatchCellView =
// =================================
@@ -523,24 +551,15 @@ static FFResultNode* PreviousNode (FFResultNode* node)
if([identifier isEqualToString:@"checkbox"])
{
NSButton* button = res;
if(!button)
OakSearchResultsCheckboxView* cellView = res;
if(!cellView)
{
res = button = OakCreateCheckBox(nil);
button.identifier = identifier;
[[button cell] setControlSize:NSSmallControlSize];
button.action = @selector(toggleExcludedCheckbox:);
button.target = self;
res = cellView = [[OakSearchResultsCheckboxView alloc] initWithFrame:NSZeroRect];
cellView.identifier = identifier;
cellView.button.action = @selector(toggleExcludedCheckbox:);
cellView.button.target = self;
}
else
{
[button unbind:NSEnabledBinding];
[button unbind:NSValueBinding];
}
[button bind:NSEnabledBinding toObject:item withKeyPath:@"readOnly" options:@{ NSValueTransformerNameBindingOption: NSNegateBooleanTransformerName }];
[button bind:NSValueBinding toObject:item withKeyPath:@"excluded" options:@{ NSValueTransformerNameBindingOption: NSNegateBooleanTransformerName }];
button.state = item.excluded ? NSOffState : NSOnState;
cellView.objectValue = item;
}
else if([identifier isEqualToString:@"match"])
{