Merge pull request #4868 from vishalduggal/timob-15202

[TIMOB-15202]iOS:verify height to be atleast lineheight
tidev · Oct 29, 2013 · ba370ac · ba370ac
2 parents 435703e + 6b02e36
commit ba370ac
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/iphone/Classes/TiUILabelProxy.m b/iphone/Classes/TiUILabelProxy.m
@@ -38,6 +38,13 @@ -(CGFloat) verifyWidth:(CGFloat)suggestedWidth
 -(CGFloat) verifyHeight:(CGFloat)suggestedHeight
 {
 	int height = ceil(suggestedHeight);
+    if ([self viewInitialized]) {
+        int minHeight = ceil([[[(TiUILabel*)view label] font] lineHeight]);
+        if (height < minHeight) {
+            height = minHeight;
+        }
+    }
+
 	if (height & 0x01)
 	{
 		height ++;