mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 21:00:47 +00:00
* Source/NSCollectionView.m (-tile): Prevent _numberOfColumns
from being 0. * Source/NSArrayController.m: Revert last change and add proper handling of arrangeObjects for many cases. * Source/NSCollectionViewItem.m: Fix reference counting. Add method -view to have something to display. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38387 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
5fa907104e
commit
eff9d720a9
4 changed files with 89 additions and 19 deletions
|
@ -522,11 +522,16 @@ static NSString *placeholderItem = nil;
|
|||
NSSize itemSize = NSMakeSize(_minItemSize.width, _minItemSize.height);
|
||||
|
||||
_numberOfColumns = MAX(1.0, floor(width / itemSize.width));
|
||||
|
||||
|
||||
if (_maxNumberOfColumns > 0)
|
||||
{
|
||||
_numberOfColumns = MIN(_maxNumberOfColumns, _numberOfColumns);
|
||||
}
|
||||
|
||||
if (_numberOfColumns == 0)
|
||||
{
|
||||
_numberOfColumns = 1;
|
||||
}
|
||||
|
||||
CGFloat remaining = width - _numberOfColumns * itemSize.width;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue