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

Fix negative usableCrossAxisExtent in release mode (#64441)

Browse Source
This commit is contained in:
gaowanqiu 2020-08-29 07:13:05 +08:00 committed by GitHub
parent c26c2363a0
commit 619eccd2e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -64,3 +64,4 @@ Brian Wang <xinlei966@gmail.com>
CaiJingLong <cjl_spy@163.com> CaiJingLong <cjl_spy@163.com>
Alex Li <google@alexv525.com> Alex Li <google@alexv525.com>
Ram Navan <hiramprasad@gmail.com> Ram Navan <hiramprasad@gmail.com>
meritozh <ah841814092@gmail.com>

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

@ -326,7 +326,8 @@ class SliverGridDelegateWithFixedCrossAxisCount extends SliverGridDelegate {
@override @override
SliverGridLayout getLayout(SliverConstraints constraints) { SliverGridLayout getLayout(SliverConstraints constraints) {
assert(_debugAssertIsValid()); assert(_debugAssertIsValid());
final double usableCrossAxisExtent = constraints.crossAxisExtent - crossAxisSpacing * (crossAxisCount - 1); final double usableCrossAxisExtent = math.max(0.0,
constraints.crossAxisExtent - crossAxisSpacing * (crossAxisCount - 1));
final double childCrossAxisExtent = usableCrossAxisExtent / crossAxisCount; final double childCrossAxisExtent = usableCrossAxisExtent / crossAxisCount;
final double childMainAxisExtent = childCrossAxisExtent / childAspectRatio; final double childMainAxisExtent = childCrossAxisExtent / childAspectRatio;
return SliverGridRegularTileLayout( return SliverGridRegularTileLayout(
@ -425,7 +426,8 @@ class SliverGridDelegateWithMaxCrossAxisExtent extends SliverGridDelegate {
SliverGridLayout getLayout(SliverConstraints constraints) { SliverGridLayout getLayout(SliverConstraints constraints) {
assert(_debugAssertIsValid(constraints.crossAxisExtent)); assert(_debugAssertIsValid(constraints.crossAxisExtent));
final int crossAxisCount = (constraints.crossAxisExtent / (maxCrossAxisExtent + crossAxisSpacing)).ceil(); final int crossAxisCount = (constraints.crossAxisExtent / (maxCrossAxisExtent + crossAxisSpacing)).ceil();
final double usableCrossAxisExtent = constraints.crossAxisExtent - crossAxisSpacing * (crossAxisCount - 1); final double usableCrossAxisExtent = math.max(0.0,
constraints.crossAxisExtent - crossAxisSpacing * (crossAxisCount - 1));
final double childCrossAxisExtent = usableCrossAxisExtent / crossAxisCount; final double childCrossAxisExtent = usableCrossAxisExtent / crossAxisCount;
final double childMainAxisExtent = childCrossAxisExtent / childAspectRatio; final double childMainAxisExtent = childCrossAxisExtent / childAspectRatio;
return SliverGridRegularTileLayout( return SliverGridRegularTileLayout(

38
packages/flutter/test/widgets/slivers_test.dart
View File

@ -308,6 +308,44 @@ void main() {
}, },
); );
testWidgets(
'SliverGrid negative usableCrossAxisExtent',
(WidgetTester tester) async {
await tester.pumpWidget(
Directionality(
textDirection: TextDirection.ltr,
child: Center(
child: SizedBox(
width: 4,
height: 4,
child: CustomScrollView(
slivers: <Widget>[
SliverGrid(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
crossAxisSpacing: 8,
mainAxisSpacing: 8,
),
delegate: SliverChildListDelegate(
<Widget>[
Container(child: const Center(child: Text('A'))),
Container(child: const Center(child: Text('B'))),
Container(child: const Center(child: Text('C'))),
Container(child: const Center(child: Text('D'))),
],
),
),
],
),
),
),
),
);
expect(tester.takeException(), isNull);
},
);
testWidgets( testWidgets(
'SliverList can handle inaccurate scroll offset due to changes in children list', 'SliverList can handle inaccurate scroll offset due to changes in children list',
(WidgetTester tester) async { (WidgetTester tester) async {