Author: dpsimons
Date: Fri Apr 25 19:02:48 2014
New Revision: 37810

URL: http://svn.gna.org/viewcvs/gnustep?rev=37810&view=rev
Log:
prevent infinite recursion if width is NaN

Modified:
    libs/gui/branches/gnustep_testplant_branch/Source/NSCollectionView.m

Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSCollectionView.m
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSCollectionView.m?rev=37810&r1=37809&r2=37810&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSCollectionView.m        
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSCollectionView.m        
Fri Apr 25 19:02:48 2014
@@ -517,8 +517,8 @@
     return;
   
   CGFloat width = [self bounds].size.width;
-  NSLog(@"tile: width = %g, previous width = %g", width, _tileWidth);
-  if (ABS(width - _tileWidth) <= 2)
+  //NSLog(@"tile: width = %g, previous width = %g", width, _tileWidth);
+  if (isnan(width) || ABS(width - _tileWidth) <= 1)
     return;
   
   NSSize itemSize = NSMakeSize(_minItemSize.width, _minItemSize.height);
@@ -587,7 +587,7 @@
   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);
+         //NSLog(@"resizeSubviews: new size = %g x %g, currentSize = %g x %g", 
aSize.width, aSize.height, currentSize.width, currentSize.height);
       [self tile];
     }
 }


_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs

Reply via email to