Merge pull request #2338 from mstepanov/timob-8941

[TIMOB-8941] iOS: Children views inside scrollview aren't calculating size properly
tidev · Jun 13, 2012 · 5029d2a · 5029d2a
2 parents e23eddb + c70b46f
commit 5029d2a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/iphone/Classes/TiUILabel.m b/iphone/Classes/TiUILabel.m
@@ -45,6 +45,11 @@ -(CGSize)sizeForFont:(CGFloat)suggestedWidth
 	CGSize maxSize = CGSizeMake(suggestedWidth<=0 ? 480 : suggestedWidth, 1000);
 	CGSize shadowOffset = [label shadowOffset];
 	requiresLayout = YES;
+	if ((suggestedWidth > 0) && [value characterAtIndex:value.length-1] == ' ') {
+		// (CGSize)sizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size lineBreakMode:(UILineBreakMode)lineBreakMode method truncates
+		// the string having trailing spaces when given size parameter width is equal to the expected return width, so we adjust it here.
+		maxSize.width += 0.00001;
+	}
 	CGSize size = [value sizeWithFont:font constrainedToSize:maxSize lineBreakMode:UILineBreakModeTailTruncation];
 	if (shadowOffset.width > 0)
 	{

diff --git a/iphone/Classes/TiUIScrollViewProxy.m b/iphone/Classes/TiUIScrollViewProxy.m
@@ -199,7 +199,8 @@ -(CGRect)computeChildSandbox:(TiViewProxy*)child withBounds:(CGRect)bounds
         }
         else if (TiDimensionIsAutoSize(constraint))
         {
-            bounds.size.width = [child autoWidthForSize:CGSizeMake(boundingValue,bounds.size.height - offset2)] + offset;
+			// allow child to take as much horizontal space as scroll view width
+            bounds.size.width = [child autoWidthForSize:CGSizeMake(bounds.size.width,bounds.size.height - offset2)] + offset;
             horizontalLayoutBoundary += bounds.size.width;
         }
         else if (TiDimensionIsAuto(constraint) )
@@ -211,7 +212,8 @@ -(CGRect)computeChildSandbox:(TiViewProxy*)child withBounds:(CGRect)bounds
             }
             else {
                 //SIZE behavior
-                bounds.size.width = [child autoWidthForSize:CGSizeMake(boundingValue,bounds.size.height - offset2)] + offset;
+				// allow child to take as much horizontal space as scroll view width
+                bounds.size.width = [child autoWidthForSize:CGSizeMake(bounds.size.width,bounds.size.height - offset2)] + offset;
                 horizontalLayoutBoundary += bounds.size.width;
             }
         }
@@ -238,7 +240,8 @@ -(CGRect)computeChildSandbox:(TiViewProxy*)child withBounds:(CGRect)bounds
             }
             else {
                 //SIZE behavior
-                bounds.size.width = [child autoWidthForSize:CGSizeMake(boundingValue,bounds.size.height - offset2)] + offset;
+				// allow child to take as much horizontal space as scroll view width
+                bounds.size.width = [child autoWidthForSize:CGSizeMake(bounds.size.width,bounds.size.height - offset2)] + offset;
                 horizontalLayoutBoundary += bounds.size.width;
             }
         }