mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-08-25 21:17:03 +00:00
Alexander Ljungberg
f805b6bfa6
This is an improved fix to the corrupted tab view state bug partially addressed by 0f347be. Without either fix, NSTabView is converted to a CPTabView where tab view item views are subviews of the NSTabView, while in Cappuccino the selected view item is supposed to be a subview of a CPBox. Without this fix, CPTabView decoding called addSubview: in initWithCoder: which can cause the superview of a view to become set, only to later be overwritten when the superview ivar is decoded. This fix removes the tab item view as a subview from the tab view before encoding it in nib2cib, and then makes sure not to call addSubview: while still in the initWithCoder stage, but rather later in awakeFromCib.
67 lines
1.6 KiB
Plaintext
67 lines
1.6 KiB
Plaintext
/*
|
|
* NSTabViewItem.j
|
|
* nib2cib
|
|
*
|
|
* Created by Thomas Robinson.
|
|
* Copyright 2008, 280 North, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
@import <AppKit/CPTabViewItem.j>
|
|
|
|
|
|
@implementation CPTabViewItem (CPCoding)
|
|
|
|
- (id)NS_initWithCoder:(CPCoder)aCoder
|
|
{
|
|
if (self = [super init])
|
|
{
|
|
_identifier = [aCoder decodeObjectForKey:"NSIdentifier"];
|
|
_label = [aCoder decodeObjectForKey:"NSLabel"];
|
|
|
|
_view = [aCoder decodeObjectForKey:"NSView"];
|
|
|
|
// doesn't exist in Cocoa
|
|
//_auxiliaryView = [aCoder decodeObjectForKey:CPTabViewItemAuxViewKey]
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)awakeFromNib
|
|
{
|
|
if ([_view superview])
|
|
[_view removeFromSuperview];
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation NSTabViewItem : CPTabViewItem
|
|
{
|
|
}
|
|
|
|
- (id)initWithCoder:(CPCoder)aCoder
|
|
{
|
|
return [self NS_initWithCoder:aCoder];
|
|
}
|
|
|
|
- (Class)classForKeyedArchiver
|
|
{
|
|
return [CPTabViewItem class];
|
|
}
|
|
|
|
@end
|