Merge pull request #84 from lukasreichart/master

If the measure function is defined: only return from execution of lay…

src/Layout.c

@@ -496,7 +496,9 @@ static void layoutNodeImpl(css_node_t *node, float parentMaxWidth, css_direction
           getPaddingAndBorderAxis(node, CSS_FLEX_DIRECTION_COLUMN);
       }
     }
-    return;
+    if (node->children_count == 0) {
+      return;
+    }
   }
 
   int i;

src/Layout.js

@@ -392,7 +392,9 @@ var computeLayout = (function() {
             getPaddingAndBorderAxis(node, CSS_FLEX_DIRECTION_COLUMN);
         }
       }
-      return;
+      if (node.children.length === 0) {
+        return;
+      }
     }
 
     var/*int*/ i;

src/java/src/com/facebook/csslayout/LayoutEngine.java

@@ -481,7 +481,9 @@ public class LayoutEngine {
             getPaddingAndBorderAxis(node, CSSFlexDirection.COLUMN);
         }
       }
-      return;
+      if (node.getChildCount() == 0) {
+        return;
+      }
     }
   
     int i;