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

Address Ian's comments on layout2.dart

Browse Source 
R=ianh@google.com

Review URL: https://codereview.chromium.org/1152603002
This commit is contained in:
Adam Barth 2015-05-21 13:32:21 -07:00
parent 827e621238
commit 12439e5ccf
2 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/raw/simple_render_tree.dart
View File

@ -18,8 +18,8 @@ class RenderSolidColor extends RenderDecoratedBox {
}
void layout(BoxConstraints constraints, { RenderNode relayoutSubtreeRoot }) {
setWidth(constraints, constraints.maxWidth);
setHeight(constraints, 200.0);
width = constraints.constrainWidth(constraints.maxWidth);
height = constraints.constrainHeight(200.0);
layoutDone();
}
@ -57,7 +57,8 @@ void main() {
view.setBeginFrameCallback(beginFrame);
var root = new RenderBlock(
decoration: new BoxDecoration(backgroundColor: 0xFF00FFFF));
decoration: new BoxDecoration(backgroundColor: 0xFF00FFFF),
padding: const EdgeDims(10.0, 10.0, 10.0, 10.0));
root.add(new RenderSolidColor(0xFF00FF00));
root.add(new RenderSolidColor(0xFF0000FF));

65
sdk/lib/framework/layout2.dart
View File

@ -401,10 +401,24 @@ class BoxConstraints {
this.minHeight: 0.0,
this.maxHeight: double.INFINITY});
const BoxConstraints.tight({ width: width, height: height })
: minWidth = width,
maxWidth = width,
minHeight = height,
maxHeight = height;
final double minWidth;
final double maxWidth;
final double minHeight;
final double maxHeight;
double constrainWidth(double width) {
return clamp(min: minWidth, max: maxWidth, value: width);
}
double constrainHeight(double height) {
return clamp(min: minHeight, max: maxHeight, value: height);
}
}
class BoxDimensions {
@ -412,8 +426,8 @@ class BoxDimensions {
BoxDimensions.withConstraints(
BoxConstraints constraints, {double width: 0.0, double height: 0.0}) {
this.width = clamp(min: minWidth, max: maxWidth, value: width);
this.height = clamp(min: minHeight, max: maxHeight, value: height);
this.width = constraints.constrainWidth(width);
this.height = constraints.constrainHeight(height);
}
final double width;
@ -442,29 +456,17 @@ abstract class RenderBox extends RenderNode {
}
void layout(BoxConstraints constraints, { RenderNode relayoutSubtreeRoot }) {
setWidth(constraints, 0.0);
setHeight(constraints, 0.0);
width = constraints.constrainWidth(0.0);
height = constraints.constrainHeight(0.0);
layoutDone();
}
double width;
double height;
void setWidth(BoxConstraints constraints, double newWidth) {
width = clamp(min: constraints.minWidth,
max: constraints.maxWidth,
value: newWidth);
}
void setHeight(BoxConstraints constraints, double newHeight) {
height = clamp(min: constraints.minHeight,
max: constraints.maxHeight,
value: newHeight);
}
}
class BoxDecoration {
BoxDecoration({
const BoxDecoration({
this.backgroundColor
});
@ -628,9 +630,8 @@ class RenderBlock extends RenderDecoratedBox with ContainerRenderNodeMixin<Rende
// child positions if they're not needed to determine dimensions)
BoxDimensions getIntrinsicDimensions(BoxConstraints constraints) {
double outerHeight = _padding.top + _padding.bottom;
// TODO(abarth): Shouldn't this have a value: maxWidth?
double outerWidth = clamp(min: constraints.minWidth,
max: constraints.maxWidth);
double outerWidth = constraints.constrainWidth(constraints.maxWidth);
assert(outerWidth < double.INFINITY);
double innerWidth = outerWidth - (_padding.left + _padding.right);
RenderBox child = _firstChild;
BoxConstraints constraints = new BoxConstraints(minWidth: innerWidth,
@ -641,12 +642,8 @@ class RenderBlock extends RenderDecoratedBox with ContainerRenderNodeMixin<Rende
child = child.parentData.nextSibling;
}
return new BoxDimensions(
width: outerWidth,
height: clamp(min: constraints.minHeight,
max: constraints.maxHeight,
value: outerHeight)
);
return new BoxDimensions(width: outerWidth,
height: constraints.constrainHeight(outerHeight));
}
double _minHeight; // value cached from parent for relayout call
@ -655,8 +652,8 @@ class RenderBlock extends RenderDecoratedBox with ContainerRenderNodeMixin<Rende
if (relayoutSubtreeRoot != null)
saveRelayoutSubtreeRoot(relayoutSubtreeRoot);
relayoutSubtreeRoot = relayoutSubtreeRoot == null ? this : relayoutSubtreeRoot;
// TODO(abarth): Shouldn't this be setWidth(constaints, constraints.maxWidth)?
width = clamp(min: constraints.minWidth, max: constraints.maxWidth);
width = constraints.constrainWidth(constraints.maxWidth);
assert(width < double.INFINITY);
_minHeight = constraints.minHeight;
_maxHeight = constraints.maxHeight;
internalLayout(relayoutSubtreeRoot);
@ -676,7 +673,7 @@ class RenderBlock extends RenderDecoratedBox with ContainerRenderNodeMixin<Rende
child.layout(new BoxConstraints(minWidth: innerWidth, maxWidth: innerWidth),
relayoutSubtreeRoot: relayoutSubtreeRoot);
assert(child.parentData is BlockParentData);
child.parentData.x = 0.0; // TODO(abarth): Shouldn't this be _padding.left?
child.parentData.x = _padding.left;
child.parentData.y = y;
y += child.height;
child = child.parentData.nextSibling;
@ -743,8 +740,8 @@ class ScaffoldBox extends RenderBox {
final RenderBox drawer;
void layout(BoxConstraints constraints, { RenderNode relayoutSubtreeRoot }) {
setHeight(constraints, 0.0);
setWidth(constraints, 0.0);
width = constraints.constrainWidth(0.0);
height = constraints.constrainHeight(0.0);
relayout();
}
@ -754,20 +751,20 @@ class ScaffoldBox extends RenderBox {
void relayout() {
double bodyHeight = height;
if (toolbar != null) {
toolbar.layout(new BoxConstraints(minWidth: width, maxWidth: width, minHeight: kToolbarHeight, maxHeight: kToolbarHeight));
toolbar.layout(new BoxConstraints.tight(width: width, height: kToolbarHeight));
assert(toolbar.parentData is BoxParentData);
toolbar.parentData.x = 0.0;
toolbar.parentData.y = 0.0;
bodyHeight -= kToolbarHeight;
}
if (statusbar != null) {
statusbar.layout(new BoxConstraints(minWidth: width, maxWidth: width, minHeight: kStatusbarHeight, maxHeight: kStatusbarHeight));
statusbar.layout(new BoxConstraints.tight(width: width, height: kStatusbarHeight));
assert(statusbar.parentData is BoxParentData);
statusbar.parentData.x = 0.0;
statusbar.parentData.y = height - kStatusbarHeight;
bodyHeight -= kStatusbarHeight;
}
body.layout(new BoxConstraints(minWidth: width, maxWidth: width, minHeight: bodyHeight, maxHeight: bodyHeight));
body.layout(new BoxConstraints.tight(width: width, height: bodyHeight));
if (drawer != null)
drawer.layout(new BoxConstraints(minWidth: 0.0, maxWidth: width, minHeight: height, maxHeight: height));
layoutDone();