| Index: sky/sdk/lib/framework/components2/tool_bar.dart
|
| diff --git a/sky/sdk/lib/framework/components2/tool_bar.dart b/sky/sdk/lib/framework/components2/tool_bar.dart
|
| index cb32056838d71e9c56c999291b3b92f4b1c27650..644f6163d082ae9a922b904c19fce53a1af4d6eb 100644
|
| --- a/sky/sdk/lib/framework/components2/tool_bar.dart
|
| +++ b/sky/sdk/lib/framework/components2/tool_bar.dart
|
| @@ -3,7 +3,8 @@
|
| // found in the LICENSE file.
|
|
|
| import '../fn2.dart';
|
| -import '../theme/view_configuration.dart';
|
| +import '../rendering/flex.dart';
|
| +import '../theme2/view_configuration.dart';
|
| import '../theme2/shadows.dart';
|
|
|
| class ToolBar extends Component {
|
| @@ -34,13 +35,17 @@ class ToolBar extends Component {
|
| if (right != null)
|
| children.addAll(right);
|
|
|
| + // TODO(hansmuller): use align-items:flex-end when FlexContainer supports it.
|
| + UINode bottomJustifiedChild = new FlexContainer(
|
| + direction: FlexDirection.vertical,
|
| + justifyContent: FlexJustifyContent.flexEnd,
|
| + children: [new Container(
|
| + child: new FlexContainer(children: children),
|
| + height: kToolBarHeight)]);
|
| +
|
| return new Container(
|
| - child: new FlexContainer(
|
| - children: children,
|
| - direction: FlexDirection.horizontal
|
| - ),
|
| - height: 56.0,
|
| - padding: new EdgeDims(kStatusBarHeight.toDouble(), 8.0, 0.0, 8.0),
|
| + child: bottomJustifiedChild,
|
| + padding: new EdgeDims.symmetric(horizontal: 8.0),
|
| decoration: new BoxDecoration(
|
| backgroundColor: backgroundColor,
|
| boxShadow: Shadow[2]
|
|
|