Merge pull request #4188 from vishalduggal/timob-13243

[TIMOB-13243] iOS: center wrapperview when required
tidev · Apr 22, 2013 · e0add7c · e0add7c
2 parents c9e1673 + 1b543ba
commit e0add7c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/iphone/Classes/TiUIScrollView.m b/iphone/Classes/TiUIScrollView.m
@@ -236,6 +236,7 @@ -(void)handleContentSize
 	wrapperBounds.origin = CGPointZero;
 	wrapperBounds.size = newContentSize;
 	[wrapperView setFrame:wrapperBounds];
+	[self scrollViewDidZoom:scrollView];
 	needsHandleContentSize = NO;
 	[(TiUIScrollViewProxy *)[self proxy] layoutChildrenAfterContentSize:NO];
 }
@@ -400,14 +401,14 @@ - (void)scrollViewDidZoom:(UIScrollView *)scrollView_
 {
 	CGSize boundsSize = scrollView.bounds.size;
     CGRect frameToCenter = wrapperView.frame;
-	if (TiDimensionIsAuto(contentWidth) || TiDimensionIsAutoSize(contentWidth)) {
+	if (TiDimensionIsAuto(contentWidth) || TiDimensionIsAutoSize(contentWidth) || TiDimensionIsUndefined(contentWidth)) {
 		if (frameToCenter.size.width < boundsSize.width) {
 			frameToCenter.origin.x = (boundsSize.width - frameToCenter.size.width) / 2;
 		} else {
 			frameToCenter.origin.x = 0;
 		}
 	}
-	if (TiDimensionIsAuto(contentHeight) || TiDimensionIsAutoSize(contentHeight)) {
+	if (TiDimensionIsAuto(contentHeight) || TiDimensionIsAutoSize(contentHeight) || TiDimensionIsUndefined(contentHeight)) {
 		if (frameToCenter.size.height < boundsSize.height) {
 			frameToCenter.origin.y = (boundsSize.height - frameToCenter.size.height) / 2;
 		} else {