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

Header and NSCollection* source merges

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38688 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-06-26 00:29:04 +00:00
parent beccb8503d
commit 3238f42ec6
8 changed files with 167 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/NSCollectionView.m
View file

@ -37,6 +37,7 @@
#import "AppKit/NSEvent.h"
#import "AppKit/NSGraphics.h"
#import "AppKit/NSImage.h"
#import "AppKit/NSKeyValueBinding.h"
#import "AppKit/NSPasteboard.h"
#import "AppKit/NSWindow.h"
@ -94,7 +95,11 @@ static NSString *placeholderItem = nil;
//
+ (void) initialize
{
if (self == [NSCollectionView class])
{
placeholderItem = @"Placeholder";
[self exposeBinding: NSContentBinding];
}
}
- (id) initWithFrame: (NSRect)frame
@ -120,7 +125,7 @@ static NSString *placeholderItem = nil;
- (void) _resetItemSize
{
if (itemPrototype)
if (itemPrototype && ([itemPrototype view] != nil))
{
_itemSize = [[itemPrototype view] frame].size;
_minItemSize = NSMakeSize (_itemSize.width, _itemSize.height);
@ -151,8 +156,11 @@ static NSString *placeholderItem = nil;
NSPoint oppositeOrigin = NSMakePoint (origin.x + size.width, origin.y + size.height);
NSInteger firstIndexInRect = MAX(0, [self _indexAtPoint: origin]);
NSInteger lastIndexInRect = MIN([_items count] - 1, [self _indexAtPoint: oppositeOrigin]);
NSInteger index;
// I had to extract these values from the macro to get it
// working correctly.
NSInteger index = [self _indexAtPoint: oppositeOrigin];
NSInteger last = [_items count] - 1;
NSInteger lastIndexInRect = MIN(last, index);
for (index = firstIndexInRect; index <= lastIndexInRect; index++)
{
@ -235,6 +243,7 @@ static NSString *placeholderItem = nil;
}
else
{
[self _resetItemSize];
// Force recalculation of each item's frame
_itemSize = _minItemSize;
_tileWidth = -1.0;
@ -475,6 +484,7 @@ static NSString *placeholderItem = nil;
NSRect initRect = NSMakeRect (-10000,-10000,100,100);
[[item view] setFrame:initRect];
[self addSubview: [item view]];
RELEASE(item);
}
return item;
}
@ -484,10 +494,10 @@ static NSString *placeholderItem = nil;
NSCollectionViewItem *collectionItem = nil;
if (itemPrototype)
{
ASSIGN(collectionItem, [itemPrototype copy]);
collectionItem = [itemPrototype copy];
[collectionItem setRepresentedObject: object];
}
return AUTORELEASE (collectionItem);
return collectionItem;
}
- (void) _removeItemsViews
@ -530,6 +540,11 @@ static NSString *placeholderItem = nil;
_numberOfColumns = MIN(_maxNumberOfColumns, _numberOfColumns);
}
if (_numberOfColumns == 0)
{
_numberOfColumns = 1;
}
CGFloat remaining = width - _numberOfColumns * itemSize.width;
if (remaining > 0 && itemSize.width < _maxItemSize.width)