Merge pull request AlanQuatermain#95 from rbruels/master

Evadne Wu · Evadne Wu · commit b3270c6ca18a · 2012-07-21T08:19:34.000-07:00
Fix content sizing bug for horizontal grid views
diff --git a/Classes/AQGridView.m b/Classes/AQGridView.m
@@ -522,7 +522,7 @@ - (void) setContentSize: (CGSize) newSize
 	        newSize.height = minimumHeight;
 	}
 
-	newSize.height = fmax(newSize.height, self.frame.size.height+1);
+	newSize.height = fmax(newSize.height, self.frame.size.height);
 
 	CGSize oldSize = self.contentSize;
 	[super setContentSize: newSize];

Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ - (void) setContentSize: (CGSize) newSize`
`522`	`522`	`newSize.height = minimumHeight;`
`523`	`523`	`}`
`524`	`524`
`525`		`- newSize.height = fmax(newSize.height, self.frame.size.height+1);`
	`525`	`+ newSize.height = fmax(newSize.height, self.frame.size.height);`
`526`	`526`
`527`	`527`	`CGSize oldSize = self.contentSize;`
`528`	`528`	`[super setContentSize: newSize];`