Rename Container's desiredSize argument to width and height arguments.

sky/sdk/lib/framework/components2/scaffold.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 '../fn2.dart';
 import '../rendering/box.dart';
 import '../rendering/object.dart';
 
 enum ScaffoldSlots {
   toolbar,
@@ skipping 62 matching lines @@
 
   bool get sizedByParent => true;
   void performResize() {
     size = constraints.constrain(Size.infinite);
     assert(size.width < double.INFINITY);
     assert(size.height < double.INFINITY);
   }
 
   static const kToolbarHeight = 100.0;
   static const kStatusbarHeight = 50.0;
-  static const kButtonX = -16.0; // from right edge of body
-  static const kButtonY = -16.0; // from bottom edge of body
+  static const kButtonX = 16.0; // left from right edge of body
+  static const kButtonY = 16.0; // up from bottom edge of body
 
   void performLayout() {
     double bodyHeight = size.height;
     double bodyPosition = 0.0;
     if (_slots[ScaffoldSlots.toolbar] != null) {
       RenderBox toolbar = _slots[ScaffoldSlots.toolbar];
       toolbar.layout(new BoxConstraints.tight(new Size(size.width, kToolbarHeight)));
       assert(toolbar.parentData is BoxParentData);
       toolbar.parentData.position = Point.origin;
       bodyPosition = kToolbarHeight;
@@ skipping 13 matching lines @@
       body.parentData.position = new Point(0.0, bodyPosition);
     }
     if (_slots[ScaffoldSlots.drawer] != null) {
       RenderBox drawer = _slots[ScaffoldSlots.drawer];
       drawer.layout(new BoxConstraints(minWidth: 0.0, maxWidth: size.width, minHeight: size.height, maxHeight: size.height));
       assert(drawer.parentData is BoxParentData);
       drawer.parentData.position = Point.origin;
     }
     if (_slots[ScaffoldSlots.floatingActionButton] != null) {
       RenderBox floatingActionButton = _slots[ScaffoldSlots.floatingActionButton];
-      Size area = new Size(size.width + kButtonX, size.height + kButtonY);
+      Size area = new Size(size.width - kButtonX, size.height - kButtonY);
       floatingActionButton.layout(new BoxConstraints.loose(area));
       assert(floatingActionButton.parentData is BoxParentData);
       floatingActionButton.parentData.position = (area - floatingActionButton.size).toPoint();
     }
   }
 
   void paint(RenderObjectDisplayList canvas) {
     for (ScaffoldSlots slot in [ScaffoldSlots.body, ScaffoldSlots.statusBar, ScaffoldSlots.toolbar, ScaffoldSlots.floatingActionButton, ScaffoldSlots.drawer]) {
       RenderBox box = _slots[slot];
       if (box != null) {
@@ skipping 74 matching lines @@
   void syncRenderObject(UINode old) {
     super.syncRenderObject(old);
     syncChild(toolbar, old is Scaffold ? old.toolbar : null, ScaffoldSlots.toolbar);
     syncChild(body, old is Scaffold ? old.body : null, ScaffoldSlots.body);
     syncChild(statusbar, old is Scaffold ? old.statusbar : null, ScaffoldSlots.statusBar);
     syncChild(drawer, old is Scaffold ? old.drawer : null, ScaffoldSlots.drawer);
     syncChild(floatingActionButton, old is Scaffold ? old.floatingActionButton : null, ScaffoldSlots.floatingActionButton);
   }
 
 }