| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 import 'dart:sky' as sky; | 5 import 'dart:sky' as sky; |
| 6 import 'box.dart'; | 6 import 'box.dart'; |
| 7 import 'object.dart'; | 7 import 'object.dart'; |
| 8 | 8 |
| 9 class FlexBoxParentData extends BoxParentData with ContainerParentDataMixin<Rend
erBox> { | 9 class FlexBoxParentData extends BoxParentData with ContainerParentDataMixin<Rend
erBox> { |
| 10 int flex; | 10 int flex; |
| 11 void merge(FlexBoxParentData other) { | 11 void merge(FlexBoxParentData other) { |
| 12 if (other.flex != null) | 12 if (other.flex != null) |
| 13 flex = other.flex; | 13 flex = other.flex; |
| 14 super.merge(other); | 14 super.merge(other); |
| 15 } | 15 } |
| 16 String toString() => '${super.toString()}; flex=$flex'; |
| 16 } | 17 } |
| 17 | 18 |
| 18 enum FlexDirection { horizontal, vertical } | 19 enum FlexDirection { horizontal, vertical } |
| 19 | 20 |
| 20 class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
exBoxParentData>, | 21 class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
exBoxParentData>, |
| 21 RenderBoxContainerDefaultsMixin<RenderBo
x, FlexBoxParentData> { | 22 RenderBoxContainerDefaultsMixin<RenderBo
x, FlexBoxParentData> { |
| 22 // lays out RenderBox children using flexible layout | 23 // lays out RenderBox children using flexible layout |
| 23 | 24 |
| 24 RenderFlex({ | 25 RenderFlex({ |
| 25 FlexDirection direction: FlexDirection.horizontal | 26 FlexDirection direction: FlexDirection.horizontal |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 } | 112 } |
| 112 | 113 |
| 113 void hitTestChildren(HitTestResult result, { sky.Point position }) { | 114 void hitTestChildren(HitTestResult result, { sky.Point position }) { |
| 114 defaultHitTestChildren(result, position: position); | 115 defaultHitTestChildren(result, position: position); |
| 115 } | 116 } |
| 116 | 117 |
| 117 void paint(RenderObjectDisplayList canvas) { | 118 void paint(RenderObjectDisplayList canvas) { |
| 118 defaultPaint(canvas); | 119 defaultPaint(canvas); |
| 119 } | 120 } |
| 120 } | 121 } |
| OLD | NEW |