gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-22 00:32:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed table header/content random disappearance with unarchived table/outline

Browse source 
views.

NSTableView non-keyed unarchiving was not always initializing _columnOrigins.
NSScrollView keyed unarchiving was decoding non-encoded flags (the flags were 
thus initialized with random memory content).
See ChangeLog for detailed explanations.

Also added double action keyed archiving to NSTableView.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29494 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Quentin Mathe 2010-02-06 11:32:34 +00:00
parent b3af151d7b
commit 2da78331b1
3 changed files with 46 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/NSTableView.m
View file

@ -5616,6 +5616,10 @@ This method is deprecated, use -columnIndexesInRect:. */
{
[aCoder encodeObject: NSStringFromSelector([self action]) forKey: @"NSAction"];
}
if ([self doubleAction] != NULL)
{
[aCoder encodeObject: NSStringFromSelector([self doubleAction]) forKey: @"NSDoubleAction"];
}
[aCoder encodeObject: [self backgroundColor] forKey: @"NSBackgroundColor"];
[aCoder encodeObject: [self gridColor] forKey: @"NSGridColor"];
@ -5717,6 +5721,12 @@ This method is deprecated, use -columnIndexesInRect:. */
NSString *action = [aDecoder decodeObjectForKey: @"NSAction"];
[self setAction: NSSelectorFromString(action)];
}
if ([aDecoder containsValueForKey: @"NSDoubleAction"])
{
NSString *action = [aDecoder decodeObjectForKey: @"NSDoubleAction"];
[self setDoubleAction: NSSelectorFromString(action)];
}
if ([aDecoder containsValueForKey: @"NSBackgroundColor"])
{
[self setBackgroundColor: [aDecoder decodeObjectForKey: @"NSBackgroundColor"]];
@ -5797,16 +5807,12 @@ This method is deprecated, use -columnIndexesInRect:. */
e = [columns objectEnumerator];
while ((col = [e nextObject]) != nil)
{
/* Will initialize -[NSTableColumn tableView], _numberOfColumns and
allocate _columnsOrigins */
[self addTableColumn: col];
[col setTableView: self];
}
_numberOfColumns = [columns count];
if (_numberOfColumns)
_columnOrigins = NSZoneMalloc(NSDefaultMallocZone (),
sizeof(float) * _numberOfColumns);
[self tile];
[self tile]; /* Initialize _columnOrigins */
}
else
{
@ -5854,14 +5860,12 @@ This method is deprecated, use -columnIndexesInRect:. */
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_verticalMotionDrag];
}
if (_numberOfColumns)
_columnOrigins = NSZoneMalloc (NSDefaultMallocZone (),
sizeof(float) * _numberOfColumns);
if (version == 2)
if (_numberOfColumns > 0)
{
[self tile];
_columnOrigins = NSZoneMalloc (NSDefaultMallocZone (),
sizeof(float) * _numberOfColumns);
}
[self tile]; /* Initialize _columnOrigins */
}
return self;