Move coder unarchiving logic to nib2cib.

This commit is contained in:
Randall Luecke committed 2011-03-10 18:37:44 -05:00
1 parent b087757a72
commit e9dba10903
2 files changed
+7 -16

No files matched your search

-15
View File
@@ -297,8 +297,6 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
[_headerView setTableView:self];
[[_CPCornerView alloc] initWithFrame:CGRectMake(0, 0, [CPScroller scrollerWidth], CGRectGetHeight([_headerView frame]))];
_currentHighlightedTableColumn = nil;
_draggedRowIndexes = [CPIndexSet indexSet];
@@ -4761,19 +4759,6 @@ var CPTableViewDataSourceKey = @"CPTableViewDataSourceKey",
_headerView = [aCoder decodeObjectForKey:CPTableViewHeaderViewKey];
_cornerView = [aCoder decodeObjectForKey:CPTableViewCornerViewKey];
if (!_headerView)
{
// A tableview loaded from IB will always have a corner view, even if there is no header view.
// Set the corner view to nil, because CPScrollView doesn't respect the hidden flag.
_cornerView = nil;
}
else
{
// Make sure we unhide the cornerview because a corner view loaded from cib is always hidden
// This might be a bug in IB, or the way we load the NSvFlags might be broken for _NSCornerView
[_cornerView setHidden:NO];
}
[self setDataSource:[aCoder decodeObjectForKey:CPTableViewDataSourceKey]];
[self setDelegate:[aCoder decodeObjectForKey:CPTableViewDelegateKey]];
+7 -1
View File
@@ -43,7 +43,13 @@
_rowHeight = 23;
_headerView = [aCoder decodeObjectForKey:@"NSHeaderView"];
_cornerView = [aCoder decodeObjectForKey:@"NSCornerView"];
// There will always be a corner view in nib, even if there isn't a headerview. Consider this a bug in IB.
_cornerView = _headerView ? [aCoder decodeObjectForKey:@"NSCornerView"] : nil;
// Make sure we unhide the cornerview because a corner view loaded from cib is always hidden
// This might be a bug in IB, or the way we load the NSvFlags might be broken for _NSCornerView
[_cornerView setHidden:NO];
_autosaveName = [aCoder decodeObjectForKey:@"NSAutosaveName"];