Merge pull request #5151 from ayeung/timob-16048

TIMOB-16048: Only use measured height from content view if it's greater than 1
tidev · Dec 23, 2013 · b988155 · b988155
2 parents 95b274b + 22723fd
commit b988155
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.../modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableViewRowProxyItem.java b/.../modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableViewRowProxyItem.java
@@ -507,7 +507,8 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
 				} else {
 					h = Math.max(minRowHeight, height.getAsPixels(this));
 				}
-				if (hasChildView) {
+				// Make sure the height is greater than 1 (not 0 since image views default to 1)
+				if (hasChildView && h > 1) {
 					content.getLayoutParams().height = h;
 				}