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

NSCell, NSClipView and NSCollectionView merges

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38707 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-06-26 18:05:15 +00:00
parent dd460d8235
commit 5e8e285254
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/NSCollectionView.m
View file

@ -166,6 +166,7 @@ static NSString *placeholderItem = nil;
{
// Calling itemAtIndex: will eventually instantiate the collection view item,
// if it hasn't been done already.
// Testplant-MAL-2015-06-26: Keeping testplant fixes...
if (index < [_items count])
{
NSCollectionViewItem *collectionItem = [self itemAtIndex: index];
@ -476,6 +477,7 @@ static NSString *placeholderItem = nil;
{
[item setSelected: YES];
}
// Testplant-MAL-2015-06-26: Keeping testplant fixes...
// Frank LeGrand 4/25/13:
// We set this initial rect as a workaround for a weird display
// issue in our app where the item view would get drawn in front
@ -527,7 +529,7 @@ static NSString *placeholderItem = nil;
return;
CGFloat width = [self bounds].size.width;
//NSLog(@"tile: width = %g, previous width = %g", width, _tileWidth);
// Testplant-MAL-2015-06-26: Keeping testplant fixes...
if (isnan(width) || ABS(width - _tileWidth) <= 1)
return;
@ -602,7 +604,6 @@ static NSString *placeholderItem = nil;
NSSize currentSize = [self frame].size;
if (!NSEqualSizes(currentSize, aSize))
{
//NSLog(@"resizeSubviews: new size = %g x %g, currentSize = %g x %g", aSize.width, aSize.height, currentSize.width, currentSize.height);
[self tile];
}
}