From 4791973b0262dca2daa50ce052c9da0f00142840 Mon Sep 17 00:00:00 2001 From: cacaodev Date: Wed, 13 Feb 2013 23:54:02 +0100 Subject: [PATCH] If maxNumberOfRows == 0 (the default), ignore maxNumberOfRows --- AppKit/CPCollectionView.j | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/AppKit/CPCollectionView.j b/AppKit/CPCollectionView.j index 652c0676e..0246ffbe7 100644 --- a/AppKit/CPCollectionView.j +++ b/AppKit/CPCollectionView.j @@ -544,7 +544,10 @@ var HORIZONTAL_MARGIN = 2; itemSize.width = MIN(maxItemSizeWidth, width); } - numberOfRows = MAX(1.0 , MIN(CEIL(itemsCount / numberOfColumns), _maxNumberOfRows)); + numberOfRows = CEIL(itemsCount / numberOfColumns); + + if (_maxNumberOfRows > 0) + numberOfRows = MIN(numberOfRows, _maxNumberOfRows); height = MAX(height, numberOfRows * (_minItemSize.height + _verticalMargin));