Merge pull request #2833 from Hixie/RenderFractionallySizedBox-constraints

Fix RenderFractionallySizedBox's constraints logic

packages/flutter/lib/src/rendering/proxy_box.dart

@@ -247,15 +247,15 @@ class RenderConstrainedBox extends RenderProxyBox {
   }
 }
 
-/// Sizes itself to a fraction of the total available space.
+/// Sizes its child to a fraction of the total available space.
 ///
-/// For both its width and width height, this render object imposes a tight
+/// For both its width and height, this render object imposes a tight
 /// constraint on its child that is a multiple (typically less than 1.0) of the
 /// maximum constraint it received from its parent on that axis. If the factor
 /// for a given axis is null, then the constraints from the parent are just
 /// passed through instead.
 ///
-/// It then tries to size itself t the size of its child.
+/// It then tries to size itself to the size of its child.
 class RenderFractionallySizedBox extends RenderProxyBox {
   RenderFractionallySizedBox({
     RenderBox child,
@@ -323,41 +323,41 @@ class RenderFractionallySizedBox extends RenderProxyBox {
   double getMinIntrinsicWidth(BoxConstraints constraints) {
     assert(constraints.debugAssertIsNormalized);
     if (child != null)
-      return child.getMinIntrinsicWidth(_getInnerConstraints(constraints));
-    return _getInnerConstraints(constraints).constrainWidth(0.0);
+      return constraints.constrainWidth(child.getMinIntrinsicWidth(_getInnerConstraints(constraints)));
+    return constraints.constrainWidth(_getInnerConstraints(constraints).constrainWidth(0.0));
   }
 
   @override
   double getMaxIntrinsicWidth(BoxConstraints constraints) {
     assert(constraints.debugAssertIsNormalized);
     if (child != null)
-      return child.getMaxIntrinsicWidth(_getInnerConstraints(constraints));
-    return _getInnerConstraints(constraints).constrainWidth(0.0);
+      return constraints.constrainWidth(child.getMaxIntrinsicWidth(_getInnerConstraints(constraints)));
+    return constraints.constrainWidth(_getInnerConstraints(constraints).constrainWidth(0.0));
   }
 
   @override
   double getMinIntrinsicHeight(BoxConstraints constraints) {
     assert(constraints.debugAssertIsNormalized);
     if (child != null)
-      return child.getMinIntrinsicHeight(_getInnerConstraints(constraints));
-    return _getInnerConstraints(constraints).constrainHeight(0.0);
+      return constraints.constrainHeight(child.getMinIntrinsicHeight(_getInnerConstraints(constraints)));
+    return constraints.constrainHeight(_getInnerConstraints(constraints).constrainHeight(0.0));
   }
 
   @override
   double getMaxIntrinsicHeight(BoxConstraints constraints) {
     assert(constraints.debugAssertIsNormalized);
     if (child != null)
-      return child.getMaxIntrinsicHeight(_getInnerConstraints(constraints));
-    return _getInnerConstraints(constraints).constrainHeight(0.0);
+      return constraints.constrainHeight(child.getMaxIntrinsicHeight(_getInnerConstraints(constraints)));
+    return constraints.constrainHeight(_getInnerConstraints(constraints).constrainHeight(0.0));
   }
 
   @override
   void performLayout() {
     if (child != null) {
       child.layout(_getInnerConstraints(constraints), parentUsesSize: true);
-      size = child.size;
+      size = constraints.constrain(child.size);
     } else {
-      size = _getInnerConstraints(constraints).constrain(Size.zero);
+      size = constraints.constrain(_getInnerConstraints(constraints).constrain(Size.zero));
     }
   }
 

packages/flutter/test/rendering/constraints_test.dart

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/rendering.dart';
+import 'package:test/test.dart';
+
+import 'rendering_tester.dart';
+
+void main() {
+  test("RenderFractionallySizedBox constraints", () {
+    RenderBox root, leaf, test;
+    root = new RenderPositionedBox(
+      child: new RenderConstrainedBox(
+        additionalConstraints: new BoxConstraints.tight(const Size(200.0, 200.0)),
+        child: test = new RenderFractionallySizedBox(
+          widthFactor: 2.0,
+          heightFactor: 0.5,
+          child: leaf = new RenderConstrainedBox(
+            additionalConstraints: const BoxConstraints.expand()
+          )
+        )
+      )
+    );
+    layout(root);
+    expect(root.size.width, equals(800.0));
+    expect(root.size.height, equals(600.0));
+    expect(test.size.width, equals(200.0));
+    expect(test.size.height, equals(200.0));
+    expect(leaf.size.width, equals(400.0));
+    expect(leaf.size.height, equals(100.0));
+  });
+}