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 #1922 from HansMuller/justifycontent_collapse

Browse Source 
Adds FlexJustifyContent.collapse
This commit is contained in:
Hans Muller 2015-11-03 11:29:08 -08:00
commit 7a383dab91
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sky/packages/sky/lib/src/rendering/flex.dart
View File

@ -46,6 +46,8 @@ enum FlexJustifyContent {
spaceBetween,
/// Place the free space evenly between the children as well as before and after the first and last child
spaceAround,
/// Do not expand to fill the free space. None of the children may specify a flex factor.
collapse,
}
/// How the children should be placed along the cross axis in a flex layout
@ -337,7 +339,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
int totalChildren = 0;
assert(constraints != null);
final double mainSize = (_direction == FlexDirection.horizontal) ? constraints.constrainWidth() : constraints.constrainHeight();
final bool canFlex = mainSize < double.INFINITY;
final bool canFlex = mainSize < double.INFINITY && justifyContent != FlexJustifyContent.collapse;
double crossSize = 0.0; // This is determined as we lay out the children
double freeSpace = canFlex ? mainSize : 0.0;
RenderBox child = firstChild;
@ -478,6 +480,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
}
switch (_justifyContent) {
case FlexJustifyContent.start:
case FlexJustifyContent.collapse:
leadingSpace = 0.0;
betweenSpace = 0.0;
break;

63
sky/unit/test/widget/flex_test.dart
View File

@ -1,3 +1,4 @@
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart';
import 'package:test/test.dart';
@ -42,4 +43,66 @@ void main() {
expect(didReceiveTap, isTrue);
});
});
test('Row, Column and FlexJustifyContent.collapse', () {
final Key flexKey = new Key('flexKey');
// Row without justifyContent: FlexJustifyContent.collapse
testWidgets((WidgetTester tester) {
tester.pumpWidget(new Center(
child: new Row([
new Container(width: 10.0, height: 100.0),
new Container(width: 30.0, height: 100.0)
],
key: flexKey
)
));
RenderBox renderBox = tester.findElementByKey(flexKey).renderObject;
expect(renderBox.size.width, equals(800.0));
expect(renderBox.size.height, equals(100.0));
// Row with justifyContent: FlexJustifyContent.collapse
tester.pumpWidget(new Center(
child: new Row([
new Container(width: 10.0, height: 100.0),
new Container(width: 30.0, height: 100.0)
],
key: flexKey,
justifyContent: FlexJustifyContent.collapse
)
));
renderBox = tester.findElementByKey(flexKey).renderObject;
expect(renderBox.size.width, equals(40.0));
expect(renderBox.size.height, equals(100.0));
});
// Column without justifyContent: FlexJustifyContent.collapse
testWidgets((WidgetTester tester) {
tester.pumpWidget(new Center(
child: new Column([
new Container(width: 100.0, height: 100.0),
new Container(width: 100.0, height: 150.0)
],
key: flexKey
)
));
RenderBox renderBox = tester.findElementByKey(flexKey).renderObject;
expect(renderBox.size.width, equals(100.0));
expect(renderBox.size.height, equals(600.0));
// Column with justifyContent: FlexJustifyContent.collapse
tester.pumpWidget(new Center(
child: new Column([
new Container(width: 100.0, height: 100.0),
new Container(width: 100.0, height: 150.0)
],
key: flexKey,
justifyContent: FlexJustifyContent.collapse
)
));
renderBox = tester.findElementByKey(flexKey).renderObject;
expect(renderBox.size.width, equals(100.0));
expect(renderBox.size.height, equals(250.0));
});
});
}