| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 import '../fn2.dart'; | 5 import '../fn2.dart'; |
| 6 import '../theme/view_configuration.dart'; | 6 import '../rendering/flex.dart'; |
| 7 import '../theme2/view_configuration.dart'; |
| 7 import '../theme2/shadows.dart'; | 8 import '../theme2/shadows.dart'; |
| 8 | 9 |
| 9 class ToolBar extends Component { | 10 class ToolBar extends Component { |
| 10 | 11 |
| 11 ToolBar({ | 12 ToolBar({ |
| 12 String key, | 13 String key, |
| 13 this.left, | 14 this.left, |
| 14 this.center, | 15 this.center, |
| 15 this.right, | 16 this.right, |
| 16 this.backgroundColor | 17 this.backgroundColor |
| (...skipping 10 matching lines...) Expand all Loading... |
| 27 new FlexExpandingChild( | 28 new FlexExpandingChild( |
| 28 new Padding( | 29 new Padding( |
| 29 child: center, | 30 child: center, |
| 30 padding: new EdgeDims.only(left: 24.0) | 31 padding: new EdgeDims.only(left: 24.0) |
| 31 )) | 32 )) |
| 32 ]; | 33 ]; |
| 33 | 34 |
| 34 if (right != null) | 35 if (right != null) |
| 35 children.addAll(right); | 36 children.addAll(right); |
| 36 | 37 |
| 38 // TODO(hansmuller): use align-items:flex-end when FlexContainer supports it
. |
| 39 UINode bottomJustifiedChild = new FlexContainer( |
| 40 direction: FlexDirection.vertical, |
| 41 justifyContent: FlexJustifyContent.flexEnd, |
| 42 children: [new Container( |
| 43 child: new FlexContainer(children: children), |
| 44 height: kToolBarHeight)]); |
| 45 |
| 37 return new Container( | 46 return new Container( |
| 38 child: new FlexContainer( | 47 child: bottomJustifiedChild, |
| 39 children: children, | 48 padding: new EdgeDims.symmetric(horizontal: 8.0), |
| 40 direction: FlexDirection.horizontal | |
| 41 ), | |
| 42 height: 56.0, | |
| 43 padding: new EdgeDims(kStatusBarHeight.toDouble(), 8.0, 0.0, 8.0), | |
| 44 decoration: new BoxDecoration( | 49 decoration: new BoxDecoration( |
| 45 backgroundColor: backgroundColor, | 50 backgroundColor: backgroundColor, |
| 46 boxShadow: Shadow[2] | 51 boxShadow: Shadow[2] |
| 47 ) | 52 ) |
| 48 ); | 53 ); |
| 49 } | 54 } |
| 50 | 55 |
| 51 } | 56 } |
| OLD | NEW |