gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 06:51:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add code to correctly read information for NSCollectiViewLayout from xib file

Browse source
This commit is contained in:
Gregory John Casamento 2022-03-12 00:49:16 -05:00
parent a90ddfc9c5
commit 42a5f34095
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Source/GSXib5KeyedUnarchiver.m
View file

@ -3320,6 +3320,10 @@ didStartElement: (NSString*)elementName
// New xib stores values as attributes...
object = [currentElement attributeForKey: key];
}
else if ([@"NSCollectionViewBackgroundColor" isEqualToString: key])
{
object = [self decodeObjectForKey: @"primaryBackgroundColor"];
}
else if (([@"NSSearchButtonCell" isEqualToString: key]) ||
([@"NSCancelButtonCell" isEqualToString: key]))
{
@ -3541,19 +3545,19 @@ didStartElement: (NSString*)elementName
{
hasValue = [self containsValueForKey: [XmlKeyMapTable objectForKey: key]];
}
else if ([@"NSCollectionViewBackgroundColorsKey" isEqualToString: key])
else if ([@"NSBackgroundColors" isEqualToString: key])
{
hasValue = [currentElement elementForKey: @"primaryBackgroundColor"] != nil;
}
}
else if ([@"NSCollectionViewLayout" isEqualToString: key])
{
hasValue = [currentElement elementForKey: @"collectionViewLayout"] != nil;
}
}
else if (([@"NSIntercellSpacingHeight" isEqualToString: key]) ||
([@"NSIntercellSpacingWidth" isEqualToString: key]))
{
hasValue = [currentElement elementForKey: @"intercellSpacing"] != nil;
}
}
else if ([@"NSContents" isEqualToString: key])
{
hasValue = [currentElement attributeForKey: @"title"] != nil;

2
Source/NSCollectionView.m
View file

@ -129,7 +129,6 @@ static NSString *placeholderItem = nil;
-(void) _initDefaults
{
// _draggingSourceOperationMaskForLocal = NSDragOperationCopy | NSDragOperationLink | NSDragOperationGeneric | NSDragOperationPrivate;
_draggingSourceOperationMaskForLocal = NSDragOperationGeneric | NSDragOperationMove | NSDragOperationCopy;
_draggingSourceOperationMaskForRemote = NSDragOperationGeneric | NSDragOperationMove | NSDragOperationCopy;
[self _resetItemSize];
@ -691,7 +690,6 @@ static NSString *placeholderItem = nil;
if ([aCoder containsValueForKey: NSCollectionViewBackgroundColorsKey])
{
NSLog(@"******** loading colors");
[self setBackgroundColors: [aCoder decodeObjectForKey: NSCollectionViewBackgroundColorsKey]];
}