mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-16 11:40:42 +00:00
New: deprecate -tableView:dataViewForTableColumn:row: and -outlineView:dataViewForTableColumn:item:
-tableView:dataViewForTableColumn:row: and -outlineView:dataViewForTableColumn:item: are deprecated in favor of ...viewForTableColumn:... Using the previous delegate API and not caching the view with an identifier was degrading performance. With this change, developers are encouraged to use the new caching system and the CPTableView method -makeViewWithIdentifier:owner: to get the view. Also fixed a condition where a view-based outline view was not always asking for the view from its delegate. In some circumstances, an outline view could be considered as view-based instead of cell-based. Test for deprecated delegate methods in CPOutlineViewViewBasedCib and TableTest/ViewBased examples. Fixes #1823
This commit is contained in:
1 parent
d25ff21030
commit
7225e7e038
4 files changed
+62
-31
No files matched your search
+23
-11
@@ -52,6 +52,7 @@ var CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_
|
||||
CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_ = 1 << 11;
|
||||
|
||||
var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_ = 1 << 1,
|
||||
CPOutlineViewDelegate_outlineView_viewForTableColumn_item_ = 1 << 26,
|
||||
CPOutlineViewDelegate_outlineView_didClickTableColumn_ = 1 << 2,
|
||||
CPOutlineViewDelegate_outlineView_didDragTableColumn_ = 1 << 3,
|
||||
CPOutlineViewDelegate_outlineView_heightOfRowByItem_ = 1 << 4,
|
||||
@@ -871,6 +872,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff = 0,
|
||||
|
||||
var delegateMethods = [
|
||||
CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_ , @selector(outlineView:dataViewForTableColumn:item:),
|
||||
CPOutlineViewDelegate_outlineView_viewForTableColumn_item_ , @selector(outlineView:viewForTableColumn:item:),
|
||||
CPOutlineViewDelegate_outlineView_didClickTableColumn_ , @selector(outlineView:didClickTableColumn:),
|
||||
CPOutlineViewDelegate_outlineView_didDragTableColumn_ , @selector(outlineView:didDragTableColumn:),
|
||||
CPOutlineViewDelegate_outlineView_heightOfRowByItem_ , @selector(outlineView:heightOfRowByItem:),
|
||||
@@ -963,6 +965,10 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff = 0,
|
||||
name:CPOutlineViewItemDidCollapseNotification
|
||||
object:self];
|
||||
|
||||
[self _updateIsViewBased];
|
||||
|
||||
if ([self _delegateRespondsToDataViewForTableColumn])
|
||||
CPLog.warn("outlineView:dataViewForTableColumn:item: is deprecated. You should use -outlineView:viewForTableColumn:item: where you can request the view with -makeViewWithIdentifier:owner:");
|
||||
}
|
||||
|
||||
- (BOOL)_sendDelegateDeleteKeyPressed
|
||||
@@ -1534,11 +1540,26 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff = 0,
|
||||
[super keyDown:anEvent];
|
||||
}
|
||||
|
||||
- (CPView)_viewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
|
||||
{
|
||||
return [_outlineViewDelegate outlineView:self viewForTableColumn:aTableColumn item:[self itemAtRow:aRow]];
|
||||
}
|
||||
|
||||
- (CPView)_dataViewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
|
||||
{
|
||||
return [_outlineViewDelegate outlineView:self dataViewForTableColumn:aTableColumn item:[self itemAtRow:aRow]];
|
||||
}
|
||||
|
||||
- (BOOL)_dataSourceRespondsToObjectValueForTableColumn
|
||||
{
|
||||
return _implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_;
|
||||
}
|
||||
|
||||
- (BOOL)_delegateRespondsToViewForTableColumn
|
||||
{
|
||||
return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_viewForTableColumn_item_;
|
||||
}
|
||||
|
||||
- (BOOL)_delegateRespondsToDataViewForTableColumn
|
||||
{
|
||||
return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_;
|
||||
@@ -1893,17 +1914,6 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
|
||||
return [_outlineView menu] || [[_outlineView class] defaultMenu];
|
||||
}
|
||||
|
||||
- (CPView)tableView:(CPTableView)aTableView dataViewForTableColumn:(CPTableColumn)aTableColumn row:(int)aRow
|
||||
{
|
||||
if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
|
||||
{
|
||||
var item = [_outlineView itemAtRow:aRow];
|
||||
return [_outlineView._outlineViewDelegate outlineView:_outlineView dataViewForTableColumn:aTableColumn item:item]
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation CPDisclosureButton : CPButton
|
||||
@@ -2007,6 +2017,8 @@ var CPOutlineViewIndentationPerLevelKey = @"CPOutlineViewIndentationPerLevelKey"
|
||||
|
||||
[super setDataSource:[[_CPOutlineViewTableViewDataSource alloc] initWithOutlineView:self]];
|
||||
[super setDelegate:[[_CPOutlineViewTableViewDelegate alloc] initWithOutlineView:self]];
|
||||
|
||||
[self _updateIsViewBased];
|
||||
}
|
||||
|
||||
return self;
|
||||
|
||||
+34
-16
@@ -62,7 +62,8 @@ var CPTableViewDataSource_numberOfRowsInTableView_
|
||||
CPTableViewDataSource_tableView_sortDescriptorsDidChange_ = 1 << 7;
|
||||
|
||||
var CPTableViewDelegate_selectionShouldChangeInTableView_ = 1 << 0,
|
||||
CPTableViewDelegate_tableView_dataViewForTableColumn_row_ = 1 << 1,
|
||||
CPTableViewDelegate_tableView_viewForTableColumn_row_ = 1 << 1,
|
||||
CPTableViewDelegate_tableView_dataViewForTableColumn_row_ = 1 << 21,
|
||||
CPTableViewDelegate_tableView_didClickTableColumn_ = 1 << 2,
|
||||
CPTableViewDelegate_tableView_didDragTableColumn_ = 1 << 3,
|
||||
CPTableViewDelegate_tableView_heightOfRow_ = 1 << 4,
|
||||
@@ -263,6 +264,8 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
|
||||
BOOL _isViewBased;
|
||||
BOOL _contentBindingExpicitelySet;
|
||||
|
||||
SEL _viewForTableColumnRowSelector;
|
||||
|
||||
CPTableColumn _draggedColumn;
|
||||
CPArray _differedColumnDataToRemove;
|
||||
}
|
||||
@@ -379,6 +382,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
|
||||
_exposedColumns = [CPIndexSet indexSet];
|
||||
_cachedDataViews = { };
|
||||
_archivedDataViews = nil;
|
||||
_viewForTableColumnRowSelector = nil;
|
||||
_unavailable_custom_cibs = { };
|
||||
_cachedRowHeights = [];
|
||||
|
||||
@@ -2675,8 +2679,13 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
|
||||
if ([_delegate respondsToSelector:@selector(selectionShouldChangeInTableView:)])
|
||||
_implementedDelegateMethods |= CPTableViewDelegate_selectionShouldChangeInTableView_;
|
||||
|
||||
if ([_delegate respondsToSelector:@selector(tableView:dataViewForTableColumn:row:)])
|
||||
if ([_delegate respondsToSelector:@selector(tableView:viewForTableColumn:row:)])
|
||||
_implementedDelegateMethods |= CPTableViewDelegate_tableView_viewForTableColumn_row_;
|
||||
else if ([_delegate respondsToSelector:@selector(tableView:dataViewForTableColumn:row:)])
|
||||
{
|
||||
_implementedDelegateMethods |= CPTableViewDelegate_tableView_dataViewForTableColumn_row_;
|
||||
CPLog.warn("tableView:dataViewForTableColumn: is deprecated. You should use -tableView:viewForTableColumn: where you can request the view with -makeViewWithIdentifier:owner:");
|
||||
}
|
||||
|
||||
[self _updateIsViewBased];
|
||||
|
||||
@@ -3244,6 +3253,11 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
|
||||
return _implementedDelegateMethods & CPTableViewDelegate_tableView_dataViewForTableColumn_row_;
|
||||
}
|
||||
|
||||
- (BOOL)_delegateRespondsToViewForTableColumn
|
||||
{
|
||||
return _implementedDelegateMethods & CPTableViewDelegate_tableView_viewForTableColumn_row_;
|
||||
}
|
||||
|
||||
/*!
|
||||
@ignore
|
||||
*/
|
||||
@@ -3268,7 +3282,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
|
||||
objectValue = [_dataSource tableView:self objectValueForTableColumn:aTableColumn row:aRowIndex];
|
||||
tableColumnObjectValues[aRowIndex] = objectValue;
|
||||
}
|
||||
else if (![self _delegateRespondsToDataViewForTableColumn] && ![self infoForBinding:@"content"])
|
||||
else if (!_isViewBased && ![self infoForBinding:@"content"])
|
||||
{
|
||||
CPLog.warn(@"no content binding established and data source " + [_dataSource description] + " does not implement tableView:objectValueForTableColumn:row:");
|
||||
}
|
||||
@@ -3653,19 +3667,14 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
|
||||
/*!
|
||||
@ignore
|
||||
*/
|
||||
- (CPView)_viewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
|
||||
{
|
||||
return [_delegate tableView:self viewForTableColumn:aTableColumn row:aRow];
|
||||
}
|
||||
|
||||
- (CPView)_dataViewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
|
||||
{
|
||||
var view = nil;
|
||||
|
||||
if ([self _delegateRespondsToDataViewForTableColumn])
|
||||
{
|
||||
view = [_delegate tableView:self dataViewForTableColumn:aTableColumn row:aRow];
|
||||
|
||||
if (!view)
|
||||
[CPException raise:CPInternalInconsistencyException reason:"The view returned by -tableView:dataViewForTableColumn:row: should not be nil"];
|
||||
}
|
||||
|
||||
return view;
|
||||
return [_delegate tableView:self dataViewForTableColumn:aTableColumn row:aRow];
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -3673,7 +3682,10 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
|
||||
*/
|
||||
- (CPView)_newDataViewForRow:(CPInteger)aRow tableColumn:(CPTableColumn)aTableColumn
|
||||
{
|
||||
var view = [self _dataViewForTableColumn:aTableColumn row:aRow];
|
||||
var view = nil;
|
||||
|
||||
if (_viewForTableColumnRowSelector)
|
||||
view = objj_msgSend(self, _viewForTableColumnRowSelector, aTableColumn, aRow);
|
||||
|
||||
if (!view)
|
||||
{
|
||||
@@ -3769,8 +3781,14 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
|
||||
|
||||
- (void)_updateIsViewBased
|
||||
{
|
||||
_isViewBased = (_implementedDelegateMethods & CPTableViewDelegate_tableView_dataViewForTableColumn_row_ || _archivedDataViews != nil);
|
||||
if ([self _delegateRespondsToViewForTableColumn])
|
||||
_viewForTableColumnRowSelector = @selector(_viewForTableColumn:row:);
|
||||
else if ([self _delegateRespondsToDataViewForTableColumn])
|
||||
_viewForTableColumnRowSelector = @selector(_dataViewForTableColumn:row:);
|
||||
|
||||
_isViewBased = (_viewForTableColumnRowSelector !== nil || _archivedDataViews !== nil);
|
||||
}
|
||||
|
||||
/*!
|
||||
@ignore
|
||||
*/
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
@import <Foundation/CPObject.j>
|
||||
|
||||
CPLogRegister(CPLogConsole);
|
||||
|
||||
@implementation AppController : CPObject
|
||||
{
|
||||
@@ -43,11 +44,11 @@
|
||||
|
||||
var view = [oview makeViewWithIdentifier:identifier owner:self];
|
||||
[[view textField] setStringValue:@"Item <" + [item UID] + ">"];
|
||||
|
||||
|
||||
if (identifier = @"firstRoot")
|
||||
{
|
||||
var expandButton = [view viewWithTag:1000];
|
||||
[expandButton setState:[outlineView isItemExpanded:item]];
|
||||
[expandButton setState:[outlineView isItemExpanded:item]];
|
||||
}
|
||||
|
||||
return view;
|
||||
@@ -57,7 +58,7 @@
|
||||
{
|
||||
var row = [outlineView rowForView:sender],
|
||||
item = [outlineView itemAtRow:row];
|
||||
|
||||
|
||||
if ([outlineView isItemExpanded:item])
|
||||
[outlineView collapseItem:item];
|
||||
else
|
||||
|
||||
@@ -112,7 +112,7 @@ CPLogRegister(CPLogConsole)
|
||||
}
|
||||
|
||||
// DELEGATE METHODS FOR THE TABLE VIEW
|
||||
- (void)tableView:(CPTableView)aTableView dataViewForTableColumn:(CPTableColumn)aTableColumn row:(int)aRow
|
||||
- (void)tableView:(CPTableView)aTableView viewForTableColumn:(CPTableColumn)aTableColumn row:(int)aRow
|
||||
{
|
||||
var identifier = [aTableColumn identifier];
|
||||
|
||||
|
||||
Reference in new issue
Block a user