Fixed: Auto-scrolling to the most bottom row even if this is not nece…

…ssary. Also, some logging stuff was removed.
haikusw · Oct 7, 2010 · 8ac7f90 · 8ac7f90
1 parent f72dbc6
commit 8ac7f90
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/AQGridView.xcodeproj/project.pbxproj b/AQGridView.xcodeproj/project.pbxproj
@@ -214,7 +214,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "AQGridView" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* AQGridView */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
 			projectDirPath = "";

diff --git a/Classes/AQGridView.m b/Classes/AQGridView.m
@@ -403,6 +403,10 @@ - (BOOL) isAnimatingUpdates
 
 - (void) updateContentRectWithOldMaxLocation: (CGPoint) oldMaxLocation gridSize: (CGSize) gridSize
 {
+    // The following line prevents an update leading to unneccessary auto-scrolling
+    // Before this fix, AQGridView animation always caused scrolling to the most bottom line
+    if (CGSizeEqualToSize(self.contentSize, gridSize)) return;
+
 	// update content size
 	self.contentSize = gridSize;
 

diff --git a/Classes/AQGridViewUpdateInfo.m b/Classes/AQGridViewUpdateInfo.m
@@ -608,7 +608,8 @@ - (NSSet *) animateCellUpdatesUsingVisibleContentRect: (CGRect) contentRect
 	// indices of items visible from old grid
 	NSIndexSet * oldVisibleIndices = [_oldGridData indicesOfCellsInRect: contentRect];
 
-	NSLog( @"Updating from original content rect %@", NSStringFromCGRect(contentRect) );
+    // The line below is commented because it produces too many logs
+	// NSLog( @"Updating from original content rect %@", NSStringFromCGRect(contentRect) );
 
 	if ( (isVertical) && (maxY > gridSize.height) )
 	{
@@ -637,7 +638,8 @@ - (NSSet *) animateCellUpdatesUsingVisibleContentRect: (CGRect) contentRect
 		[_gridView updateGridViewBoundsForNewGridData: _newGridData];
 	}
 
-	NSLog( @"Updated content rect: %@", NSStringFromCGRect(contentRect) );
+    // The line below is fixed because it produces too many logs
+	//NSLog( @"Updated content rect: %@", NSStringFromCGRect(contentRect) );
 	NSIndexSet * newVisibleIndices = [_newGridData indicesOfCellsInRect: contentRect];
 
 	NSMutableSet * newVisibleCells = [[NSMutableSet alloc] initWithSet: _gridView.animatingCells];