Merge pull request #84 from lukasreichart/master

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

src/Layout.c

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

src/Layout.js

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

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

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