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

[AutoLayout] Address further concerns raised in https://codereview.chromium.org/1230583003

Browse Source 
R=ianh@google.com

Review URL: https://codereview.chromium.org/1230033002 .
This commit is contained in:
Chinmay Garde 2015-07-09 15:29:36 -07:00
parent f830dffc55
commit b648abc8d9
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/example/rendering/simple_autolayout.dart
View File

@ -10,23 +10,23 @@ import 'package:sky/rendering/auto_layout.dart';
import 'package:cassowary/cassowary.dart' as al;
void main() {
var c1 = new RenderDecoratedBox(
RenderDecoratedBox c1 = new RenderDecoratedBox(
decoration: new BoxDecoration(backgroundColor: const Color(0xFFFF0000))
);
var c2 = new RenderDecoratedBox(
RenderDecoratedBox c2 = new RenderDecoratedBox(
decoration: new BoxDecoration(backgroundColor: const Color(0xFF00FF00))
);
var c3 = new RenderDecoratedBox(
RenderDecoratedBox c3 = new RenderDecoratedBox(
decoration: new BoxDecoration(backgroundColor: const Color(0xFF0000FF))
);
var c4 = new RenderDecoratedBox(
RenderDecoratedBox c4 = new RenderDecoratedBox(
decoration: new BoxDecoration(backgroundColor: const Color(0xFFFFFFFF))
);
var root = new RenderAutoLayout(children: [c1, c2, c3, c4]);
RenderAutoLayout root = new RenderAutoLayout(children: [c1, c2, c3, c4]);
AutoLayoutParentData p1 = c1.parentData;
AutoLayoutParentData p2 = c2.parentData;

32
sdk/lib/rendering/auto_layout.dart
View File

@ -53,7 +53,15 @@ abstract class _AutoLayoutParamMixin {
solver.suggestValueForVariable(_rightEdge.variable, size.width);
}
/// Called when the solver has updated at least one of the layout parameters
/// of this object. The object is now responsible for applying this update to
/// it other properties (if necessary)
void _applyAutolayoutParameterUpdates();
/// Returns the set of implicit constraints that need to be applied to all
/// instances of this class when they are moved into a render object with an
/// active solver. If no implicit constraints needs to be applied, the object
/// may return null.
List<al.Constraint> _constructImplicitConstraints();
void _setupImplicitConstraints(al.Solver solver) {
@ -79,17 +87,18 @@ abstract class _AutoLayoutParamMixin {
_implicitConstraints = null;
}
}
class AutoLayoutParentData extends BoxParentData
with ContainerParentDataMixin<RenderBox>, _AutoLayoutParamMixin {
final RenderBox _renderBox;
AutoLayoutParentData(this._renderBox) {
_setupLayoutParameters(this);
}
final RenderBox _renderBox;
@override
void _applyAutolayoutParameterUpdates() {
BoxConstraints box = new BoxConstraints.tightFor(
@ -117,26 +126,23 @@ class RenderAutoLayout extends RenderBox
RenderBoxContainerDefaultsMixin<RenderBox, AutoLayoutParentData>,
_AutoLayoutParamMixin {
final al.Solver _solver = new al.Solver();
List<al.Constraint> _explicitConstraints = new List<al.Constraint>();
RenderAutoLayout({List<RenderBox> children}) {
RenderAutoLayout({ List<RenderBox> children }) {
_setupLayoutParameters(this);
_setupEditVariablesInSolver(_solver, al.Priority.required - 1);
addAll(children);
}
final al.Solver _solver = new al.Solver();
List<al.Constraint> _explicitConstraints = new List<al.Constraint>();
/// Adds all the given constraints to the solver. Either all constraints are
/// added or none
al.Result addConstraints(List<al.Constraint> constraints) {
al.Result result = _solver.addConstraints(constraints);
if (result == al.Result.success) {
markNeedsLayout();
_explicitConstraints.addAll(constraints);
}
return result;
}
@ -166,9 +172,8 @@ class RenderAutoLayout extends RenderBox
@override
void setupParentData(RenderObject child) {
if (child.parentData is! AutoLayoutParentData) {
if (child.parentData is! AutoLayoutParentData)
child.parentData = new AutoLayoutParentData(child);
}
}
@override
@ -213,13 +218,14 @@ class RenderAutoLayout extends RenderBox
void dropChild(RenderObject child) {
child.parentData._collectImplicitConstraints(_solver);
// Call super last as this collects parent data
super.dropChild(child);
}
@override
List<al.Constraint> _constructImplicitConstraints() {
// Only edits are present on layout containers
// Only edits variables are present on layout containers. If, in the future,
// implicit constraints (for say margins, padding, etc.) need to be added,
// they must be returned from here.
return null;
}
}