Use Point, Size, and Rect in layout2.dart

sky/examples/raw/simple_render_tree.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 'dart:sky';
 import 'package:sky/framework/app.dart';
 import 'package:sky/framework/layout2.dart';
 
 class RenderSolidColor extends RenderDecoratedBox {
-  final double desiredHeight;
-  final double desiredWidth;
+  final Size desiredSize;
   final int backgroundColor;
 
-  RenderSolidColor(int backgroundColor, { this.desiredHeight: double.INFINITY,
-                                          this.desiredWidth: double.INFINITY })
+  RenderSolidColor(int backgroundColor, { this.desiredSize })

[Hixie, 2015/05/28 18:45:22]

If Size was a constant class, you could default it to INFINITY here.

       : backgroundColor = backgroundColor,
         super(new BoxDecoration(backgroundColor: backgroundColor));
 
   BoxDimensions getIntrinsicDimensions(BoxConstraints constraints) {
     return new BoxDimensions.withConstraints(constraints,
-                                             height: desiredHeight,
-                                             width: desiredWidth);
+                                             width: desiredSize.width,
+                                             height: desiredSize.height);

[Hixie, 2015/05/28 18:45:22]

This would be simplified by withConstraints() taking a Rect. Not quite sure how
it'd work though.

   }
 
   void layout(BoxConstraints constraints, { RenderNode relayoutSubtreeRoot }) {
-    width = constraints.constrainWidth(desiredWidth);
-    height = constraints.constrainHeight(desiredHeight);
+    size = constraints.constrain(desiredSize);
     layoutDone();
   }
 
   void handlePointer(PointerEvent event) {
     if (event.type == 'pointerdown')
       decoration = new BoxDecoration(backgroundColor: 0xFFFF0000);
     else if (event.type == 'pointerup')
       decoration = new BoxDecoration(backgroundColor: backgroundColor);
   }
 }
 
 AppView app;
 
 void main() {
   var root = new RenderFlex(
       direction: FlexDirection.Vertical,
       decoration: new BoxDecoration(backgroundColor: 0xFF000000));
 
   void addFlexChild(RenderFlex parent, int backgroundColor, { int flex: 0 }) {
-    RenderNode child = new RenderSolidColor(backgroundColor);
+    RenderNode child = new RenderSolidColor(backgroundColor, desiredSize: new Size.infinite());

[Hixie, 2015/05/28 18:45:22]

I think the old code looked better (implying infinity). It's weird that you have
to explicitly ask for an infinite box.

     parent.add(child);
     child.parentData.flex = flex;
   }
 
   // Yellow bar at top
   addFlexChild(root, 0xFFFFFF00, flex: 1);
 
   // Turquoise box
-  root.add(new RenderSolidColor(0x7700FFFF, desiredHeight: 100.0, desiredWidth: 100.0));
+  root.add(new RenderSolidColor(0x7700FFFF, desiredSize: new Size(100.0, 100.0)));
 
   // Green and cyan render block with padding
   var renderBlock = new RenderBlock(decoration: new BoxDecoration(backgroundColor: 0xFFFFFFFF));
 
-  renderBlock.add(new RenderSolidColor(0xFF00FF00, desiredHeight: 50.0, desiredWidth: 100.0));
-  renderBlock.add(new RenderSolidColor(0x7700FFFF, desiredHeight: 100.0, desiredWidth: 50.0));
+  renderBlock.add(new RenderSolidColor(0xFF00FF00, desiredSize: new Size(100.0, 50.0)));
+  renderBlock.add(new RenderSolidColor(0x7700FFFF, desiredSize: new Size(50.0, 100.0)));
 
   root.add(new RenderPadding(const EdgeDims(10.0, 10.0, 10.0, 10.0), renderBlock));
 
   var row = new RenderFlex(
     direction: FlexDirection.Horizontal,
     decoration: new BoxDecoration(backgroundColor: 0xFF333333));
 
   // Purple and blue cells
   addFlexChild(row, 0x77FF00FF, flex: 1);
   addFlexChild(row, 0xFF0000FF, flex: 2);
 
   root.add(row);
   row.parentData.flex = 3;
 
   app = new AppView(root);
 
 }