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

Support for FlexAlignItems.stretch.

Browse Source 
R=jackson@google.com

Review URL: https://codereview.chromium.org/1229353002 .
This commit is contained in:
Hixie 2015-07-10 14:35:09 -07:00
parent fb86cfb561
commit 2904bac1a6
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sdk/lib/rendering/flex.dart
View File

@ -33,6 +33,7 @@ enum FlexAlignItems {
start,
end,
center,
stretch,
}
typedef double _ChildSizingFunction(RenderBox child, BoxConstraints constraints);
@ -288,8 +289,23 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
if (flex > 0) {
totalFlex += child.parentData.flex;
} else {
BoxConstraints innerConstraints = new BoxConstraints(maxHeight: constraints.maxHeight,
maxWidth: constraints.maxWidth);
BoxConstraints innerConstraints;
if (alignItems == FlexAlignItems.stretch) {
switch (_direction) {
case FlexDirection.horizontal:
innerConstraints = new BoxConstraints(maxWidth: constraints.maxWidth,
minHeight: constraints.minHeight,
maxHeight: constraints.maxHeight);
break;
case FlexDirection.vertical:
innerConstraints = new BoxConstraints(minWidth: constraints.minWidth,
maxWidth: constraints.maxWidth,
maxHeight: constraints.maxHeight);
break;
}
} else {
innerConstraints = constraints.loosen();
}
child.layout(innerConstraints, parentUsesSize: true);
freeSpace -= _getMainSize(child);
crossSize = math.max(crossSize, _getCrossSize(child));
@ -372,6 +388,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
assert(child.parentData is FlexBoxParentData);
double childCrossPosition;
switch (_alignItems) {
case FlexAlignItems.stretch:
case FlexAlignItems.start:
childCrossPosition = 0.0;
break;