DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #670 from abarth/expand_dimension

Browse Source 
Container should expand in dimensions without constraints
This commit is contained in:
Adam Barth 2015-08-18 10:07:23 -07:00
commit 9b55b981de
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sky/packages/sky/lib/widgets/basic.dart
View File

@ -339,7 +339,7 @@ class Container extends Component {
Widget build() {
Widget current = child;
if (child == null && width == null && height == null)
if (child == null && (width == null || height == null))
current = new ConstrainedBox(constraints: BoxConstraints.expand);
if (padding != null)
@ -348,12 +348,13 @@ class Container extends Component {
if (decoration != null)
current = new DecoratedBox(decoration: decoration, child: current);
if (width != null || height != null)
if (width != null || height != null) {
current = new SizedBox(
width: width,
height: height,
child: current
);
}
if (constraints != null)
current = new ConstrainedBox(constraints: constraints, child: current);