firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1164 from collinjackson/revert_iterable

Browse Source 
Revert "MultiChildRenderObjectWrapper should take an Iterable instead of a List"
This commit is contained in:
Collin Jackson 2015-09-14 15:13:24 -07:00
commit 8c0e5564fb
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/src/rendering/auto_layout.dart
View File

@ -126,7 +126,7 @@ class RenderAutoLayout extends RenderBox
RenderBoxContainerDefaultsMixin<RenderBox, AutoLayoutParentData>, RenderBoxContainerDefaultsMixin<RenderBox, AutoLayoutParentData>,
_AutoLayoutParamMixin { _AutoLayoutParamMixin {
RenderAutoLayout({ Iterable<RenderBox> children }) { RenderAutoLayout({ List<RenderBox> children }) {
_setupLayoutParameters(this); _setupLayoutParameters(this);
_setupEditVariablesInSolver(_solver, al.Priority.required - 1); _setupEditVariablesInSolver(_solver, al.Priority.required - 1);
addAll(children); addAll(children);

6
packages/flutter/lib/src/rendering/block.dart
View File

@ -35,7 +35,7 @@ abstract class RenderBlockBase extends RenderBox with ContainerRenderObjectMixin
RenderBoxContainerDefaultsMixin<RenderBox, BlockParentData> { RenderBoxContainerDefaultsMixin<RenderBox, BlockParentData> {
RenderBlockBase({ RenderBlockBase({
Iterable<RenderBox> children, List<RenderBox> children,
BlockDirection direction: BlockDirection.vertical, BlockDirection direction: BlockDirection.vertical,
double itemExtent, double itemExtent,
double minExtent: 0.0 double minExtent: 0.0
@ -123,7 +123,7 @@ abstract class RenderBlockBase extends RenderBox with ContainerRenderObjectMixin
class RenderBlock extends RenderBlockBase { class RenderBlock extends RenderBlockBase {
RenderBlock({ RenderBlock({
Iterable<RenderBox> children, List<RenderBox> children,
BlockDirection direction: BlockDirection.vertical, BlockDirection direction: BlockDirection.vertical,
double itemExtent, double itemExtent,
double minExtent: 0.0 double minExtent: 0.0
@ -231,7 +231,7 @@ class RenderBlockViewport extends RenderBlockBase {
double itemExtent, double itemExtent,
double minExtent: 0.0, double minExtent: 0.0,
double startOffset: 0.0, double startOffset: 0.0,
Iterable<RenderBox> children List<RenderBox> children
}) : _callback = callback, }) : _callback = callback,
_totalExtentCallback = totalExtentCallback, _totalExtentCallback = totalExtentCallback,
_maxCrossAxisExtentCallback = maxCrossAxisDimensionCallback, _maxCrossAxisExtentCallback = maxCrossAxisDimensionCallback,

2
packages/flutter/lib/src/rendering/flex.dart
View File

@ -85,7 +85,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
RenderBoxContainerDefaultsMixin<RenderBox, FlexParentData> { RenderBoxContainerDefaultsMixin<RenderBox, FlexParentData> {
RenderFlex({ RenderFlex({
Iterable<RenderBox> children, List<RenderBox> children,
FlexDirection direction: FlexDirection.horizontal, FlexDirection direction: FlexDirection.horizontal,
FlexJustifyContent justifyContent: FlexJustifyContent.start, FlexJustifyContent justifyContent: FlexJustifyContent.start,
FlexAlignItems alignItems: FlexAlignItems.center, FlexAlignItems alignItems: FlexAlignItems.center,

2
packages/flutter/lib/src/rendering/grid.dart
View File

@ -52,7 +52,7 @@ class GridParentData extends BoxParentData with ContainerParentDataMixin<RenderB
/// the given [maxChildExtent]. /// the given [maxChildExtent].
class RenderGrid extends RenderBox with ContainerRenderObjectMixin<RenderBox, GridParentData>, class RenderGrid extends RenderBox with ContainerRenderObjectMixin<RenderBox, GridParentData>,
RenderBoxContainerDefaultsMixin<RenderBox, GridParentData> { RenderBoxContainerDefaultsMixin<RenderBox, GridParentData> {
RenderGrid({ Iterable<RenderBox> children, double maxChildExtent }) { RenderGrid({ List<RenderBox> children, double maxChildExtent }) {
addAll(children); addAll(children);
_maxChildExtent = maxChildExtent; _maxChildExtent = maxChildExtent;
} }

2
packages/flutter/lib/src/rendering/object.dart
View File

@ -1230,7 +1230,7 @@ abstract class ContainerRenderObjectMixin<ChildType extends RenderObject, Parent
} }
/// Add all the children to the end of this render object's child list /// Add all the children to the end of this render object's child list
void addAll(Iterable<ChildType> children) { void addAll(List<ChildType> children) {
if (children != null) if (children != null)
for (ChildType child in children) for (ChildType child in children)
add(child); add(child);

2
packages/flutter/lib/src/rendering/stack.dart
View File

@ -68,7 +68,7 @@ class StackParentData extends BoxParentData with ContainerParentDataMixin<Render
class RenderStack extends RenderBox with ContainerRenderObjectMixin<RenderBox, StackParentData>, class RenderStack extends RenderBox with ContainerRenderObjectMixin<RenderBox, StackParentData>,
RenderBoxContainerDefaultsMixin<RenderBox, StackParentData> { RenderBoxContainerDefaultsMixin<RenderBox, StackParentData> {
RenderStack({ RenderStack({
Iterable<RenderBox> children List<RenderBox> children
}) { }) {
addAll(children); addAll(children);
} }

12
packages/flutter/lib/src/widgets/basic.dart
View File

@ -473,7 +473,7 @@ class Container extends Component {
// LAYOUT NODES // LAYOUT NODES
class BlockBody extends MultiChildRenderObjectWrapper { class BlockBody extends MultiChildRenderObjectWrapper {
BlockBody(Iterable<Widget> children, { BlockBody(List<Widget> children, {
Key key, Key key,
this.direction: BlockDirection.vertical this.direction: BlockDirection.vertical
}) : super(key: key, children: children) { }) : super(key: key, children: children) {
@ -492,7 +492,7 @@ class BlockBody extends MultiChildRenderObjectWrapper {
} }
class Stack extends MultiChildRenderObjectWrapper { class Stack extends MultiChildRenderObjectWrapper {
Stack(Iterable<Widget> children, { Key key }) Stack(List<Widget> children, { Key key })
: super(key: key, children: children); : super(key: key, children: children);
RenderStack createNode() => new RenderStack(); RenderStack createNode() => new RenderStack();
@ -555,7 +555,7 @@ class Positioned extends ParentDataNode {
} }
class Grid extends MultiChildRenderObjectWrapper { class Grid extends MultiChildRenderObjectWrapper {
Grid(Iterable<Widget> children, { Key key, this.maxChildExtent }) Grid(List<Widget> children, { Key key, this.maxChildExtent })
: super(key: key, children: children) { : super(key: key, children: children) {
assert(maxChildExtent != null); assert(maxChildExtent != null);
} }
@ -572,7 +572,7 @@ class Grid extends MultiChildRenderObjectWrapper {
} }
class Flex extends MultiChildRenderObjectWrapper { class Flex extends MultiChildRenderObjectWrapper {
Flex(Iterable<Widget> children, { Flex(List<Widget> children, {
Key key, Key key,
this.direction: FlexDirection.horizontal, this.direction: FlexDirection.horizontal,
this.justifyContent: FlexJustifyContent.start, this.justifyContent: FlexJustifyContent.start,
@ -615,7 +615,7 @@ class Flex extends MultiChildRenderObjectWrapper {
} }
class Row extends Flex { class Row extends Flex {
Row(Iterable<Widget> children, { Row(List<Widget> children, {
Key key, Key key,
justifyContent: FlexJustifyContent.start, justifyContent: FlexJustifyContent.start,
alignItems: FlexAlignItems.center, alignItems: FlexAlignItems.center,
@ -624,7 +624,7 @@ class Row extends Flex {
} }
class Column extends Flex { class Column extends Flex {
Column(Iterable<Widget> children, { Column(List<Widget> children, {
Key key, Key key,
justifyContent: FlexJustifyContent.start, justifyContent: FlexJustifyContent.start,
alignItems: FlexAlignItems.center, alignItems: FlexAlignItems.center,