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

Remove unneeded assert in UnconstrainedBox (#16778)

Browse Source 
This addresses #16593 by removing the unneeded assert in the setter for constrainedAxis. Null was meant to be allowed there.

This replaces #16599 and fixes #16593, reported by @maksimr
This commit is contained in:
Greg Spencer 2018-04-23 12:27:33 -07:00 committed by GitHub
parent b5af0a9114
commit 037df5f2ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/flutter/lib/src/rendering/shifted_box.dart
View File

@ -626,7 +626,6 @@ class RenderUnconstrainedBox extends RenderAligningShiftedBox with DebugOverflow
Axis get constrainedAxis => _constrainedAxis; Axis get constrainedAxis => _constrainedAxis;
Axis _constrainedAxis; Axis _constrainedAxis;
set constrainedAxis(Axis value) { set constrainedAxis(Axis value) {
assert(value != null);
if (_constrainedAxis == value) if (_constrainedAxis == value)
return; return;
_constrainedAxis = value; _constrainedAxis = value;

8
packages/flutter/test/rendering/box_test.dart
View File

@ -135,6 +135,7 @@ void main() {
test('UnconstrainedBox expands to fit children', () { test('UnconstrainedBox expands to fit children', () {
final RenderUnconstrainedBox unconstrained = new RenderUnconstrainedBox( final RenderUnconstrainedBox unconstrained = new RenderUnconstrainedBox(
constrainedAxis: Axis.horizontal, // This is reset to null below.
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
child: new RenderConstrainedBox( child: new RenderConstrainedBox(
additionalConstraints: const BoxConstraints.tightFor(width: 200.0, height: 200.0), additionalConstraints: const BoxConstraints.tightFor(width: 200.0, height: 200.0),
@ -150,6 +151,9 @@ void main() {
maxHeight: 200.0, maxHeight: 200.0,
), ),
); );
// Check that we can update the constrained axis to null.
unconstrained.constrainedAxis = null;
renderer.reassembleApplication();
expect(unconstrained.size.width, equals(200.0), reason: 'unconstrained width'); expect(unconstrained.size.width, equals(200.0), reason: 'unconstrained width');
expect(unconstrained.size.height, equals(200.0), reason: 'unconstrained height'); expect(unconstrained.size.height, equals(200.0), reason: 'unconstrained height');
@ -207,7 +211,7 @@ void main() {
); );
}); });
test('honors constrainedAxis=Axis.horizontal', () { test('UnconstrainedBox honors constrainedAxis=Axis.horizontal', () {
final RenderConstrainedBox flexible = final RenderConstrainedBox flexible =
new RenderConstrainedBox(additionalConstraints: const BoxConstraints.expand(height: 200.0)); new RenderConstrainedBox(additionalConstraints: const BoxConstraints.expand(height: 200.0));
final RenderUnconstrainedBox unconstrained = new RenderUnconstrainedBox( final RenderUnconstrainedBox unconstrained = new RenderUnconstrainedBox(
@ -231,7 +235,7 @@ void main() {
expect(unconstrained.size.height, equals(200.0), reason: 'unconstrained height'); expect(unconstrained.size.height, equals(200.0), reason: 'unconstrained height');
}); });
test('honors constrainedAxis=Axis.vertical', () { test('UnconstrainedBox honors constrainedAxis=Axis.vertical', () {
final RenderConstrainedBox flexible = final RenderConstrainedBox flexible =
new RenderConstrainedBox(additionalConstraints: const BoxConstraints.expand(width: 200.0)); new RenderConstrainedBox(additionalConstraints: const BoxConstraints.expand(width: 200.0));
final RenderUnconstrainedBox unconstrained = new RenderUnconstrainedBox( final RenderUnconstrainedBox unconstrained = new RenderUnconstrainedBox(