Use Point, Size, and Rect in layout2.dart

sky/examples/raw/sector-layout.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:math' as math;
 import 'dart:sky' as sky;
 import 'package:sky/framework/app.dart';
 import 'package:sky/framework/layout2.dart';
 
 const double kTwoPi = 2 * math.PI;
@@ skipping 238 matching lines @@
   }
 
   // paint origin is 0,0 of our circle
   // each sector then knows how to paint itself at its location
   void paint(RenderNodeDisplayList canvas) {
     // TODO(ianh): avoid code duplication
     super.paint(canvas);
     RenderSector child = firstChild;
     while (child != null) {
       assert(child.parentData is SectorChildListParentData);
-      canvas.paintChild(child, 0.0, 0.0);
+      canvas.paintChild(child, new sky.Point(0.0, 0.0));
       child = child.parentData.nextSibling;
     }
   }
 
 }
 
 class RenderSectorSlice extends RenderSectorWithChildren {
   // lays out RenderSector children in a stack
 
   RenderSectorSlice({
@@ skipping 84 matching lines @@
   }
 
   // paint origin is 0,0 of our circle
   // each sector then knows how to paint itself at its location
   void paint(RenderNodeDisplayList canvas) {
     // TODO(ianh): avoid code duplication
     super.paint(canvas);
     RenderSector child = firstChild;
     while (child != null) {
       assert(child.parentData is SectorChildListParentData);
-      canvas.paintChild(child, 0.0, 0.0);
+      canvas.paintChild(child, new sky.Point(0.0, 0.0));
       child = child.parentData.nextSibling;
     }
   }
 
 }
 
 class RenderBoxToRenderSectorAdapter extends RenderBox {
 
   RenderBoxToRenderSectorAdapter({ double innerRadius: 0.0, RenderSector child }) :
     _innerRadius = innerRadius {
@@ skipping 29 matching lines @@
     assert(child is RenderSector);
     assert(child.parentData is SectorParentData);
     assert(!constraints.isInfinite);
     double maxChildDeltaRadius = math.min(constraints.maxWidth, constraints.maxHeight) / 2.0 - innerRadius;
     SectorDimensions childDimensions = child.getIntrinsicDimensions(new SectorConstraints(maxDeltaRadius: maxChildDeltaRadius), innerRadius);
     double dimension = (innerRadius + childDimensions.deltaRadius) * 2.0;
     return new BoxDimensions.withConstraints(constraints, width: dimension, height: dimension);
   }
 
   void performLayout() {
-    BoxDimensions ourDimensions;
     if (child == null) {
-      ourDimensions = new BoxDimensions.withConstraints(constraints, width: 0.0, height: 0.0);
+      size = constraints.constrain(new sky.Size(0.0, 0.0));
     } else {
       assert(child is RenderSector);
       assert(!constraints.isInfinite);
       double maxChildDeltaRadius = math.min(constraints.maxWidth, constraints.maxHeight) / 2.0 - innerRadius;
       assert(child.parentData is SectorParentData);
       child.parentData.radius = innerRadius;
       child.parentData.theta = 0.0;
       child.layout(new SectorConstraints(maxDeltaRadius: maxChildDeltaRadius), parentUsesSize: true);
       double dimension = (innerRadius + child.deltaRadius) * 2.0;
-      ourDimensions = new BoxDimensions.withConstraints(constraints, width: dimension, height: dimension);
+      size = constraints.constrain(new sky.Size(dimension, dimension));
     }
-    width = ourDimensions.width;
-    height = ourDimensions.height;
   }
 
-  double width;
-  double height;
-
   // paint origin is 0,0 of our circle
   void paint(RenderNodeDisplayList canvas) {
     super.paint(canvas);
-    if (child != null)
-      canvas.paintChild(child, width/2.0, height/2.0);
+    if (child != null) {
+      sky.Rect bounds = new sky.Rect.fromSize(size);
+      canvas.paintChild(child, bounds.center);
+    }
   }
 
-  bool hitTest(HitTestResult result, { double x, double y }) {
+  bool hitTest(HitTestResult result, { sky.Point position }) {
+    double x = position.x;
+    double y = position.y;
     if (child == null)
       return false;
     // translate to our origin
-    x -= width/2.0;
-    y -= height/2.0;
+    x -= size.width/2.0;
+    y -= size.height/2.0;
     // convert to radius/theta
     double radius = math.sqrt(x*x+y*y);
     double theta = (math.atan2(x, -y) - math.PI/2.0) % kTwoPi;
     if (radius < innerRadius)
       return false;
     if (radius >= innerRadius + child.deltaRadius)
       return false;
     if (theta > child.deltaTheta)
       return false;
     child.hitTest(result, radius: radius, theta: theta);
@@ skipping 40 matching lines @@
   rootCircle.add(new RenderSolidColor(0xFF0000FF, desiredDeltaTheta: kTwoPi * 0.4));
   var stack = new RenderSectorSlice(padding: 2.0);
   stack.add(new RenderSolidColor(0xFFFFFF00, desiredDeltaRadius: 20.0));
   stack.add(new RenderSolidColor(0xFFFF9000, desiredDeltaRadius: 20.0));
   stack.add(new RenderSolidColor(0xFF00FF00));
   rootCircle.add(stack);
 
   var root = new RenderBoxToRenderSectorAdapter(innerRadius: 50.0, child: rootCircle);
   app = new AppView(root);
 }