Right-size the toolbar

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';
+import '../theme2/view_configuration.dart';
 
 enum ScaffoldSlots {
   toolbar,
   body,
   statusBar,
   drawer,
   floatingActionButton
 }
 
 class RenderScaffold extends RenderBox {
@@ skipping 53 matching lines @@
     return null;
   }
 
   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; // 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)));
+      double toolbarHeight = kToolBarHeight + kNotificationAreaHeight;
+      toolbar.layout(new BoxConstraints.tight(new Size(size.width, toolbarHeight)));
       assert(toolbar.parentData is BoxParentData);
       toolbar.parentData.position = Point.origin;
-      bodyPosition = kToolbarHeight;
-      bodyHeight -= kToolbarHeight;
+      bodyPosition += toolbarHeight;
+      bodyHeight -= toolbarHeight;
     }
     if (_slots[ScaffoldSlots.statusBar] != null) {
       RenderBox statusbar = _slots[ScaffoldSlots.statusBar];
       statusbar.layout(new BoxConstraints.tight(new Size(size.width, kStatusbarHeight)));
       assert(statusbar.parentData is BoxParentData);
       statusbar.parentData.position = new Point(0.0, size.height - kStatusbarHeight);
       bodyHeight -= kStatusbarHeight;
     }
     if (_slots[ScaffoldSlots.body] != null) {
       RenderBox body = _slots[ScaffoldSlots.body];
@@ skipping 100 matching lines @@
   void syncRenderObject(UINode old) {
     super.syncRenderObject(old);
     _toolbar = syncChild(_toolbar, old is Scaffold ? old._toolbar : null, ScaffoldSlots.toolbar);
     _body = syncChild(_body, old is Scaffold ? old._body : null, ScaffoldSlots.body);
     _statusbar = syncChild(_statusbar, old is Scaffold ? old._statusbar : null, ScaffoldSlots.statusBar);
     _drawer = syncChild(_drawer, old is Scaffold ? old._drawer : null, ScaffoldSlots.drawer);
     _floatingActionButton = syncChild(_floatingActionButton, old is Scaffold ? old._floatingActionButton : null, ScaffoldSlots.floatingActionButton);
   }
 
 }