Merge pull request #1845 from vishalduggal/timob-8247

[TIMOB-8247] Constrain both width and height during layout
tidev · Mar 27, 2012 · 4eca4a3 · 4eca4a3
2 parents e09f9ed + 97ec1bb
commit 4eca4a3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/iphone/Classes/LayoutConstraint.m b/iphone/Classes/LayoutConstraint.m
@@ -179,7 +179,8 @@ CGSize SizeConstraintViewWithSizeAddingResizing(LayoutConstraint * constraint, N
             //If it comes here it has to follow size behavior
             if ([autoSizer respondsToSelector:@selector(autoHeightForSize:)])
             {
-                height = [autoSizer autoHeightForSize:CGSizeMake(width, height)];
+                CGFloat desiredHeight = [autoSizer autoHeightForSize:CGSizeMake(width, height)];
+                height = height < desiredHeight?height:desiredHeight;
             }
             else if(resultResizing != NULL)
             {