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

Add code to return the item properly from layoutAttributesForElementsInRect:, add missing NSCopying declaration to NSCollectionViewItem.h, minor cleanup in NSCollectionViewCompositionalLayout

Browse source
This commit is contained in:
Gregory John Casamento 2022-07-19 09:08:13 -04:00
parent f3672c31e9
commit 5108348ca6
7 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/NSCollectionView.m
View file

@ -130,8 +130,11 @@ static NSString *placeholderItem = nil;
-(void) _initDefaults
{
_itemSize = NSMakeSize(0, 0);
_tileWidth = -1.0;
_draggingSourceOperationMaskForLocal = NSDragOperationGeneric | NSDragOperationMove | NSDragOperationCopy;
_draggingSourceOperationMaskForRemote = NSDragOperationGeneric | NSDragOperationMove | NSDragOperationCopy;
[self _resetItemSize];
_content = [[NSArray alloc] init];
_items = [[NSMutableArray alloc] init];
@ -145,6 +148,7 @@ static NSString *placeholderItem = nil;
_indexPathsForVisibleItems = [[NSMutableSet alloc] init];
_visibleSupplementaryViews = [[NSMutableDictionary alloc] init];
_indexPathsForSupplementaryElementsOfKind = [[NSMutableSet alloc] init];
_itemsToAttributes = [[NSMutableDictionary alloc] init];
// Registered nib/class
_registeredNibs = RETAIN([NSMapTable weakToStrongObjectsMapTable]);
@ -441,7 +445,6 @@ static NSString *placeholderItem = nil;
{
ASSIGN(_collectionViewLayout, layout);
NSLog(@"layout = %@", layout);
[_collectionViewLayout setCollectionView: self]; // weak reference
[self reloadData];
}
@ -662,9 +665,7 @@ static NSString *placeholderItem = nil;
if (self)
{
_itemSize = NSMakeSize(0, 0);
_tileWidth = -1.0;
[self _initDefaults];
if ([aCoder allowsKeyedCoding])
{
if ([aCoder containsValueForKey: NSCollectionViewMinItemSizeKey])
@ -720,7 +721,6 @@ static NSString *placeholderItem = nil;
[self setCollectionViewLayout: [aCoder decodeObject]];
}
}
[self _initDefaults];
return self;
}
@ -1405,6 +1405,9 @@ static NSString *placeholderItem = nil;
[v setFrame: frame];
[v setHidden: hidden];
[v setAlphaValue: alpha];
[_itemsToAttributes setObject: attrs
forKey: item];
// NSLog(@"v = %@, a = %@, l = %@", v, attrs, _collectionViewLayout);
[self addSubview: v];